execsql2 2.35.0__py3-none-any.whl → 2.37.0__py3-none-any.whl

execsql/script/parser.py

@@ -25,7 +25,8 @@ Usage::
 from __future__ import annotations
 
 import re
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
+from dataclasses import replace
 from pathlib import Path
 from typing import cast
 
@@ -96,7 +97,7 @@ _INCLUDE_RX = re.compile(
 )
 
 
-def _strip_quotes(s: str) -> str:
+def strip_quotes(s: str) -> str:
     """Strip a matching pair of surrounding quotes from *s*."""
     if len(s) >= 2 and s[0] in ('"', "'") and s[-1] == s[0]:
         return s[1:-1]
@@ -126,6 +127,94 @@ _EXEC_SCRIPT_RX = re.compile(
     re.I,
 )
 
+
+def directive_node(command: str, span: SourceSpan) -> IncludeDirective | None:
+    """The :class:`IncludeDirective` for an INCLUDE or EXECUTE SCRIPT *command*, or ``None`` for any other.
+
+    *command* is the metacommand without ``-- !x!``.
+    """
+    m = _INCLUDE_RX.match(command)
+    if m:
+        return IncludeDirective(
+            span=span,
+            target=strip_quotes(m.group("target").strip()),
+            if_exists=m.group("exists") is not None,
+            command=command.strip(),
+        )
+    m = _EXEC_SCRIPT_RX.match(command)
+    if m:
+        return IncludeDirective(
+            span=span,
+            target=m.group("script_id"),
+            is_execute_script=True,
+            if_exists=m.group("exists") is not None,
+            arguments=m.group("argexp"),
+            loop_type=m.group("looptype").upper() if m.group("looptype") else None,
+            loop_condition=m.group("loopcond"),
+            command=command.strip(),
+        )
+    return None
+
+
+def substitute_directive(node: IncludeDirective, substitute: Callable[[str], str]) -> IncludeDirective:
+    """*node* with *substitute* applied once to each part that is substituted when it runs.
+
+    Those parts are INCLUDE's file and EXECUTE SCRIPT's script name and
+    arguments.  For a node parsed from a metacommand, ``command`` becomes
+    the metacommand with them substituted.  The metacommand is not
+    parsed again, so a value with a line break in it stays one value (an
+    unquoted argument still ends at a comma or a closing parenthesis, as it
+    always has).  A ``WHILE`` / ``UNTIL`` condition is left as written: it
+    is substituted on each pass of the loop.
+    """
+    m = (_EXEC_SCRIPT_RX if node.is_execute_script else _INCLUDE_RX).match(node.command)
+    if m is None:
+        # Built without the text of a metacommand.
+        target = substitute(node.target)
+        return replace(
+            node,
+            target=target if node.is_execute_script else strip_quotes(target.strip()),
+            arguments=substitute(node.arguments) if node.arguments is not None else None,
+        )
+    pieces: list[str] = []
+    values: dict[str, str] = {}
+    last = 0
+    for group in ("script_id", "argexp") if node.is_execute_script else ("target",):
+        if m.group(group) is None:
+            continue
+        start, end = m.span(group)
+        values[group] = substitute(node.command[start:end])
+        pieces += [node.command[last:start], values[group]]
+        last = end
+    pieces.append(node.command[last:])
+    command = "".join(pieces)
+    if node.is_execute_script:
+        return replace(node, target=values["script_id"], arguments=values.get("argexp"), command=command)
+    return replace(node, target=strip_quotes(values["target"].strip()), command=command)
+
+
+def metacommand_node(command: str, span: SourceSpan) -> IfBlock | IncludeDirective | MetaCommandStatement:
+    """The node for a metacommand that opens or closes no block, however it is reached.
+
+    The same on a line of its own, inside an inline ``IF (…) { … }`` and
+    when added with ``EXTEND SCRIPT … WITH METACOMMAND``: an inline ``IF``
+    is an :class:`IfBlock`, INCLUDE and EXECUTE SCRIPT an
+    :class:`IncludeDirective`, and any other a :class:`MetaCommandStatement`
+    for the dispatch table.  A metacommand whose text a substitution
+    variable supplies (``-- !x! !!cmd!!``) is classified here as written,
+    before substitution, so it always goes to the dispatch table (#113).
+    """
+    m = _IF_INLINE_RX.match(command)
+    if m:
+        return IfBlock(
+            span=span,
+            condition=m.group("cond").strip(),
+            body=[metacommand_node(m.group("cmd").strip(), span)],
+            command=command.strip(),
+        )
+    return directive_node(command, span) or MetaCommandStatement(span=span, command=command)
+
+
 # A parameter default value is either a double-quoted string, a single-quoted
 # string (both may contain spaces, commas, and other special characters), or
 # a bare run of non-whitespace characters.  Unquoted values must not begin
@@ -197,7 +286,7 @@ def _parse_param_defs(
             )
         name, default = m.group(1), m.group(2)
         if default is not None:
-            default = _strip_quotes(default)
+            default = strip_quotes(default)
             if seen_optional is None:
                 seen_optional = name
         elif seen_optional is not None:
@@ -512,7 +601,7 @@ def _parse_lines(lines: Iterable[str], source_name: str, errors: list[ErrInfo] |
                 in_sql_block = True
                 block_stack.append(
                     _BlockFrame(
-                        SqlBlock(span=SourceSpan(source_name, file_lineno)),
+                        SqlBlock(span=SourceSpan(source_name, file_lineno), command=cmd_text),
                         kind="sqlblock",
                         start_line=file_lineno,
                         source=source_name,
@@ -576,6 +665,7 @@ def _parse_lines(lines: Iterable[str], source_name: str, errors: list[ErrInfo] |
                             span=SourceSpan(source_name, file_lineno),
                             name=name,
                             param_defs=param_defs,
+                            command=cmd_text,
                         ),
                         kind="script",
                         start_line=file_lineno,
@@ -630,6 +720,7 @@ def _parse_lines(lines: Iterable[str], source_name: str, errors: list[ErrInfo] |
                         IfBlock(
                             span=SourceSpan(source_name, file_lineno),
                             condition=m.group("cond").strip(),
+                            command=cmd_text,
                         ),
                         kind="if",
                         start_line=file_lineno,
@@ -639,18 +730,8 @@ def _parse_lines(lines: Iterable[str], source_name: str, errors: list[ErrInfo] |
                 continue
 
             # -- IF (inline form): IF (cond) { cmd } --
-            m = _IF_INLINE_RX.match(cmd_text)
-            if m:
-                inner = MetaCommandStatement(
-                    span=SourceSpan(source_name, file_lineno),
-                    command=m.group("cmd").strip(),
-                )
-                if_node = IfBlock(
-                    span=SourceSpan(source_name, file_lineno),
-                    condition=m.group("cond").strip(),
-                    body=[inner],
-                )
-                _current_body().append(if_node)
+            if _IF_INLINE_RX.match(cmd_text):
+                _current_body().append(metacommand_node(cmd_text, SourceSpan(source_name, file_lineno)))
                 continue
 
             # -- ELSEIF --
@@ -673,6 +754,7 @@ def _parse_lines(lines: Iterable[str], source_name: str, errors: list[ErrInfo] |
                     ElseIfClause(
                         condition=m.group("cond").strip(),
                         span=SourceSpan(source_name, file_lineno),
+                        command=cmd_text,
                     ),
                 )
                 continue
@@ -767,6 +849,7 @@ def _parse_lines(lines: Iterable[str], source_name: str, errors: list[ErrInfo] |
                             span=SourceSpan(source_name, file_lineno),
                             loop_type=m.group("looptype").upper(),
                             condition=m.group("loopcond").strip(),
+                            command=cmd_text,
                         ),
                         kind="loop",
                         start_line=file_lineno,
@@ -793,7 +876,7 @@ def _parse_lines(lines: Iterable[str], source_name: str, errors: list[ErrInfo] |
             if m:
                 block_stack.append(
                     _BlockFrame(
-                        BatchBlock(span=SourceSpan(source_name, file_lineno)),
+                        BatchBlock(span=SourceSpan(source_name, file_lineno), command=cmd_text),
                         kind="batch",
                         start_line=file_lineno,
                         source=source_name,
@@ -814,41 +897,8 @@ def _parse_lines(lines: Iterable[str], source_name: str, errors: list[ErrInfo] |
                     _close_block(closed, file_lineno)
                 continue
 
-            # -- INCLUDE --
-            m = _INCLUDE_RX.match(cmd_text)
-            if m:
-                _current_body().append(
-                    IncludeDirective(
-                        span=SourceSpan(source_name, file_lineno),
-                        target=_strip_quotes(m.group("target").strip()),
-                        if_exists=m.group("exists") is not None,
-                    ),
-                )
-                continue
-
-            # -- EXECUTE SCRIPT / RUN SCRIPT --
-            m = _EXEC_SCRIPT_RX.match(cmd_text)
-            if m:
-                _current_body().append(
-                    IncludeDirective(
-                        span=SourceSpan(source_name, file_lineno),
-                        target=m.group("script_id"),
-                        is_execute_script=True,
-                        if_exists=m.group("exists") is not None,
-                        arguments=m.group("argexp"),
-                        loop_type=m.group("looptype").upper() if m.group("looptype") else None,
-                        loop_condition=m.group("loopcond"),
-                    ),
-                )
-                continue
-
-            # -- All other metacommands (flat) --
-            _current_body().append(
-                MetaCommandStatement(
-                    span=SourceSpan(source_name, file_lineno),
-                    command=cmd_text,
-                ),
-            )
+            # -- INCLUDE, EXECUTE SCRIPT and all other metacommands (flat) --
+            _current_body().append(metacommand_node(cmd_text, SourceSpan(source_name, file_lineno)))
             continue
 
         # --- SQL line ---

execsql/state.py

@@ -467,6 +467,29 @@ class _StateModule(types.ModuleType):
         return sorted(set(super().__dir__()) | _CONTEXT_ATTRS)
 
 
+def _context_property(name: str) -> property:
+    """A property on :class:`_StateModule` that reads *name* from the active context.
+
+    Without it every ``_state.conf`` read failed the module's own lookup and
+    reached :meth:`_StateModule.__getattr__` through an ``AttributeError``.
+    Building that error is cheap in a script, but on Python 3.13 it checks
+    whether the module shadows a standard-library one, which takes ~12 µs
+    when ``sys.path[0]`` is ``''`` (``python -c``, stdin, the REPL,
+    notebooks).  Writes and deletes still go through ``__setattr__`` and
+    ``__delattr__``.
+    """
+
+    def get(self: _StateModule) -> Any:
+        return getattr(_get_ctx(), name)
+
+    return property(get)
+
+
+for _name in _CONTEXT_ATTRS:
+    setattr(_StateModule, _name, _context_property(_name))
+del _name
+
+
 # ---------------------------------------------------------------------------
 # Utility functions
 # ---------------------------------------------------------------------------

execsql/utils/errors.py

@@ -121,7 +121,8 @@ def stamp_errinfo(errinfo: ErrInfo) -> ErrInfo:
         errinfo.script_file = lc.source
         errinfo.script_line_no = lc.line_no
         if errinfo.cmd is None:
-            errinfo.cmd = lc.command.commandline() if hasattr(lc.command, "commandline") else None
+            # The metacommand as written, without "-- !x!", as upstream reported it.
+            errinfo.cmd = getattr(lc.command, "statement", None)
             errinfo.cmdtype = lc.command_type
     return errinfo
 
@@ -129,10 +130,14 @@ def stamp_errinfo(errinfo: ErrInfo) -> ErrInfo:
 def _run_deferred_script(spec: Any) -> None:
     """Execute a deferred ScriptExecSpec (ON ERROR_HALT / ON CANCEL_HALT EXECUTE SCRIPT).
 
-    Executes the target script natively through the AST executor.
+    Executes the target script natively through the AST executor.  Its
+    arguments are substituted now, when the halt fires, so a deferred
+    variable (``!{$ERROR_MESSAGE}!``) holds the error that fired it.
     """
     from execsql.script.ast import IncludeDirective, SourceSpan
-    from execsql.script.executor import _execute_script_native
+    from execsql.script.engine import substitute_vars
+    from execsql.script.executor import _execute_script_native, _script_args, _stack_localvars
+    from execsql.script.parser import substitute_directive
     from execsql.state import get_context
 
     script_id = spec.script_id.lower() if hasattr(spec, "script_id") else None
@@ -145,8 +150,16 @@ def _run_deferred_script(spec: Any) -> None:
             arguments=spec.arg_exp,
             loop_type=spec.looptype,
             loop_condition=spec.loopcond,
+            command=(
+                f"EXECUTE SCRIPT {spec.script_id}"
+                + (f" WITH ARGUMENTS ({spec.arg_exp})" if spec.arg_exp else "")
+                + (f" {spec.looptype} ({spec.loopcond})" if spec.looptype else "")
+            ),
         )
-        _execute_script_native(ctx, node, ctx.ast_scripts[script_id])
+        localvars = _stack_localvars(ctx)
+        node = substitute_directive(node, lambda text: substitute_vars(text, localvars, ctx=ctx))
+        script_block = ctx.ast_scripts[script_id]
+        _execute_script_native(ctx, node, script_block, _script_args(node, script_block))
     else:
         raise ErrInfo(
             type="error",
@@ -199,6 +212,11 @@ def exit_now(exit_status: int, errinfo: ErrInfo | None, logmsg: str | None = Non
         except Exception:
             if _state.exec_log is not None:
                 _state.exec_log.log_status_error("Failed to write the ON CANCEL_HALT WRITE message.")
+    # A halt inside BEGIN BATCH rolls the batch back: after the error is
+    # shown, in case a lost connection makes the rollback wait, and before
+    # the ON ERROR_HALT / ON CANCEL_HALT script, whose own SQL then commits.
+    if _state.status is not None:
+        _state.status.batch.abandon_all()
     # Defer import to avoid circular dependencies
     from execsql.utils.gui import gui_console_isrunning, gui_console_wait_user, gui_console_off
 

execsql/utils/sigterm.py

@@ -0,0 +1,154 @@
+from __future__ import annotations
+
+"""
+SIGTERM handling for the ``execsql`` command.
+
+:func:`terminate` is the handler the console entry point installs: it kills
+the commands ``SYSTEM_CMD`` is waiting on, then ends the run through
+``SystemExit`` (exit status 143), so exit handlers run and the log is
+written.  :func:`command` starts such a command; :func:`sigterm_held` holds
+a SIGTERM back for the few lines where raising would leave something
+behind, and acts on it as the block ends.
+
+Python runs signal handlers on the main thread only, between bytecodes.  A
+hold therefore counts only on the main thread: a SIGTERM raised there in the
+middle of ``Popen()`` (which forks the command before it returns) would
+leave the command running with nothing to stop it.  The Textual console runs
+the script on another thread, which the handler never interrupts; that
+thread stops at its next command instead (see :func:`command`).  It is a
+daemon thread, which may never run again once the main thread exits, so the
+handler waits for a command that thread is starting and kills it itself.
+
+The library API (``execsql.run()``) does not install the handler, so there
+:func:`sigterm_held` holds nothing back and :func:`command` only stops its
+command when the block is left.
+"""
+
+import subprocess
+import threading
+from collections.abc import Iterator
+from contextlib import contextmanager
+from typing import Any
+
+#: Depth of nested :func:`sigterm_held` blocks on the main thread.
+_held = 0
+#: The signal number of a SIGTERM that arrived while held.
+_pending: int | None = None
+#: The signal number of the SIGTERM that ended the run.
+_terminated: int | None = None
+#: Commands started by :func:`command` and not yet stopped or finished.
+_commands: list[subprocess.Popen] = []
+#: Held while a command is started and added to ``_commands``.  Reentrant: a
+#: second SIGTERM can land while the handler holds it.
+_starting = threading.RLock()
+#: How long the handler waits for a command that is starting (seconds).
+_START_WAIT = 5.0
+
+
+def terminate(signum: int, _frame: Any) -> None:
+    """Kill the running commands, record a ``terminated`` exit and raise ``SystemExit(128 + signum)``.
+
+    Inside a :func:`sigterm_held` block the signal is only noted; the block's
+    end acts on it.
+    """
+    global _pending
+    if _held:
+        _pending = signum
+        return
+    _exit(signum)
+
+
+def _exit(signum: int) -> None:
+    global _pending, _terminated
+    import execsql.state as _state
+
+    _pending = None
+    # Set first, so a thread about to start a command sees it and starts none.
+    _terminated = signum
+    # Wait for a command another thread is starting to be listed: that thread
+    # (a daemon) may never run again once this one exits.  Past the wait, a
+    # command still starting is left to that thread.
+    listed = _starting.acquire(timeout=_START_WAIT)
+    try:
+        for proc in list(_commands):
+            # Kill only: the handler may have interrupted Popen.wait() on this
+            # command, which holds a lock a second wait() would block on
+            # forever.  The command() block reaps it as it is left.
+            _kill(proc)
+    finally:
+        if listed:
+            _starting.release()
+    if _state.exec_log is not None:
+        _state.exec_log.log_exit_terminated()
+    raise SystemExit(128 + signum)
+
+
+def _kill(proc: subprocess.Popen) -> bool:
+    """Kill *proc* unless it has finished; False if the OS refuses (a command running as another user)."""
+    try:
+        proc.kill()
+    except OSError:
+        return False
+    return True
+
+
+def _end_if_terminated() -> None:
+    """Raise the run's ``SystemExit`` once a SIGTERM has ended it (for a thread the handler does not interrupt)."""
+    if _terminated is not None:
+        raise SystemExit(128 + _terminated)
+
+
+@contextmanager
+def sigterm_held() -> Iterator[None]:
+    """Hold back a SIGTERM until the block ends, then end the run with it.
+
+    Keep the block short: a run asked to stop waits for it.  An exception
+    the block raises gives way to the held SIGTERM.  Off the main thread it
+    holds nothing, since the handler never interrupts that thread.
+    """
+    global _held
+    if threading.current_thread() is not threading.main_thread():
+        yield
+        return
+    _held += 1
+    try:
+        yield
+    finally:
+        _held -= 1
+        if not _held and _pending is not None:
+            _exit(_pending)
+
+
+@contextmanager
+def command(args: list[str]) -> Iterator[subprocess.Popen]:
+    """Start *args* as a command that is stopped when the block ends or the run is terminated.
+
+    Leaving the block, however it is left (the command finished, a timeout,
+    Ctrl-C, a SIGTERM), kills the command if it is still running and reaps
+    it.  A SIGTERM at any point after the command starts kills it before the
+    run's ``SystemExit`` is raised.  On a thread other than the main one,
+    which the handler does not interrupt, the block raises that
+    ``SystemExit`` itself once the SIGTERM has ended the run, and no command
+    starts after it.
+    """
+    proc = None
+    try:
+        with sigterm_held(), _starting:
+            _end_if_terminated()
+            proc = subprocess.Popen(args)
+            _commands.append(proc)
+        # The handler killed the command if it ended the run while it started.
+        _end_if_terminated()
+        yield proc
+    finally:
+        if proc is not None:
+            with sigterm_held():
+                # Killed before it is unlisted, so the handler kills it if this
+                # thread never gets that far.
+                killed = _kill(proc)
+                # Ctrl-C can land between Popen() returning and the append.
+                if proc in _commands:
+                    _commands.remove(proc)
+                if killed:
+                    proc.wait()
+        _end_if_terminated()

{execsql2-2.35.0.dist-info → execsql2-2.37.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: execsql2
-Version: 2.35.0
+Version: 2.37.0
 Summary: Runs a SQL script against a PostgreSQL, SQLite, MariaDB/MySQL, DuckDB, Firebird, MS-Access, MS-SQL-Server, or Oracle database, or an ODBC DSN. Provides metacommands to import and export data, copy data between databases, conditionally execute SQL and metacommands, and dynamically alter SQL and metacommands with substitution variables.
 Project-URL: Homepage, https://execsql2.readthedocs.io/en/stable/
 Project-URL: Repository, https://github.com/geocoug/execsql
@@ -441,7 +441,7 @@ execsql format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.35.0
+    rev: v2.37.0
     hooks:
       - id: execsql-format
       - id: execsql-lint

{execsql2-2.35.0.dist-info → execsql2-2.37.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 execsql/__init__.py,sha256=ZeVnpEWu8M2bn3qLmVM72NhWRueUGNbsX8UAPTermo0,901
 execsql/__main__.py,sha256=Nnh7_QgjYTTzd1Kog2thl7wzNpoxfnZ3YaurSOMzE_U,270
-execsql/api.py,sha256=WrlmuLKYpOnNLW8l9Svzeh28Ox0zGFrjhJtYlKY7niU,26831
+execsql/api.py,sha256=ElUu7NOZLbpmSTQOCP0ePeyiSYQhGAAZHMS_3p2zlU0,27349
 execsql/config.py,sha256=wTtugbLNplxgva4P8uD8jKYs8N0MywHPTvjwHTsYFDU,40528
 execsql/config_validation.py,sha256=a4ZszyJFGTNgs1jkvXE3yMCaYFtF1Uqih2ojMDVh1v8,10556
 execsql/exceptions.py,sha256=aHavdblmP7m5ZLxyyKKmPSwwbdmP962j4ShP1Gd9r64,9651
@@ -11,7 +11,7 @@ execsql/models.py,sha256=8AnxILNwFZjDX8xXvv5usgOcTDsOIwkfZJjeYbXREe8,18374
 execsql/parser.py,sha256=bw26e1lD-PZscV11VtBdqSLkjpcYfNLQC2EYfYD5UwU,16012
 execsql/plugins.py,sha256=RykMlIjTyWcnQc9ygjLErS3wdcsZSsG9QTIvg4DwfAI,13626
 execsql/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-execsql/state.py,sha256=rXhxx58dVFjhG58HGOXm3ewloVlvpcaYnW1rij4qjkM,23478
+execsql/state.py,sha256=oAtaiX9fD0y7cwO6Is9mM9MjaSUe-AmnjuYJ3g3r3kA,24294
 execsql/state.pyi,sha256=ZDHZ1DPKYu4Qs4bcJT31XNv4GOt6O4s_zH4UHCowovw,4344
 execsql/types.py,sha256=HiIhc8wqm9Trt8WYP40VU93uuBSPo1uPP3z-sMsUI1o,33719
 execsql/cli/__init__.py,sha256=FHg2lm2gt4L-XBnlVORn3qWHZ4739Ao-uwBIURfVIjg,2798
@@ -19,9 +19,9 @@ execsql/cli/application.py,sha256=tsSYE8cerJxY6y73GM_Xr1WBwc6A0_al8y969B6lPP8,12
 execsql/cli/dispatch.py,sha256=deyN2QQYvdzMSqGGa3CSMpaqdLNeMgc5Uke0mUbl764,2704
 execsql/cli/dsn.py,sha256=Jqr0CBtj6L3BY25Ej-U13xHV85phX1TFTVpjB7A-KIs,4815
 execsql/cli/help.py,sha256=bEy6ssVjyIw73JD_UPLXnCtnCifdVCKJr_cydAAVxhk,8220
-execsql/cli/lint.py,sha256=kQ5zOayLTOY1jib_6jME2mzSGKCsZ6FI_qr4fysLlRs,48433
+execsql/cli/lint.py,sha256=5rNSVbHbuhMo5xvPaNq0tGIGl7i0xNou6Sb8ZfnLNKc,50262
 execsql/cli/options.py,sha256=Srhf1gEOB5yy_7PxkTKBv07xK8Qzw8H-z7PUUnItpwE,2916
-execsql/cli/run.py,sha256=bMLvStRSX9svzb8GmbLJ9QS5bsPPoxBUhBbIwi1aX_g,42960
+execsql/cli/run.py,sha256=L1NdYlEKsy7E5-B67C9UqH3cJRstT9HUiAtUW6Qw828,42845
 execsql/cli/commands/__init__.py,sha256=FVe_xF7w98krP-USxqf-BIcflA1ctMYVsV8p0i6cChA,572
 execsql/cli/commands/config.py,sha256=V7CGGkhSCqeJIlAXxAYyG_xNhnsORiwqth2XWEVPzss,8213
 execsql/cli/commands/format.py,sha256=3awfNmCc6kImeyXKZo1Jt1qXbEuWk86ZllqEOY5vxzw,4456
@@ -31,13 +31,13 @@ execsql/cli/commands/listing.py,sha256=thtkJ-ILGd0SPs57oVIMkkCGpXsfS0hQxueMc2ccR
 execsql/cli/commands/lsp.py,sha256=8xIrqA4dnapdlLqbGGb53YtFTnsX2YqpLYvrrl-Z6pE,4051
 execsql/cli/commands/run.py,sha256=sGFDku66CazJrorr0mmrhUI3QDvQVSMEYlU8G1Pd5fQ,16492
 execsql/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-execsql/data/execsql.conf.template,sha256=3-sJPrB1u3KPsuiXv7X_BcSugUmRBgqFh37GuevyfTc,13138
+execsql/data/execsql.conf.template,sha256=kEUUg1x2TcJ356Zl-AvHqItAZzcG3hBBa8-pmqdSn5U,13292
 execsql/data/script_header.sql,sha256=a7WKScekNgJoxVEmMRTkWv8NsAzW1jJ4vJfGy9HVy0g,349
 execsql/db/__init__.py,sha256=jTbuafuKOqYtXFR1wvCOoKK5Lr3l1uErfaIbIr6UywI,1063
 execsql/db/access.py,sha256=fxiC3rtoOJzrNXNxau-w7oh1fd9tyh2_PMliBbFc164,21427
-execsql/db/base.py,sha256=nMaODzV2_JqJzXJCshlWRQ9ZANPGK6IcIJ4_PBtXyT0,47714
+execsql/db/base.py,sha256=BoCOp0hBa50jpCkyQ6W6GK_u9pMV5D0FuHx-vWzjFZ4,48090
 execsql/db/dsn.py,sha256=Evrc6MUllJVFDn0jZB_iks-aKCsXuNF9XYjAkttqgGQ,6995
-execsql/db/duckdb.py,sha256=c8VdZcmZdmyH8abrxM8mUk0BGIbittp-oV6UK7lsbgg,13954
+execsql/db/duckdb.py,sha256=QmIPVOVgltC-jCwQlu8LllkrQjhJ7gjjyNOXeKQNAHg,14262
 execsql/db/factory.py,sha256=Uz7Xcbff6ZZbtLM55FhHCwGdo4KKfqU_1kyjvOHn-HY,5691
 execsql/db/firebird.py,sha256=CoNnzFtOFAkp8OJByXXXclitCPAAjM23eFJGfy3C7IE,10171
 execsql/db/mysql.py,sha256=X-brnIFiQaOwVbY0uqPrC4esclhBv4sg-gHW3EVxHNw,26923
@@ -49,7 +49,7 @@ execsql/db/sqlserver.py,sha256=WIVvTp1MNKaUZn912U7ErcjSqhaLTqnZ2hfv_Gcso74,11601
 execsql/db/target_types.py,sha256=68nSyYY0mj6sgS26zeOYcFuUJA_ik08-0BeNsSM7UrE,8563
 execsql/db/tiers.py,sha256=PH2sUYwlYqcANGVKXprWQKVIlM6fpWU9q74djn8oFwc,2924
 execsql/debug/__init__.py,sha256=j6EGUR0dHzUhWN1mHHtf1-Lhjq3Sb1V-vmnq2Ztgj1M,178
-execsql/debug/repl.py,sha256=jnwrqRac4krc1pES7Ni-j1Dyw3mJIcWl5LQQIX1GkRw,20753
+execsql/debug/repl.py,sha256=NE3HfMCcDIlGsL_qNsKUfU_B_ZInjqGm-z89aZB2sAA,20785
 execsql/exporters/__init__.py,sha256=-Cnji-OgodJV8ftcDcOyTof0kQMy9J5kKVC8GVFpc3o,670
 execsql/exporters/base.py,sha256=_GoO0YqwlTxrjogxHI3CxxRR64sMgIEjRogt0KCqzoY,6402
 execsql/exporters/delimited.py,sha256=N0cP_CNlb_LLCUqbHmTQsOGufWnD_ddGdeFnXPE8Erc,35606
@@ -99,7 +99,7 @@ execsql/lsp/rename.py,sha256=fYk1gDSWWhqyoIGZO5hVIHPYYdGKNjgZS0mijFDFpac,3756
 execsql/lsp/server.py,sha256=gTjk1agZbygdbcowa3jkL45WJ37sxhJ58oiLB7BM6Bw,19893
 execsql/metacommands/__init__.py,sha256=aMf-3IRjMpNFSUI-IMAcvL-kXZHq5qF6W_p3UawdQwM,13115
 execsql/metacommands/conditions.py,sha256=4DsMXr6vnfbtcKqgnxYV4UK4NmAfE_hpfgkFjlH0bjo,29844
-execsql/metacommands/connect.py,sha256=SPk4h9yiUgTD3w1gNOT_oYx8VShggsO357by5Hoy6OI,15344
+execsql/metacommands/connect.py,sha256=rXUd78La8JeP0bqDgEPtEKPhH95RAtQGNcXSurXaqBo,15636
 execsql/metacommands/control.py,sha256=9swW6X8jXDUpu5cHiAnQVx1ahFyWxlx7mjg4dqYfX5Y,9355
 execsql/metacommands/data.py,sha256=9zxyg3_kV4jRuagUNtSlhhlvH2TiPP0gdNAaXBXdhI0,12493
 execsql/metacommands/debug.py,sha256=mKRT7uLwnw34Xl46fNDI_zH4MsPpZyihoLlonapbXuU,12981
@@ -107,51 +107,52 @@ execsql/metacommands/dispatch.py,sha256=m7p2L_HtooKfSv58MHbDmYJJ7Xe1UEpr6mnHdvAB
 execsql/metacommands/effects.py,sha256=cRSo48R4nRJzkRR3OGHLhJzofcdAaNIobaxmn1N9TGw,3813
 execsql/metacommands/io.py,sha256=vlGBje5sgnqeilooMdhJDgSRIhysHy5_7LrKtik9Xjs,3011
 execsql/metacommands/io_export.py,sha256=_1o5T3Ejqq_0N1hYwaRPgDktn8nZT8sQLMyXPRgXEec,14587
-execsql/metacommands/io_fileops.py,sha256=ru7zYgNV7rg0WtaDwhdYjy5iJTcecvjzR1PCdMNGG0A,13364
+execsql/metacommands/io_fileops.py,sha256=VlBscDcJ9RBShwmk9Jky9MWZbM6lA24_G4oymlehK-A,13550
 execsql/metacommands/io_import.py,sha256=gJICeK1MOfG6D73I7m8zBCalvr_ZJzD-QBKOpKYeYXo,15684
-execsql/metacommands/io_write.py,sha256=yXDkMbQ3haDARVATVUYZprakyJHSyk1NywdKkFLpQ14,12783
+execsql/metacommands/io_write.py,sha256=hKnDUB6jYQc38Y8Ou_1e8tuESnDiSf6e2iAN7FVtDSY,12889
 execsql/metacommands/prompt.py,sha256=PlXhtBYCembG_1SSCrwpQR10mGF3_jXodu4aCSHlSCM,37950
 execsql/metacommands/reference.py,sha256=9Q7DSiPEjXyD9HQkkqiToRN59TrZ8_6Gz9VVVv9WSjw,54369
-execsql/metacommands/script_ext.py,sha256=CsUbyq8QFPnnvfX_k7fPlYNvvRw1xLmAWER4Exo5pwc,3658
-execsql/metacommands/system.py,sha256=6X2qmMpGUHDzyEluEotXt0Ks9jKQTpc2x0eoYNgN12M,7997
+execsql/metacommands/script_ext.py,sha256=dtEjvl_gjPeAmsGZdp1evqGuz8lErKsuajMFGuPsEbE,3917
+execsql/metacommands/system.py,sha256=0noc1u-KlO6gE0KqJDScDeX0gIlG5ciaJplxOt-EDyo,8517
 execsql/metacommands/upsert.py,sha256=hcYGonmh2sdijbqwNynn1-iajMnLp7x5vbRbtfjaf8c,21461
 execsql/script/__init__.py,sha256=I7hVO6wm3iOocxRRGEcFHhjdtL1moKbUYLB-wKbjPdk,3267
-execsql/script/ast.py,sha256=WqCpFxhxrT2IIGvbArTp3QS0BZryRZAb7IL4ri3I6xg,20591
-execsql/script/control.py,sha256=WqLy-HLPqHG3vEzYpKMiIJsD7LpORjyQuUWzFzcGz4w,2327
+execsql/script/ast.py,sha256=KexrVh6dE4nHCB5CbC9odiPdyWw4rnUqD8bOsYdyNXg,21417
+execsql/script/control.py,sha256=-wyfeVR--Kst9hU3rmRkoQ-cPU4g23kCkod4r0vRKxE,4762
 execsql/script/engine.py,sha256=h1pUSXGqwJASLJizqzd9LBMn_U5Vuqc1UbaZk1xUinw,18468
-execsql/script/executor.py,sha256=s942xbokn1S8wUNqZd8zGKs-Hr-6Gd8FNaWqnTbZk28,41041
-execsql/script/parser.py,sha256=z73v6t6ZbPUKkRu-UOIL6q1cCRDeoRvG2aXXC8NpMvE,37162
+execsql/script/executor.py,sha256=TRRpycxyGch179imtiiUiWmCl8X3uWham_bG0fnvYjE,46799
+execsql/script/parser.py,sha256=wogBw31kPddNox3fz5KPS-y3He163h_T-ES2ZfZsrCI,39695
 execsql/script/variables.py,sha256=XHRnViFp0zPy-skGpYbpckkYAcczqpw1lqTVLR9eZvo,17735
 execsql/utils/__init__.py,sha256=0uR6JwVJQRX3vceByNBduCAf5dd5assKjeqJUWvpZoA,278
 execsql/utils/auth.py,sha256=0LYKdNMhodq9R0B8WyKp69a-xlP9wOR6Ua9Lgo2aJnQ,14868
 execsql/utils/color.py,sha256=goQqhnLg8yERpFolQikA9zYSVcuAm0unKTJiWTbQm-U,634
 execsql/utils/crypto.py,sha256=KlT6lPk-v0-qQQfAMfWvT9Q6kRdCD3_5JVaLajNocKM,3051
 execsql/utils/datetime.py,sha256=9ZizCFBYut5gC4gU3Cmegfddv1HLoU5xVQWm9thy5EI,6127
-execsql/utils/errors.py,sha256=PtOM2XZSMxXVyHEOcCLAmkeLNjGbGuecU8TVDgCF2RE,11668
+execsql/utils/errors.py,sha256=NspFIQXAcv3AWtXhcqV8K8r9kCeywW9whIj1uXiUXxc,12770
 execsql/utils/fileio.py,sha256=IqIEhun9aOnr1oBCWK2z2VAPVo95bZ54cVglLW4rV9M,48208
 execsql/utils/gui.py,sha256=1iiupP9AsLdR6ST0gcLE143o6y6YGUFlNv_pdVPxfCE,23943
 execsql/utils/mail.py,sha256=4RiKtXa_sqij_YGdYmjQ3PG0u3G9qjs-9caQwBErtBw,7278
 execsql/utils/numeric.py,sha256=_7bi5R6pHjMCkOPne_Sh5nUj-B8e9g6WFmjptFHaunA,1573
 execsql/utils/paths.py,sha256=7IIHT6vqXTfs6Ltfrzm_I2ZV4pU8IuedOLkHo6a1_K8,1175
 execsql/utils/regex.py,sha256=DGzPBl0Kt4--RbwPhoZI6Bm6N_CBUvI0DbqE4EF6qp8,3718
+execsql/utils/sigterm.py,sha256=_oK-Hj8vHiKTgR04mNud7BMX90Fb1TDHb9eT7f-auAI,5842
 execsql/utils/strings.py,sha256=UQNjpRCEFa1UO6feU-M-9e24wWAvizs_iu_4fFusLxo,8516
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.35.0.data/data/execsql2_extras/README.md,sha256=6f5bWiBlKRn8s6GVrU423-HFrU1Jwbk2AabxraLu3AY,5398
-execsql2-2.35.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.35.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
-execsql2-2.35.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.35.0.data/data/execsql2_extras/md_compare.sql,sha256=ARYEcOlxWLxfw-KCKDeJRdCqnuCb9PVwGaHtITR2sYU,26535
-execsql2-2.35.0.data/data/execsql2_extras/md_glossary.sql,sha256=gu2PDTm295YvxR7cDp25Mf-xXHly0BvlMudoNOrep5Q,10931
-execsql2-2.35.0.data/data/execsql2_extras/md_upsert.sql,sha256=YNUTFS6yB4bZXs-wRDn6dN8jL5wIumzZyE2uo5arIos,113407
-execsql2-2.35.0.data/data/execsql2_extras/pg_compare.sql,sha256=WcupGxQoWtMwHVPuy42xCpP4gAV4Ttb1W-_hwh-3xb4,24529
-execsql2-2.35.0.data/data/execsql2_extras/pg_glossary.sql,sha256=CfQz2HZj2nMvJfYfQrAmNYdx0uRrOIWsCXwVo5gKv_k,9953
-execsql2-2.35.0.data/data/execsql2_extras/script_template.sql,sha256=s5i0HULxp49N2Cpd24iALleM_dBq5oLuN3Arx_4Z7-o,11140
-execsql2-2.35.0.data/data/execsql2_extras/ss_compare.sql,sha256=PpU-vPyqqC1faBoo5zwVZlZHYKkT79QZisWVlk4o-ss,26415
-execsql2-2.35.0.data/data/execsql2_extras/ss_glossary.sql,sha256=_oTiZHpadPXWrNs8VoRe9PZgX9XdK490NMVWVTVtjl4,13110
-execsql2-2.35.0.data/data/execsql2_extras/ss_upsert.sql,sha256=Dvst877h4KHn8ayYF9EXI_OxqLQ89wyfcnGYYT4szro,118304
-execsql2-2.35.0.dist-info/METADATA,sha256=w_11vJcNw1_5LNse5KT9rHS7IJDv3-Ng6dCGM7q0_Oo,26939
-execsql2-2.35.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-execsql2-2.35.0.dist-info/entry_points.txt,sha256=jOf53-4IVGjEZeNYUOF1GGaiPNfVZcNKxP3vDFKEyMA,58
-execsql2-2.35.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.35.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
-execsql2-2.35.0.dist-info/RECORD,,
+execsql2-2.37.0.data/data/execsql2_extras/README.md,sha256=6f5bWiBlKRn8s6GVrU423-HFrU1Jwbk2AabxraLu3AY,5398
+execsql2-2.37.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.37.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
+execsql2-2.37.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.37.0.data/data/execsql2_extras/md_compare.sql,sha256=ARYEcOlxWLxfw-KCKDeJRdCqnuCb9PVwGaHtITR2sYU,26535
+execsql2-2.37.0.data/data/execsql2_extras/md_glossary.sql,sha256=gu2PDTm295YvxR7cDp25Mf-xXHly0BvlMudoNOrep5Q,10931
+execsql2-2.37.0.data/data/execsql2_extras/md_upsert.sql,sha256=YNUTFS6yB4bZXs-wRDn6dN8jL5wIumzZyE2uo5arIos,113407
+execsql2-2.37.0.data/data/execsql2_extras/pg_compare.sql,sha256=WcupGxQoWtMwHVPuy42xCpP4gAV4Ttb1W-_hwh-3xb4,24529
+execsql2-2.37.0.data/data/execsql2_extras/pg_glossary.sql,sha256=CfQz2HZj2nMvJfYfQrAmNYdx0uRrOIWsCXwVo5gKv_k,9953
+execsql2-2.37.0.data/data/execsql2_extras/script_template.sql,sha256=s5i0HULxp49N2Cpd24iALleM_dBq5oLuN3Arx_4Z7-o,11140
+execsql2-2.37.0.data/data/execsql2_extras/ss_compare.sql,sha256=PpU-vPyqqC1faBoo5zwVZlZHYKkT79QZisWVlk4o-ss,26415
+execsql2-2.37.0.data/data/execsql2_extras/ss_glossary.sql,sha256=_oTiZHpadPXWrNs8VoRe9PZgX9XdK490NMVWVTVtjl4,13110
+execsql2-2.37.0.data/data/execsql2_extras/ss_upsert.sql,sha256=Dvst877h4KHn8ayYF9EXI_OxqLQ89wyfcnGYYT4szro,118304
+execsql2-2.37.0.dist-info/METADATA,sha256=JgJFZpUBKXM92MDCnvSW34G7J9P5U0_A77eqr-fGNsI,26939
+execsql2-2.37.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+execsql2-2.37.0.dist-info/entry_points.txt,sha256=jOf53-4IVGjEZeNYUOF1GGaiPNfVZcNKxP3vDFKEyMA,58
+execsql2-2.37.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.37.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
+execsql2-2.37.0.dist-info/RECORD,,