execsql2 2.10.1__py3-none-any.whl → 2.11.1__py3-none-any.whl

execsql/cli/__init__.py

@@ -278,6 +278,11 @@ def main(
         "--profile",
         help="Record per-statement execution times and print a timing summary after the script completes.",
     ),
+    debug: bool = typer.Option(
+        False,
+        "--debug",
+        help="Start in step-through debug mode. The debug REPL pauses before each statement.",
+    ),
     version: bool | None = typer.Option(
         None,
         "--version",
@@ -446,6 +451,7 @@ def main(
         profile=profile,
         ping=ping,
         lint=lint,
+        debug=debug,
     )
 
 

execsql/cli/lint.py

@@ -194,7 +194,7 @@ def _lint_cmdlist(
     for cmd in cmdlist.cmdlist:
         src = cmd.source
         lno = cmd.line_no
-        stmt = cmd.command.statement if cmd.command_type == "sql" else cmd.command.statement
+        stmt = cmd.command.statement
 
         if cmd.command_type == "sql":
             # SQL statements: check for variable references only

execsql/cli/run.py

@@ -8,6 +8,7 @@ and drives the main execution loop.  Separated from argument parsing
 from __future__ import annotations
 
 import atexit
+from typing import Any
 import datetime
 import getpass
 import os
@@ -128,7 +129,7 @@ def _print_profile(profile_data: list[tuple]) -> None:
 # ---------------------------------------------------------------------------
 
 
-def _ping_db(db) -> None:
+def _ping_db(db: Any) -> None:
     """Test connectivity for *db*, print connection details, and exit.
 
     Attempts to execute ``SELECT version()`` (or ``SELECT sqlite_version()``
@@ -156,7 +157,7 @@ def _ping_db(db) -> None:
             curs.close()
             if row and row[0]:
                 version_str = str(row[0]).split("\n")[0].strip()
-            break
+                break
         except Exception:
             continue
 
@@ -214,6 +215,7 @@ def _run(
     profile: bool = False,
     ping: bool = False,
     lint: bool = False,
+    debug: bool = False,
 ) -> None:
     """Initialise state, connect to the database, load the script, and run it.
 
@@ -547,6 +549,9 @@ def _run(
     if profile:
         _state.profile_data = []
 
+    if debug:
+        _state.step_mode = True
+
     _execute_script_direct(conf, profile=profile)
 
 
@@ -653,7 +658,7 @@ def _execute_script_direct(conf: ConfigData, *, profile: bool = False) -> None:
         lno = strace[0][1]
         msg = f"{Path(sys.argv[0]).name}: Uncaught exception {sys.exc_info()[0]} ({sys.exc_info()[1]}) on line {lno}"
         script, slno = current_script_line()
-        if script is not None:
+        if script:
             msg += f" in script {script}, line {slno}"
         from execsql.utils.errors import exit_now
 

execsql/exporters/xlsx.py

@@ -178,6 +178,11 @@ def write_query_to_xlsx(
     wb.save(outfile)
     wb.close()
 
+    if _state.export_metadata is not None:
+        _state.export_metadata.add(
+            ExportRecord(queryname=select_stmt, outfile=outfile, zipfile=None, description=desc),
+        )
+
 
 def write_queries_to_xlsx(
     table_list: str,

execsql/exporters/yaml.py

@@ -82,6 +82,8 @@ def write_query_to_yaml(
         f = ZipWriter(zipfile, outfile, append)
 
     try:
+        if append:
+            f.write("---\n")
         f.write(yaml_text)
     finally:
         f.close()

execsql/metacommands/conditions.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from execsql.exceptions import ErrInfo
 
 """
 Conditional test handler functions for execsql.
@@ -15,6 +14,7 @@ at registration time.
 """
 
 import os
+from execsql.exceptions import ErrInfo
 import time
 from pathlib import Path
 from typing import Any

execsql/metacommands/control.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from execsql.exceptions import ErrInfo
 
 """
 Control-flow metacommand handlers for execsql.
@@ -18,6 +17,8 @@ Implements the imperative ``x_*`` functions for script flow control:
 """
 
 import time
+
+from execsql.exceptions import ErrInfo
 from typing import Any
 
 import execsql.state as _state
@@ -62,7 +63,8 @@ def x_assert(**kwargs: Any) -> None:
 
     result = _state.xcmd_test(condition)
     if result:
-        _state.exec_log.log_user_msg(f"ASSERT passed: {condition}")
+        if _state.exec_log is not None:
+            _state.exec_log.log_user_msg(f"ASSERT passed: {condition}")
     else:
         raise ErrInfo(type="cmd", other_msg=message)
 
@@ -134,14 +136,6 @@ def x_loop(**kwargs: Any) -> None:
         )
 
 
-def endloop() -> None:
-    if len(_state.loopcommandstack) == 0:
-        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()
-
-
 def x_halt(**kwargs: Any) -> None:
     errmsg = kwargs["errmsg"]
     tee = kwargs["tee"]

execsql/metacommands/debug.py

@@ -74,7 +74,7 @@ def x_debug_log_subvars(**kwargs: Any) -> None:
     local = kwargs["local"]
     user = kwargs["user"]
     for s in _state.commandliststack[-1].localvars.substitutions:
-        _state.exec_log.log_status_info(f"Substitution [{s}] = [{s}]")
+        _state.exec_log.log_status_info(f"Substitution [{s[0]}] = [{s[1]}]")
     if local is None:
         for s in _state.subvars.substitutions:
             if user is None or s[0][0].isalnum() or s[0][0] == "_":

execsql/metacommands/debug_repl.py

@@ -13,6 +13,11 @@ The REPL allows the user to:
 - Step through the script one statement at a time.
 - Resume or abort execution.
 
+All REPL commands are dot-prefixed (``.continue``, ``.vars``, ``.next``)
+to avoid ambiguity with variable names and SQL.  Anything not starting
+with ``.`` is treated as either a variable lookup (if it matches a known
+variable) or SQL (if it ends with ``;``).
+
 In non-interactive environments (CI, piped input, ``sys.stdin.isatty()`` is
 ``False``) the metacommand is silently skipped so automated pipelines are not
 blocked.
@@ -30,15 +35,19 @@ __all__ = ["x_breakpoint"]
 # ---------------------------------------------------------------------------
 
 _HELP_TEXT = """\
-execsql debug REPL commands:
-  continue  c        Resume script execution
-  abort     q quit   Halt the script (exit 1)
-  vars               List all substitution variables and their values
-  $VARNAME           Print a single variable's value  (also &VAR, @VAR)
-  SELECT ...;        Run ad-hoc SQL against the current database
-  next      n        Execute the next statement then pause again (step mode)
-  stack              Show the command-list stack (script name, line, depth)
-  help               Show this help text
+execsql debug REPL — all commands start with '.'
+
+  .continue  .c       Resume script execution
+  .abort     .q       Halt the script (exit 1)
+  .vars               List user, system, local, and counter variables
+  .vars all           Include environment variables (&) in the listing
+  .next      .n       Execute the next statement then pause again (step mode)
+  .stack              Show the command-list stack (script name, line, depth)
+  .help               Show this help text
+
+Everything else:
+  varname             Print a variable's value (e.g. logfile, $ARG_1, &HOME)
+  SELECT ...;         Run ad-hoc SQL against the current database
 """
 
 
@@ -64,7 +73,7 @@ def x_breakpoint(**kwargs: Any) -> None:
 def _debug_repl() -> None:
     """Interactive read-eval-print loop for script debugging.
 
-    Reads commands from stdin until the user types ``continue`` or ``abort``,
+    Reads commands from stdin until the user types ``.continue`` or ``.abort``,
     or until EOF / KeyboardInterrupt.
     """
     try:
@@ -72,7 +81,7 @@ def _debug_repl() -> None:
     except ImportError:
         pass  # readline not available on Windows; continue without it
 
-    _write("\n[Breakpoint] Script paused. Type 'help' for commands, 'continue' to resume.\n")
+    _write("\n[Breakpoint] Script paused. Type '.help' for commands, '.c' to resume.\n")
 
     while True:
         try:
@@ -87,27 +96,49 @@ def _debug_repl() -> None:
         if not line:
             continue
 
-        lower = line.lower()
+        # Dot-prefixed → REPL command
+        if line.startswith("."):
+            cmd = line[1:].strip().lower()
+            _handle_dot_command(line)
+            if cmd in ("continue", "c"):
+                return
+            if cmd in ("abort", "q", "quit"):
+                # _handle_dot_command already raised SystemExit, but guard anyway
+                return
+            if cmd in ("next", "n"):
+                return
+            continue
 
-        if lower in ("continue", "c"):
-            return
-        elif lower in ("abort", "q", "quit"):
-            raise SystemExit(1)
-        elif lower == "help":
-            _write(_HELP_TEXT)
-        elif lower == "vars":
-            _print_all_vars()
-        elif lower == "stack":
-            _print_stack()
-        elif lower in ("next", "n"):
-            _enable_step_mode()
-            return
-        elif line[0] in ("$", "&", "@"):
-            _print_var(line)
-        elif line.rstrip().endswith(";"):
+        # SQL (ends with semicolon)
+        if line.rstrip().endswith(";"):
             _run_sql(line)
-        else:
-            _write(f"Unknown command: {line!r}. Type 'help' for available commands.\n")
+            continue
+
+        # Everything else → variable lookup
+        _print_var(line)
+
+
+def _handle_dot_command(line: str) -> None:
+    """Dispatch a dot-prefixed REPL command."""
+    # Strip the leading dot and normalize
+    cmd = line[1:].strip().lower()
+
+    if cmd in ("continue", "c"):
+        return  # caller checks and returns from _debug_repl
+    elif cmd in ("abort", "q", "quit"):
+        raise SystemExit(1)
+    elif cmd == "help":
+        _write(_HELP_TEXT)
+    elif cmd == "vars all":
+        _print_all_vars(include_env=True)
+    elif cmd == "vars":
+        _print_all_vars()
+    elif cmd == "stack":
+        _print_stack()
+    elif cmd in ("next", "n"):
+        _enable_step_mode()
+    else:
+        _write(f"  Unknown command: {line!r}. Type '.help' for available commands.\n")
 
 
 # ---------------------------------------------------------------------------
@@ -125,8 +156,8 @@ def _write(text: str) -> None:
         sys.stdout.flush()
 
 
-def _print_all_vars() -> None:
-    """Print all substitution variables and their current values."""
+def _print_all_vars(*, include_env: bool = False) -> None:
+    """Print substitution variables grouped by type."""
     subvars = _state.subvars
     if subvars is None:
         _write("  (no substitution variables defined)\n")
@@ -135,17 +166,52 @@ def _print_all_vars() -> None:
     if not items:
         _write("  (no substitution variables defined)\n")
         return
-    # Compute column width for aligned output.
-    max_name = max((len(name) for name, _ in items), default=0)
+
+    # Group by prefix.
+    user_vars: list[tuple[str, str]] = []
+    system_vars: list[tuple[str, str]] = []
+    counter_vars: list[tuple[str, str]] = []
+    local_vars: list[tuple[str, str]] = []
+    env_vars: list[tuple[str, str]] = []
+
     for name, value in sorted(items):
-        _write(f"  {name:<{max_name}}  =  {value!r}\n")
+        if name.startswith("&"):
+            env_vars.append((name, value))
+        elif name.startswith("~"):
+            local_vars.append((name, value))
+        elif name.startswith("@"):
+            counter_vars.append((name, value))
+        elif name.startswith("$"):
+            system_vars.append((name, value))
+        else:
+            user_vars.append((name, value))
+
+    def _print_group(label: str, group: list[tuple[str, str]]) -> None:
+        if not group:
+            return
+        _write(f"  {label}:\n")
+        max_name = max(len(n) for n, _ in group)
+        for name, value in group:
+            _write(f"    {name:<{max_name}}  =  {value}\n")
+
+    _print_group("User variables", user_vars)
+    _print_group("System variables ($)", system_vars)
+    _print_group("Local variables (~)", local_vars)
+    _print_group("Counter variables (@)", counter_vars)
+    if include_env:
+        _print_group("Environment variables (&)", env_vars)
+
+    if not any([user_vars, system_vars, local_vars, counter_vars]):
+        if env_vars:
+            _write("  (no script variables defined — use '.vars all' to see environment variables)\n")
+        else:
+            _write("  (no variables defined)\n")
 
 
 def _print_var(varname: str) -> None:
     """Print the value of a single substitution variable.
 
-    Args:
-        varname: The variable reference as typed by the user, e.g. ``$FOO``.
+    Tries the name as typed, then with the sigil prefix stripped.
     """
     subvars = _state.subvars
     if subvars is None:
@@ -153,14 +219,14 @@ def _print_var(varname: str) -> None:
         return
     # Try the name as typed first, then without the sigil prefix ($, &, @, #, ~).
     # SUB creates variables without a prefix (e.g., "logfile"), but users
-    # naturally type "$logfile" at the prompt.
+    # may type "$logfile" at the prompt.
     value = subvars.varvalue(varname)
     if value is None and len(varname) > 1 and varname[0] in "$&@#~":
         value = subvars.varvalue(varname[1:])
     if value is None:
         _write(f"  {varname}: (undefined)\n")
     else:
-        _write(f"  {varname} = {value!r}\n")
+        _write(f"  {varname} = {value}\n")
 
 
 def _print_stack() -> None:
@@ -177,11 +243,7 @@ def _print_stack() -> None:
 
 
 def _run_sql(sql: str) -> None:
-    """Execute ad-hoc SQL against the current database and pretty-print the results.
-
-    Args:
-        sql: A complete SQL statement ending with a semicolon.
-    """
+    """Execute ad-hoc SQL against the current database and pretty-print the results."""
     dbs = _state.dbs
     if dbs is None:
         _write("  (no database connection is active)\n")

execsql/script/engine.py

@@ -194,7 +194,7 @@ class MetaCommandList:
         patterns; each compiles into a separate :class:`MetaCommand` prepended to
         the dispatch list so that later registrations take priority.
         """
-        if type(matching_regexes) in (tuple, list):
+        if isinstance(matching_regexes, (tuple, list)):
             raw_patterns = list(matching_regexes)
             regexes = [re.compile(rx, re.I) for rx in raw_patterns]
         else:
@@ -305,8 +305,14 @@ class SqlStmt:
             except Exception:
                 e = ErrInfo(type="exception", exception_msg=exception_desc())
             if e:
+                from execsql.utils.errors import stamp_errinfo
+
+                stamp_errinfo(e)
                 _state.subvars.add_substitution("$LAST_ERROR", cmd)
+                _state.subvars.add_substitution("$ERROR_MESSAGE", e.errmsg())
                 _state.status.sql_error = True
+                if _state.exec_log is not None:
+                    _state.exec_log.log_status_info(f"SQL error: {e.errmsg()}")
                 if _state.status.halt_on_err:
                     from execsql.utils.errors import exit_now
 
@@ -348,10 +354,18 @@ class MetacommandStmt:
         except Exception:
             e = ErrInfo(type="exception", exception_msg=exception_desc())
         if e:
+            from execsql.utils.errors import stamp_errinfo
+
+            stamp_errinfo(e)
             _state.status.metacommand_error = True
             _state.subvars.add_substitution("$LAST_ERROR", cmd)
+            _state.subvars.add_substitution("$ERROR_MESSAGE", e.errmsg())
+            if _state.exec_log is not None:
+                _state.exec_log.log_status_info(f"Metacommand error: {e.errmsg()}")
             if _state.status.halt_on_metacommand_err:
-                raise ErrInfo(type="cmd", command_text=cmd, other_msg=errmsg)
+                # Re-raise the original ErrInfo so its message is preserved, not
+                # replaced with the generic "Unknown metacommand" text.
+                raise e
         if _state.if_stack.all_true():
             # but nothing applies, because we got here.
             _state.status.metacommand_error = True
@@ -489,6 +503,11 @@ class CommandList:
             _state.subvars.add_substitution("$CURRENT_SCRIPT_NAME", Path(cmditem.source).name)
             _state.subvars.add_substitution("$CURRENT_SCRIPT_LINE", str(cmditem.line_no))
             _state.subvars.add_substitution("$SCRIPT_LINE", str(cmditem.line_no))
+            if _state.step_mode:
+                _state.step_mode = False
+                from execsql.metacommands.debug_repl import _debug_repl
+
+                _debug_repl()
             _profiling = _state.profile_data is not None
             if _profiling:
                 import time as _time
@@ -506,11 +525,6 @@ class CommandList:
                         cmditem.command.commandline()[:100],
                     ),
                 )
-            if _state.step_mode:
-                _state.step_mode = False
-                from execsql.metacommands.debug_repl import _debug_repl
-
-                _debug_repl()
         self.cmdptr += 1
 
     def run_next(self) -> None:

execsql/state.py

@@ -336,8 +336,7 @@ class _StateModule(types.ModuleType):
             # via setattr (local) or delattr (non-local).  Since context
             # attrs live on _ctx, not __dict__, patch takes the delattr
             # path.  We reset to the default rather than truly deleting.
-            _defaults = RuntimeContext()
-            setattr(self.__dict__["_ctx"], name, getattr(_defaults, name))
+            setattr(self.__dict__["_ctx"], name, getattr(_DEFAULT_CTX, name))
         else:
             super().__delattr__(name)
 
@@ -468,4 +467,5 @@ def initialize(
 # ---------------------------------------------------------------------------
 
 _ctx = RuntimeContext()
+_DEFAULT_CTX = RuntimeContext()  # Cached defaults for __delattr__ reset
 sys.modules[__name__].__class__ = _StateModule

execsql/utils/errors.py

@@ -30,6 +30,7 @@ __all__ = [
     "exception_desc",
     "exit_now",
     "fatal_error",
+    "stamp_errinfo",
     "write_warning",
     "file_size_date",
     "chainfuncs",
@@ -70,9 +71,37 @@ def exception_desc() -> str:
     return f"{exc_type}: {exc_strval} in {exc_filename} on line {exc_lineno} of execsql."
 
 
+def stamp_errinfo(errinfo: ErrInfo) -> ErrInfo:
+    """Attach script location from ``_state.last_command`` to an :class:`~execsql.exceptions.ErrInfo`.
+
+    Reads the source file name, line number, command text, and command type from
+    the most-recently-executed :class:`~execsql.script.engine.ScriptCmd` and
+    populates any ``None`` fields on *errinfo*.  This ensures that error messages
+    include "Line N of script foo.sql" context even when the ErrInfo was originally
+    created deep inside a handler that had no access to execution state.
+
+    Args:
+        errinfo: The :class:`~execsql.exceptions.ErrInfo` to stamp.
+
+    Returns:
+        The same *errinfo* object, with location fields populated.
+    """
+    lc = _state.last_command
+    if lc is not None and errinfo.script_file is None:
+        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
+            errinfo.cmdtype = lc.command_type
+    return errinfo
+
+
 def exit_now(exit_status: int, errinfo: ErrInfo | None, logmsg: str | None = None) -> None:
     em = None
     if errinfo is not None:
+        stamp_errinfo(errinfo)
+        if _state.subvars is not None:
+            _state.subvars.add_substitution("$ERROR_MESSAGE", errinfo.errmsg())
         em = errinfo.write()
         if _state.err_halt_writespec is not None:
             try:
@@ -147,10 +176,20 @@ def fatal_error(error_msg: str | None = None) -> None:
     exit_now(1, ErrInfo("error", other_msg=error_msg))
 
 
-def write_warning(warning_msg: str) -> None:
+def write_warning(warning_msg: str, *, always: bool = False) -> None:
+    """Write a non-fatal warning message to the log and optionally to stderr.
+
+    Args:
+        warning_msg: The warning text to emit.
+        always: When ``True``, always write to stderr regardless of the
+            ``conf.write_warnings`` setting.  Use this for structural warnings
+            (e.g. IF-level mismatch, unsubstituted variables) that should always
+            be visible.  When ``False`` (default), stderr output is gated by
+            ``conf.write_warnings``.
+    """
     if _state.exec_log is not None:
         _state.exec_log.log_status_warning(warning_msg)
-    if _state.conf is not None and _state.conf.write_warnings and _state.output is not None:
+    if _state.output is not None and (always or (_state.conf is not None and _state.conf.write_warnings)):
         _state.output.write_err(f"**** Warning {warning_msg}")
 
 

execsql/utils/gui.py

@@ -358,13 +358,35 @@ def gui_console_wait_user(message: str = "") -> None:
         print(message, file=sys.stderr)
 
 
-def gui_console_width() -> int:
-    """Return the current console width in characters."""
+def gui_console_width(width: int | None = None) -> int:
+    """Get or set the console width in characters.
+
+    When *width* is provided, updates the active GUI console (if any).
+    Always returns the current width.
+    """
+    global _console_width
+    if width is not None:
+        import execsql.state as _state
+
+        _console_width = int(width)
+        if _state.gui_console is not None and hasattr(_state.gui_console, "set_width"):
+            _state.gui_console.set_width(_console_width)
     return _console_width
 
 
-def gui_console_height() -> int:
-    """Return the current console height in lines."""
+def gui_console_height(height: int | None = None) -> int:
+    """Get or set the console height in lines.
+
+    When *height* is provided, updates the active GUI console (if any).
+    Always returns the current height.
+    """
+    global _console_height
+    if height is not None:
+        import execsql.state as _state
+
+        _console_height = int(height)
+        if _state.gui_console is not None and hasattr(_state.gui_console, "set_height"):
+            _state.gui_console.set_height(_console_height)
     return _console_height
 
 

{execsql2-2.10.1.dist-info → execsql2-2.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.10.1
+Version: 2.11.1
 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: Repository, https://github.com/geocoug/execsql
 Project-URL: Issues, https://github.com/geocoug/execsql/issues
@@ -220,9 +220,13 @@ execsql script.sql                          # read connection from config file
 | `-v {0,1,2,3}`                      | GUI level (0=none, 1=password, 2=selection, 3=full)             |
 | `-w`                                | Skip password prompt when a username is supplied                |
 | `--dsn URL`                         | Connection string (e.g. `postgresql://user:pass@host/db`)       |
+| `--output-dir DIR`                  | Default base directory for EXPORT output files                  |
 | `--dry-run`                         | Parse the script and report commands without executing          |
 | `--lint`                            | Static analysis: check structure and warn on issues (no DB)     |
+| `--ping`                            | Test database connectivity and exit                             |
+| `--profile`                         | Show per-statement timing summary after execution               |
 | `--progress`                        | Show a progress bar for long-running IMPORT operations          |
+| `--debug`                           | Start in step-through debug mode (REPL pauses before each stmt) |
 | `--dump-keywords`                   | Print metacommand keywords as JSON and exit                     |
 | `--gui-framework {tkinter,textual}` | GUI framework for interactive prompts                           |
 
@@ -297,7 +301,7 @@ execsql-format --check scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.4.4
+    rev: v2.11.0
     hooks:
       - id: execsql-format
         args: [--in-place]

{execsql2-2.10.1.dist-info → execsql2-2.11.1.dist-info}/RECORD

@@ -7,13 +7,13 @@ execsql/format.py,sha256=-6iknDddqbkapMo4NKmT5LAynDLqMW5kHgDWRg0KSws,11990
 execsql/models.py,sha256=DxkGp9iWbuZDWPGmnxZp9mvEeyOwxEJNx94fxQQiLfQ,13538
 execsql/parser.py,sha256=mbNSMiAMR1NvNvFtQAZq6nxBOupMGJZXSimLWLtZeNs,15537
 execsql/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-execsql/state.py,sha256=ovUQOr78R3LzsDUzBLL9Bq9ZdHiiFVlBvCNzilQ-K-s,15055
+execsql/state.py,sha256=29b3SwG4GirED2KVQc-cCC7Z_-FsGN3fEt9xQNN-Puo,15090
 execsql/types.py,sha256=HVWb4umIB9lpxCGgqk3xy1hoGYPfN39xci5mHF0Izq4,31882
-execsql/cli/__init__.py,sha256=Y4lFKvKWyjtMgSLsmACHYG33DFpeAQxddIVrlKURwpg,16081
+execsql/cli/__init__.py,sha256=dPKq7KOY7soD1GfBEztoRWcKuDLY5QyhzgC6PuyeyII,16270
 execsql/cli/dsn.py,sha256=svaZtrUXFRL2W5G6FRRiKtR6kehOp7urrVhIx_642Z8,2820
 execsql/cli/help.py,sha256=Sn_TgSJiQeBx-xZH0fuP5OvR_wasSTumjWF9UHfIX5k,5414
-execsql/cli/lint.py,sha256=KluYROdjGJNUrVbO3cJym-H296zbih4no-F10HF0P4U,16165
-execsql/cli/run.py,sha256=i0ip8tm21Sm4EFbfBdcekETmiABzrRfeP84SqA4IF68,30158
+execsql/cli/lint.py,sha256=XWuVcEsheZ8ql48VFWqICWEkAUezB2nIePX6SUiKSg8,16109
+execsql/cli/run.py,sha256=eiD_5R2ZL8WzhbW78DBcoSbcibmOXcr3po_aYYSoPwg,30250
 execsql/db/__init__.py,sha256=jTbuafuKOqYtXFR1wvCOoKK5Lr3l1uErfaIbIr6UywI,1063
 execsql/db/access.py,sha256=L79gUnAnnM9EJ_f4k42jr7DI0qGcKtLOnJTlBC7uPm0,17879
 execsql/db/base.py,sha256=hfMFj8fXY0T1aXLvWJHqb0aU4EQUDFOc-YrS29HH8U4,30405
@@ -44,9 +44,9 @@ execsql/exporters/sqlite.py,sha256=XA0ALLvy-r6Pz1lpOFkWWbvpSP9Hm1tHHiuo_BvPVDk,2
 execsql/exporters/templates.py,sha256=T9nk7vJrlxiPGfOWGc79xqqDxK3TCYu0wXq48U02npw,5564
 execsql/exporters/values.py,sha256=HIyud31aux_dbCphfKHEGeZB9fkIPE5PoGXQz817XIE,2520
 execsql/exporters/xls.py,sha256=nPROgxL8XK2oiBVoqN2L-o0j_jynRIMokwB8NpvOBt0,10623
-execsql/exporters/xlsx.py,sha256=xXTFIKkvJnNOsFdnhSYEkJa4ulTrtq9tIRk6SSchqA0,11299
+execsql/exporters/xlsx.py,sha256=Gm8ns_KeqSMu2DONSSJ1DcwPBEjYwpbU7frmX0g5L7c,11487
 execsql/exporters/xml.py,sha256=lqcOM8uKDoCayU42BPSLNH1_2DIHU5D3LtQItREU90c,2564
-execsql/exporters/yaml.py,sha256=0bwLDU3Fy00yMryBOSBSptbjV8Re6Ks-b62DObFNP4o,3062
+execsql/exporters/yaml.py,sha256=1Vuc6uMDuLTkCuXCfXWKz4gLkkAVdEXkLs4gEB_67Xo,3110
 execsql/exporters/zip.py,sha256=9-hExltQorONNThiMfxPDYHqHsbTeq9zM9zmtG4oFb8,4410
 execsql/gui/__init__.py,sha256=oCb-cyhLZzVpWJ4WU5HbqEDBrV-lm0ytEwxemrOZyqs,2048
 execsql/gui/base.py,sha256=sfNRkDrf7FhIgMRUOdyZpRLS1Xk9RqNhrV0A1RP6PXU,6068
@@ -60,12 +60,12 @@ execsql/importers/feather.py,sha256=g2B69d2uv9vmnXcmjFyTVsMP40LYEzFYkhk3gD26mGw,
 execsql/importers/ods.py,sha256=MJsdsjropzCvxAA3DDZfAL_AnmZ4yij7DnrjGyDJqHQ,2843
 execsql/importers/xls.py,sha256=e0Zfe47ZiCpA1Ae3XDJ1ko3sCiH3-8U6XLKi6NvD0jQ,3683
 execsql/metacommands/__init__.py,sha256=TT1ARHgHltHqZ7qx4Y62o1h_GOPvUztZKCem-wAE560,11215
-execsql/metacommands/conditions.py,sha256=QUpevCHce9kbKpt6XpHkc73q3bYAIfaBin0b6eaJnYQ,29259
+execsql/metacommands/conditions.py,sha256=Fzrk83-pWbFOoKahYdQW7CZjQeh3zByDUbfgpTM_bjQ,29259
 execsql/metacommands/connect.py,sha256=Nsm0D91i3RX-R2rzQQ-Br-gULaI6Uvdn9fqb7DOAVfE,14804
-execsql/metacommands/control.py,sha256=CBCg0ZKSR-BGejBW5cXwk6aJ9VrYBzCg9C40ofi8qi8,8776
+execsql/metacommands/control.py,sha256=xNHyTrYUM042OgDarNq7HxslY7JuQs-KOKcb-fHUngM,8510
 execsql/metacommands/data.py,sha256=tRQBGTAuW-eJ2tBNWaoZI9OjTyNNyHJISo7gOdL-sm8,11370
-execsql/metacommands/debug.py,sha256=nmfQ2ijUbTQO3drnyV9EzFueGSTfMl-CddP_NlQyI14,8178
-execsql/metacommands/debug_repl.py,sha256=UsTup7oYsJ0bNsKKynxQz-4wplFKnIcKSNrkz6gl0VM,7530
+execsql/metacommands/debug.py,sha256=pnT24dfvfOx8xFu86mO5czfVCGKbcvgBLyXnqaMWO4w,8184
+execsql/metacommands/debug_repl.py,sha256=XQ09I7HI-drVjfIg4XqsPndvAmZSxpSmXVKjWjLqwE4,9785
 execsql/metacommands/dispatch.py,sha256=1Mae6yqrea6wViFLBsvVt33Zgx4xP8tnhOuB_aQC89c,84054
 execsql/metacommands/io.py,sha256=Duh60caM4go9JczbGYNMKKYpcMimwPzF6EQ_tshKxdE,2971
 execsql/metacommands/io_export.py,sha256=7lkCSnPhXy9FVau9_hT1u68NOVdG2DsWmvUh9hM1QWI,18359
@@ -77,38 +77,38 @@ execsql/metacommands/script_ext.py,sha256=TUgAldB2LSJAwZrCvDDi804hQ1d9BDQD2GDqHN
 execsql/metacommands/system.py,sha256=sUR5kLL7idTVg8WXIMdd-Kv7nkERIiaeL0beWsz8NyY,7293
 execsql/script/__init__.py,sha256=pIo0EJ7-vg67rSMbOvbri_BOUgLoGoSEUfJgxUN7ZS0,3380
 execsql/script/control.py,sha256=s-1eZdGARM6H1FwZ6VDdO_f50j7bvvRtTHesfUm9tbc,6144
-execsql/script/engine.py,sha256=2WcOfYEOwO7L_NQAd3vk_c2wk1VZKJYSakSl07FBUts,40390
+execsql/script/engine.py,sha256=1_3qMn6a1nD4oYBBRNlwMU_YwZ4f2Om6-CjUGksJT4A,41087
 execsql/script/variables.py,sha256=MOT9XEHucpuuuHQZM5bklxGMBQcwHzwTBxd0q3aO0XY,11641
 execsql/utils/__init__.py,sha256=0uR6JwVJQRX3vceByNBduCAf5dd5assKjeqJUWvpZoA,278
 execsql/utils/auth.py,sha256=onXzNkNZQZxGC5w7eey06sjvAIAX_Lf9g7nUJtcsel0,7009
 execsql/utils/crypto.py,sha256=2OnBWwn9bCBGc1ZkyRv16TvhottoCNYtXqgbE3mG3Sg,2960
 execsql/utils/datetime.py,sha256=V_itd5vVvUPjT86P_z_hh4mlerMDGhDzI5MwPMDBaI4,7715
-execsql/utils/errors.py,sha256=2Nxp_uivLbhgeFNuAPCiGQzE9VAdF4b1kcPClOpvme8,6380
+execsql/utils/errors.py,sha256=YKhYD27-3timuZavc2vIrRIfHa71vzih-KVPsAKgvkU,8163
 execsql/utils/fileio.py,sha256=F6M4osE0Mb2ycTcvwwcYnhBXH1L36v6d7Oxdab6J16s,24110
-execsql/utils/gui.py,sha256=kCfHvqY60jdoJa1k5HlxhrmzM4HPp7uajV6nxz3_Qh4,17583
+execsql/utils/gui.py,sha256=UFtwrXPNqNvZCJFCbumZ1aG2d9B-vyaJXIG83fDHteo,18409
 execsql/utils/mail.py,sha256=75A1cMnEfyP0_QMMWuSLv8hrcIjc9cGBCrttLpr2TXQ,5372
 execsql/utils/numeric.py,sha256=xh02ANSRk3nUpQ-rtm66ILoMqoi7HtzCoRMIOT9U8QI,1570
 execsql/utils/regex.py,sha256=diEzTZqU_HHwVMadPAvN1Vgzhl7I03eVaEFGCXyGGL8,3770
 execsql/utils/strings.py,sha256=5Dvzrk-9SIw2lpxXZQkiJbNyo1sy7iXXAtSULlZ0KG8,8488
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.10.1.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.10.1.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.10.1.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.10.1.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
-execsql2-2.10.1.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.10.1.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
-execsql2-2.10.1.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
-execsql2-2.10.1.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
-execsql2-2.10.1.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
-execsql2-2.10.1.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
-execsql2-2.10.1.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
-execsql2-2.10.1.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
-execsql2-2.10.1.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
-execsql2-2.10.1.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
-execsql2-2.10.1.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
-execsql2-2.10.1.dist-info/METADATA,sha256=uRqE2iIiqGuy00GvroEk5nPDMg8PXCozmOtfi1DJr4Y,16956
-execsql2-2.10.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.10.1.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.10.1.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.10.1.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
-execsql2-2.10.1.dist-info/RECORD,,
+execsql2-2.11.1.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.11.1.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.11.1.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
+execsql2-2.11.1.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
+execsql2-2.11.1.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.11.1.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
+execsql2-2.11.1.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
+execsql2-2.11.1.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
+execsql2-2.11.1.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
+execsql2-2.11.1.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
+execsql2-2.11.1.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
+execsql2-2.11.1.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
+execsql2-2.11.1.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
+execsql2-2.11.1.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
+execsql2-2.11.1.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
+execsql2-2.11.1.dist-info/METADATA,sha256=cGmNeSCzZvJFmoCzDbMs_M3MjYP6YCZgQF0vNpIknVk,17381
+execsql2-2.11.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+execsql2-2.11.1.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.11.1.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.11.1.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
+execsql2-2.11.1.dist-info/RECORD,,