execsql2 2.0.1__py3-none-any.whl → 2.1.2__py3-none-any.whl

execsql/metacommands/connect.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+from execsql.db.access import AccessDatabase
 
 """
 Database connection metacommand handlers for execsql.
@@ -19,30 +20,43 @@ database connections at script runtime:
 - ``x_close_db`` — ``CLOSE DATABASE <alias>``
 """
 
+from pathlib import Path
 from typing import Any
 
 import execsql.state as _state
+from execsql.db.dsn import DsnDatabase
+from execsql.db.duckdb import DuckDBDatabase
+from execsql.db.firebird import FirebirdDatabase
+from execsql.db.mysql import MySQLDatabase
+from execsql.db.oracle import OracleDatabase
+from execsql.db.postgres import PostgresDatabase
+from execsql.db.sqlite import SQLiteDatabase
+from execsql.db.sqlserver import SqlServerDatabase
+from execsql.exceptions import ErrInfo
+from execsql.types import dbt_postgres
+from execsql.utils.fileio import check_dir
+from execsql.utils.strings import unquoted2
 
 
 def x_connect_pg(**kwargs: Any) -> None:
     need_pwd = kwargs["need_pwd"]
     if need_pwd:
-        need_pwd = _state.unquoted2(need_pwd).lower() == "true"
+        need_pwd = unquoted2(need_pwd).lower() == "true"
     portno = kwargs["port"]
     if portno:
-        portno = int(_state.unquoted2(portno))
-    server = _state.unquoted2(kwargs["server"])
-    db_name = _state.unquoted2(kwargs["db_name"])
+        portno = int(unquoted2(portno))
+    server = unquoted2(kwargs["server"])
+    db_name = unquoted2(kwargs["db_name"])
     user = kwargs["user"]
     if user:
-        user = _state.unquoted2(user)
+        user = unquoted2(user)
     mk_new = kwargs["new"]
-    mk_new = _state.unquoted2(mk_new).lower() == "new" if mk_new else False
+    mk_new = unquoted2(mk_new).lower() == "new" if mk_new else False
     pw = kwargs["password"]
     enc = kwargs["encoding"]
     if enc:
-        enc = _state.unquoted2(enc)
-        new_db = _state.PostgresDatabase(
+        enc = unquoted2(enc)
+        new_db = PostgresDatabase(
             server,
             db_name,
             user,
@@ -53,7 +67,7 @@ def x_connect_pg(**kwargs: Any) -> None:
             password=pw,
         )
     else:
-        new_db = _state.PostgresDatabase(
+        new_db = PostgresDatabase(
             server,
             db_name,
             user,
@@ -69,15 +83,15 @@ def x_connect_pg(**kwargs: Any) -> None:
 def x_connect_user_pg(**kwargs: Any) -> None:
     portno = kwargs["port"]
     if portno:
-        portno = int(_state.unquoted2(portno))
-    server = _state.unquoted2(kwargs["server"])
-    db_name = _state.unquoted2(kwargs["db_name"])
+        portno = int(unquoted2(portno))
+    server = unquoted2(kwargs["server"])
+    db_name = unquoted2(kwargs["db_name"])
     user = _state.dbs.current().user if _state.dbs.current().user else None
     pw = _state.upass
     enc = kwargs["encoding"]
     if enc:
-        enc = _state.unquoted2(enc)
-        new_db = _state.PostgresDatabase(
+        enc = unquoted2(enc)
+        new_db = PostgresDatabase(
             server,
             db_name,
             user,
@@ -88,7 +102,7 @@ def x_connect_user_pg(**kwargs: Any) -> None:
             password=pw,
         )
     else:
-        new_db = _state.PostgresDatabase(
+        new_db = PostgresDatabase(
             server,
             db_name,
             user,
@@ -102,24 +116,24 @@ def x_connect_user_pg(**kwargs: Any) -> None:
 
 
 def x_connect_ssvr(**kwargs: Any) -> None:
-    server = _state.unquoted2(kwargs["server"])
-    db_name = _state.unquoted2(kwargs["db_name"])
+    server = unquoted2(kwargs["server"])
+    db_name = unquoted2(kwargs["db_name"])
     user = kwargs["user"]
     if user:
-        user = _state.unquoted2(user)
+        user = unquoted2(user)
     need_pwd = kwargs["need_pwd"]
     pw = kwargs["password"]
     if pw is not None:
-        pw = _state.unquoted2(pw)
+        pw = unquoted2(pw)
     if need_pwd:
-        need_pwd = _state.unquoted2(need_pwd).lower() == "true"
+        need_pwd = unquoted2(need_pwd).lower() == "true"
     portno = kwargs["port"]
     if portno:
-        portno = int(_state.unquoted2(portno))
+        portno = int(unquoted2(portno))
     encoding = kwargs["encoding"]
     if encoding:
-        encoding = _state.unquoted2(encoding)
-    new_db = _state.SqlServerDatabase(
+        encoding = unquoted2(encoding)
+    new_db = SqlServerDatabase(
         server,
         db_name,
         user_name=user,
@@ -135,15 +149,15 @@ def x_connect_ssvr(**kwargs: Any) -> None:
 def x_connect_user_ssvr(**kwargs: Any) -> None:
     portno = kwargs["port"]
     if portno:
-        portno = int(_state.unquoted2(portno))
-    server = _state.unquoted2(kwargs["server"])
-    db_name = _state.unquoted2(kwargs["db_name"])
+        portno = int(unquoted2(portno))
+    server = unquoted2(kwargs["server"])
+    db_name = unquoted2(kwargs["db_name"])
     user = _state.dbs.current().user if _state.dbs.current().user else None
     pw = _state.upass
     enc = kwargs["encoding"]
     if enc:
-        enc = _state.unquoted2(enc)
-        new_db = _state.SqlServerDatabase(
+        enc = unquoted2(enc)
+        new_db = SqlServerDatabase(
             server,
             db_name,
             user,
@@ -153,7 +167,7 @@ def x_connect_user_ssvr(**kwargs: Any) -> None:
             password=pw,
         )
     else:
-        new_db = _state.SqlServerDatabase(
+        new_db = SqlServerDatabase(
             server,
             db_name,
             user_name=user,
@@ -167,24 +181,24 @@ def x_connect_user_ssvr(**kwargs: Any) -> None:
 
 
 def x_connect_mysql(**kwargs: Any) -> None:
-    server = _state.unquoted2(kwargs["server"])
-    db_name = _state.unquoted2(kwargs["db_name"])
+    server = unquoted2(kwargs["server"])
+    db_name = unquoted2(kwargs["db_name"])
     user = kwargs["user"]
     if user:
-        user = _state.unquoted2(user)
+        user = unquoted2(user)
     need_pwd = kwargs["need_pwd"]
     if need_pwd:
-        need_pwd = _state.unquoted2(need_pwd).lower() == "true"
+        need_pwd = unquoted2(need_pwd).lower() == "true"
     portno = kwargs["port"]
     if portno:
-        portno = int(_state.unquoted2(portno))
+        portno = int(unquoted2(portno))
     pw = kwargs["password"]
     if pw:
-        pw = _state.unquoted2(pw)
+        pw = unquoted2(pw)
     enc = kwargs["encoding"]
     if enc:
-        enc = _state.unquoted2(enc)
-        new_db = _state.MySQLDatabase(
+        enc = unquoted2(enc)
+        new_db = MySQLDatabase(
             server,
             db_name,
             user,
@@ -194,7 +208,7 @@ def x_connect_mysql(**kwargs: Any) -> None:
             password=pw,
         )
     else:
-        new_db = _state.MySQLDatabase(
+        new_db = MySQLDatabase(
             server,
             db_name,
             user,
@@ -209,15 +223,15 @@ def x_connect_mysql(**kwargs: Any) -> None:
 def x_connect_user_mysql(**kwargs: Any) -> None:
     portno = kwargs["port"]
     if portno:
-        portno = int(_state.unquoted2(portno))
-    server = _state.unquoted2(kwargs["server"])
-    db_name = _state.unquoted2(kwargs["db_name"])
+        portno = int(unquoted2(portno))
+    server = unquoted2(kwargs["server"])
+    db_name = unquoted2(kwargs["db_name"])
     user = _state.dbs.current().user if _state.dbs.current().user else None
     pw = _state.upass
     enc = kwargs["encoding"]
     if enc:
-        enc = _state.unquoted2(enc)
-        new_db = _state.MySQLDatabase(
+        enc = unquoted2(enc)
+        new_db = MySQLDatabase(
             server,
             db_name,
             user,
@@ -227,7 +241,7 @@ def x_connect_user_mysql(**kwargs: Any) -> None:
             password=pw,
         )
     else:
-        new_db = _state.MySQLDatabase(
+        new_db = MySQLDatabase(
             server,
             db_name,
             user,
@@ -240,39 +254,39 @@ def x_connect_user_mysql(**kwargs: Any) -> None:
 
 
 def x_connect_access(**kwargs: Any) -> None:
-    db_file = _state.unquoted2(kwargs["filename"])
+    db_file = unquoted2(kwargs["filename"])
     enc = kwargs["encoding"]
     if enc:
-        enc = _state.unquoted2(enc)
+        enc = unquoted2(enc)
     need_pwd = kwargs["need_pwd"]
     password = kwargs["password"]
     if password:
-        password = _state.unquoted2(password)
+        password = unquoted2(password)
     if need_pwd:
-        need_pwd = _state.unquoted2(need_pwd).lower() == "true"
-    new_db = _state.AccessDatabase(db_file, need_passwd=need_pwd, encoding=enc, password=password)
+        need_pwd = unquoted2(need_pwd).lower() == "true"
+    new_db = AccessDatabase(db_file, need_passwd=need_pwd, encoding=enc, password=password)
     _state.dbs.add(kwargs["db_alias"].lower(), new_db)
     return None
 
 
 def x_connect_fb(**kwargs: Any) -> None:
-    server = _state.unquoted2(kwargs["server"])
-    db_name = _state.unquoted2(kwargs["db_name"])
+    server = unquoted2(kwargs["server"])
+    db_name = unquoted2(kwargs["db_name"])
     user = kwargs["user"]
     if user:
-        user = _state.unquoted2(user)
+        user = unquoted2(user)
     need_pwd = kwargs["need_pwd"]
     if need_pwd:
-        need_pwd = _state.unquoted2(need_pwd).lower() == "true"
+        need_pwd = unquoted2(need_pwd).lower() == "true"
     portno = kwargs["port"]
     if portno:
-        portno = int(_state.unquoted2(portno))
+        portno = int(unquoted2(portno))
     enc = kwargs["encoding"]
     if enc:
-        enc = _state.unquoted2(enc)
-        new_db = _state.FirebirdDatabase(server, db_name, user, need_passwd=need_pwd, port=portno, encoding=enc)
+        enc = unquoted2(enc)
+        new_db = FirebirdDatabase(server, db_name, user, need_passwd=need_pwd, port=portno, encoding=enc)
     else:
-        new_db = _state.FirebirdDatabase(server, db_name, user, need_passwd=need_pwd, port=portno)
+        new_db = FirebirdDatabase(server, db_name, user, need_passwd=need_pwd, port=portno)
     _state.dbs.add(kwargs["db_alias"].lower(), new_db)
     return None
 
@@ -280,40 +294,40 @@ def x_connect_fb(**kwargs: Any) -> None:
 def x_connect_user_fb(**kwargs: Any) -> None:
     portno = kwargs["port"]
     if portno:
-        portno = int(_state.unquoted2(portno))
-    server = _state.unquoted2(kwargs["server"])
-    db_name = _state.unquoted2(kwargs["db_name"])
+        portno = int(unquoted2(portno))
+    server = unquoted2(kwargs["server"])
+    db_name = unquoted2(kwargs["db_name"])
     user = _state.dbs.current().user if _state.dbs.current().user else None
     pw = _state.upass
     enc = kwargs["encoding"]
     if enc:
-        enc = _state.unquoted2(enc)
-        new_db = _state.FirebirdDatabase(server, db_name, user, need_passwd=pw is not None, port=portno, encoding=enc)
+        enc = unquoted2(enc)
+        new_db = FirebirdDatabase(server, db_name, user, need_passwd=pw is not None, port=portno, encoding=enc)
     else:
-        new_db = _state.FirebirdDatabase(server, db_name, user, need_passwd=pw is not None, port=portno)
+        new_db = FirebirdDatabase(server, db_name, user, need_passwd=pw is not None, port=portno)
     _state.dbs.add(kwargs["db_alias"].lower(), new_db)
     return None
 
 
 def x_connect_ora(**kwargs: Any) -> None:
-    server = _state.unquoted2(kwargs["server"])
-    db_name = _state.unquoted2(kwargs["db_name"])
+    server = unquoted2(kwargs["server"])
+    db_name = unquoted2(kwargs["db_name"])
     user = kwargs["user"]
     if user:
-        user = _state.unquoted2(user)
+        user = unquoted2(user)
     need_pwd = kwargs["need_pwd"]
     if need_pwd:
-        need_pwd = _state.unquoted2(need_pwd).lower() == "true"
+        need_pwd = unquoted2(need_pwd).lower() == "true"
     portno = kwargs["port"]
     if portno:
-        portno = int(_state.unquoted2(portno))
+        portno = int(unquoted2(portno))
     pw = kwargs["password"]
     if pw:
-        pw = _state.unquoted2(pw)
+        pw = unquoted2(pw)
     enc = kwargs["encoding"]
     if enc:
-        enc = _state.unquoted2(enc)
-        new_db = _state.OracleDatabase(
+        enc = unquoted2(enc)
+        new_db = OracleDatabase(
             server,
             db_name,
             user,
@@ -323,7 +337,7 @@ def x_connect_ora(**kwargs: Any) -> None:
             password=pw,
         )
     else:
-        new_db = _state.OracleDatabase(server, db_name, user, need_passwd=need_pwd, port=portno, password=pw)
+        new_db = OracleDatabase(server, db_name, user, need_passwd=need_pwd, port=portno, password=pw)
     _state.dbs.add(kwargs["db_alias"].lower(), new_db)
     return None
 
@@ -331,15 +345,15 @@ def x_connect_ora(**kwargs: Any) -> None:
 def x_connect_user_ora(**kwargs: Any) -> None:
     portno = kwargs["port"]
     if portno:
-        portno = int(_state.unquoted2(portno))
-    server = _state.unquoted2(kwargs["server"])
-    db_name = _state.unquoted2(kwargs["db_name"])
+        portno = int(unquoted2(portno))
+    server = unquoted2(kwargs["server"])
+    db_name = unquoted2(kwargs["db_name"])
     user = _state.dbs.current().user if _state.dbs.current().user else None
     pw = _state.upass
     enc = kwargs["encoding"]
     if enc:
-        enc = _state.unquoted2(enc)
-        new_db = _state.OracleDatabase(
+        enc = unquoted2(enc)
+        new_db = OracleDatabase(
             server,
             db_name,
             user,
@@ -349,7 +363,7 @@ def x_connect_user_ora(**kwargs: Any) -> None:
             password=pw,
         )
     else:
-        new_db = _state.OracleDatabase(
+        new_db = OracleDatabase(
             server,
             db_name,
             user,
@@ -364,20 +378,20 @@ def x_connect_user_ora(**kwargs: Any) -> None:
 def x_connect_duckdb(**kwargs: Any) -> None:
     import os
 
-    db_file = _state.unquoted2(kwargs["filename"])
+    db_file = unquoted2(kwargs["filename"])
     mk_new = kwargs["new"]
-    mk_new = _state.unquoted2(mk_new).lower() == "new" if mk_new else False
-    if not mk_new and not os.path.exists(db_file):
-        raise _state.ErrInfo(
+    mk_new = unquoted2(mk_new).lower() == "new" if mk_new else False
+    if not mk_new and not Path(db_file).exists():
+        raise ErrInfo(
             type="cmd",
             command_text=kwargs["metacommandline"],
             other_msg="DuckDB file does not exist.",
         )
     if mk_new:
-        _state.check_dir(db_file)
-        if os.path.exists(db_file):
+        check_dir(db_file)
+        if Path(db_file).exists():
             os.unlink(db_file)
-    new_db = _state.DuckDBDatabase(db_file)
+    new_db = DuckDBDatabase(db_file)
     _state.dbs.add(kwargs["db_alias"].lower(), new_db)
     return None
 
@@ -385,20 +399,20 @@ def x_connect_duckdb(**kwargs: Any) -> None:
 def x_connect_sqlite(**kwargs: Any) -> None:
     import os
 
-    db_file = _state.unquoted2(kwargs["filename"])
+    db_file = unquoted2(kwargs["filename"])
     mk_new = kwargs["new"]
-    mk_new = _state.unquoted2(mk_new).lower() == "new" if mk_new else False
-    if not mk_new and not os.path.exists(db_file):
-        raise _state.ErrInfo(
+    mk_new = unquoted2(mk_new).lower() == "new" if mk_new else False
+    if not mk_new and not Path(db_file).exists():
+        raise ErrInfo(
             type="cmd",
             command_text=kwargs["metacommandline"],
             other_msg="SQLite file does not exist.",
         )
     if mk_new:
-        _state.check_dir(db_file)
-        if os.path.exists(db_file):
+        check_dir(db_file)
+        if Path(db_file).exists():
             os.unlink(db_file)
-    new_db = _state.SQLiteDatabase(db_file)
+    new_db = SQLiteDatabase(db_file)
     _state.dbs.add(kwargs["db_alias"].lower(), new_db)
     return None
 
@@ -410,9 +424,9 @@ def x_connect_dsn(**kwargs: Any) -> None:
     pw = kwargs["password"]
     enc = kwargs["encoding"]
     if enc:
-        new_db = _state.DsnDatabase(kwargs["dsn"], kwargs["user"], need_passwd=need_pwd, encoding=enc, password=pw)
+        new_db = DsnDatabase(kwargs["dsn"], kwargs["user"], need_passwd=need_pwd, encoding=enc, password=pw)
     else:
-        new_db = _state.DsnDatabase(kwargs["dsn"], kwargs["user"], need_passwd=need_pwd, password=pw)
+        new_db = DsnDatabase(kwargs["dsn"], kwargs["user"], need_passwd=need_pwd, password=pw)
     _state.dbs.add(kwargs["db_alias"].lower(), new_db)
     return None
 
@@ -420,7 +434,7 @@ def x_connect_dsn(**kwargs: Any) -> None:
 def x_use(**kwargs: Any) -> None:
     db_alias = kwargs["db_alias"].lower()
     if db_alias not in _state.dbs.aliases():
-        raise _state.ErrInfo(
+        raise ErrInfo(
             type="cmd",
             command_text=kwargs["metacommandline"],
             other_msg=f"Unrecognized database alias: {db_alias}.",
@@ -439,9 +453,9 @@ def x_disconnect(**kwargs: Any) -> None:
     if alias is None:
         alias = _state.dbs.current_alias()
     if alias.lower() == "initial":
-        raise _state.ErrInfo(type="error", other_msg="You may not disconnect from the initial database used.")
+        raise ErrInfo(type="error", other_msg="You may not disconnect from the initial database used.")
     if _state.status.batch.uses_db(alias):
-        raise _state.ErrInfo(
+        raise ErrInfo(
             type="error",
             other_msg="You may not disconnect from a database that is currently used in a batch.",
         )
@@ -471,7 +485,7 @@ def x_autocommit_off(**kwargs: Any) -> None:
 
 def x_pg_vacuum(**kwargs: Any) -> None:
     db = _state.dbs.current()
-    if db.type == _state.dbt_postgres:
+    if db.type == dbt_postgres:
         args = kwargs["vacuum_args"]
         db.vacuum(args)
 
@@ -479,5 +493,5 @@ def x_pg_vacuum(**kwargs: Any) -> None:
 def x_daoflushdelay(**kwargs: Any) -> None:
     delay = float(kwargs["secs"])
     if delay < 5.0:
-        raise _state.ErrInfo(type="error", other_msg=f"Invalid DAO flush delay: {delay}; must be >= 5.0.")
+        raise ErrInfo(type="error", other_msg=f"Invalid DAO flush delay: {delay}; must be >= 5.0.")
     _state.conf.dao_flush_delay_secs = delay

execsql/metacommands/control.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+from execsql.exceptions import ErrInfo
 
 """
 Control-flow metacommand handlers for execsql.
@@ -20,15 +21,26 @@ import time
 from typing import Any
 
 import execsql.state as _state
+from execsql.script import (
+    CommandList,
+    CommandListUntilLoop,
+    CommandListWhileLoop,
+    MetacommandStmt,
+    ScriptCmd,
+    current_script_line,
+)
+from execsql.utils.errors import exit_now, write_warning
+from execsql.utils.fileio import EncodedFile, check_dir
+from execsql.utils.gui import GUI_HALT, GuiSpec, enable_gui, gui_console_isrunning
 
 
 def x_if(**kwargs: Any) -> None:
     tf_value = _state.xcmd_test(kwargs["condtest"])
     if tf_value:
-        src, line_no = _state.current_script_line()
-        metacmd = _state.MetacommandStmt(kwargs["condcmd"])
-        script_cmd = _state.ScriptCmd(src, line_no, "cmd", metacmd)
-        cmdlist = _state.CommandList([script_cmd], f"{src}_{line_no}")
+        src, line_no = current_script_line()
+        metacmd = MetacommandStmt(kwargs["condcmd"])
+        script_cmd = ScriptCmd(src, line_no, "cmd", metacmd)
+        cmdlist = CommandList([script_cmd], f"{src}_{line_no}")
         _state.commandliststack.append(cmdlist)
     return None
 
@@ -81,17 +93,17 @@ def x_loop(**kwargs: Any) -> None:
     listname = "loop" + str(len(_state.loopcommandstack) + 1)
     if looptype == "WHILE":
         _state.loopcommandstack.append(
-            _state.CommandListWhileLoop([], listname, paramnames=None, loopcondition=loopcond),
+            CommandListWhileLoop([], listname, paramnames=None, loopcondition=loopcond),
         )
     else:
         _state.loopcommandstack.append(
-            _state.CommandListUntilLoop([], listname, paramnames=None, loopcondition=loopcond),
+            CommandListUntilLoop([], listname, paramnames=None, loopcondition=loopcond),
         )
 
 
 def endloop() -> None:
     if len(_state.loopcommandstack) == 0:
-        raise _state.ErrInfo("error", other_msg="END LOOP metacommand without a matching preceding LOOP metacommand.")
+        raise ErrInfo("error", other_msg="END LOOP metacommand without a matching preceding LOOP metacommand.")
     _state.compiling_loop = False
     _state.commandliststack.append(_state.loopcommandstack[-1])
     _state.loopcommandstack.pop()
@@ -100,18 +112,18 @@ def endloop() -> None:
 def x_halt(**kwargs: Any) -> None:
     errmsg = kwargs["errmsg"]
     tee = kwargs["tee"]
-    tee = False if not tee else True
+    tee = bool(tee)
     outf = kwargs["filename"]
     errlevel = kwargs["errorlevel"]
     conf = _state.conf
     if outf:
-        _state.check_dir(outf)
-        of = _state.EncodedFile(outf, conf.output_encoding).open("a")
+        check_dir(outf)
+        of = EncodedFile(outf, conf.output_encoding).open("a")
         of.write(f"{errmsg}\n")
         of.close()
     if conf.tee_write_log:
         _state.exec_log.log_user_msg(errmsg)
-    use_gui = _state.gui_console_isrunning()
+    use_gui = gui_console_isrunning()
     if errmsg and (use_gui or conf.gui_level > 1):
         x_halt_msg(table=None, schema=None, **kwargs)
         return
@@ -121,15 +133,15 @@ def x_halt(**kwargs: Any) -> None:
         errlevel = 3
     if errmsg:
         _state.output.write_err(errmsg)
-    script, lno = _state.current_script_line()
+    script, lno = current_script_line()
     _state.exec_log.log_exit_halt(script, lno, msg=errmsg)
-    _state.exit_now(errlevel, None)
+    exit_now(errlevel, None)
 
 
 def x_error_halt(**kwargs: Any) -> None:
     flag = kwargs["onoff"].lower()
     if flag not in ("on", "off", "yes", "no", "true", "false"):
-        raise _state.ErrInfo(
+        raise ErrInfo(
             type="cmd",
             command_text=kwargs["metacommandline"],
             other_msg=f"Unrecognized flag for error handling: {flag}",
@@ -141,7 +153,7 @@ def x_error_halt(**kwargs: Any) -> None:
 def x_metacommand_error_halt(**kwargs: Any) -> None:
     flag = kwargs["onoff"].lower()
     if flag not in ("on", "off", "yes", "no", "true", "false"):
-        raise _state.ErrInfo(
+        raise ErrInfo(
             type="cmd",
             command_text=kwargs["metacommandline"],
             other_msg=f"Unrecognized flag for metacommand error handling: {flag}",
@@ -166,8 +178,8 @@ def x_rollback(**kwargs: Any) -> None:
 
 def x_break(**kwargs: Any) -> None:
     if len(_state.commandliststack) == 1:
-        src, line_no = _state.current_script_line()
-        _state.write_warning(f"BREAK metacommand with no command nesting on line {line_no} of {src}")
+        src, line_no = current_script_line()
+        write_warning(f"BREAK metacommand with no command nesting on line {line_no} of {src}")
     else:
         _state.if_stack.if_levels = _state.if_stack.if_levels[: _state.commandliststack[-1].init_if_level]
         _state.commandliststack.pop()
@@ -183,10 +195,10 @@ def x_wait_until(**kwargs: Any) -> None:
         countdown -= 1
     if kwargs["end"].lower() == "halt":
         _state.exec_log.log_exit_halt(
-            *_state.current_script_line(),
+            *current_script_line(),
             msg="Halted at expiration of WAIT_UNTIL metacommand.",
         )
-        _state.exit_now(2, None)
+        exit_now(2, None)
     return None
 
 
@@ -196,7 +208,7 @@ def x_halt_msg(**kwargs: Any) -> None:
 
     errmsg = kwargs["errmsg"]
     tee = kwargs["tee"]
-    tee = False if not tee else True
+    tee = bool(tee)
     outf = kwargs["filename"]
     errlevel = kwargs["errorlevel"]
     if errlevel:
@@ -205,8 +217,8 @@ def x_halt_msg(**kwargs: Any) -> None:
         errlevel = 3
     conf = _state.conf
     if outf:
-        _state.check_dir(outf)
-        of = _state.EncodedFile(outf, conf.output_encoding).open("a")
+        check_dir(outf)
+        of = EncodedFile(outf, conf.output_encoding).open("a")
         of.write(f"{errmsg}\n")
         of.close()
     schema = kwargs.get("schema")
@@ -218,7 +230,7 @@ def x_halt_msg(**kwargs: Any) -> None:
         headers, rows = db.select_data(sql)
     else:
         headers, rows = None, None
-    _state.enable_gui()
+    enable_gui()
     return_queue = _queue.Queue()
     gui_args = {
         "title": "HALT",
@@ -229,7 +241,7 @@ def x_halt_msg(**kwargs: Any) -> None:
         "rowset": rows,
         "help_url": None,
     }
-    _state.gui_manager_queue.put(_state.GuiSpec(_state.GUI_HALT, gui_args, return_queue))
+    _state.gui_manager_queue.put(GuiSpec(GUI_HALT, gui_args, return_queue))
     return_queue.get(block=True)
-    _state.exec_log.log_exit_halt(*_state.current_script_line(), msg=errmsg)
-    _state.exit_now(errlevel, None)
+    _state.exec_log.log_exit_halt(*current_script_line(), msg=errmsg)
+    exit_now(errlevel, None)