execsql2 2.18.1__py3-none-any.whl → 2.19.0__py3-none-any.whl

execsql/cli/run.py

@@ -65,12 +65,21 @@ def _print_dry_run(tree: object) -> None:
         else:
             ctype = "METACMD"
             raw = "-- !x! " + node.command
-        source_info = f"[dim]{node.span.file}:{node.span.start_line}[/dim]"
+        file_loc = f"{node.span.file}:{node.span.start_line}"
         try:
             expanded = substitute_vars(raw)
         except Exception:
             expanded = raw
-        _console.print(f"  [dim]{i:>4}[/dim]  [bold green]{ctype}[/bold green]  {source_info}  {expanded}")
+        lines = expanded.splitlines() or [""]
+        first, *continuations = lines
+        _console.print(
+            f"  [dim]{i:>4}[/dim]  [bold green]{ctype}[/bold green]  [dim]{file_loc}[/dim]  {first}",
+        )
+        if continuations:
+            prefix_width = 2 + 4 + 2 + 7 + 2 + len(file_loc) + 2
+            pad = " " * prefix_width
+            for cont in continuations:
+                _console.print(f"{pad}{cont}")
 
 
 # ---------------------------------------------------------------------------
@@ -411,6 +420,12 @@ def _route_positionals(
     ping: bool,
 ) -> None:
     """Apply remaining positional CLI arguments to *conf* as server/db/db_file."""
+    # When --ping is set, the script-file positional is ignored (ping has no
+    # script).  Users who add --ping to an existing invocation often leave the
+    # script in place — drop it from positional routing so the connection args
+    # behind it are interpreted correctly.
+    if ping and positional and Path(positional[0]).is_file() and positional[0].lower().endswith(".sql"):
+        positional = positional[1:]
     off = 0 if (command is not None or ping) else 1
     if len(positional) == off + 1:
         if conf.db_type in ("a", "l", "k"):
@@ -648,6 +663,33 @@ def _run(
 
     _state.output = WriteHooks()
 
+    # ------------------------------------------------------------------
+    # Early exits — modes that touch nothing besides parsing/connecting.
+    # Keep these before FileWriter / log / atexit so --dry-run and --ping
+    # honor their "no side effects" contracts.
+    # ------------------------------------------------------------------
+    if dry_run:
+        # Seed -a assign-args so substitute_vars in the dry-run print can
+        # expand them; the normal path does this inside _setup_logging,
+        # which we are skipping.
+        if sub_vars:
+            for n, repl in enumerate(sub_vars):
+                _state.subvars.add_substitution(f"$ARG_{n + 1}", repl)
+        _ast_tree = _load_script(command, script_name, conf.script_encoding)
+        _print_dry_run(_ast_tree)
+        raise SystemExit(0)
+
+    if ping:
+        if conf.server is None and conf.db is None and conf.db_file is None:
+            from execsql.utils.errors import fatal_error
+
+            fatal_error(
+                "Database not specified for --ping in configuration files or command-line arguments.",
+            )
+        db = _connect_initial_db(conf)
+        _state.dbs.add("initial", db)
+        _ping_db(db)  # raises SystemExit
+
     import execsql.utils.fileio as _fileio
 
     if _state.filewriter is None or not _state.filewriter.is_alive():
@@ -696,16 +738,9 @@ def _run(
     )
 
     # ------------------------------------------------------------------
-    # Load the SQL script (skipped in --ping mode)
+    # Load the SQL script (--dry-run / --ping already exited above)
     # ------------------------------------------------------------------
-    _ast_tree = None if ping else _load_script(command, script_name, conf.script_encoding)
-
-    # ------------------------------------------------------------------
-    # Dry-run: print command list and exit without connecting to DB
-    # ------------------------------------------------------------------
-    if dry_run:
-        _print_dry_run(_ast_tree)
-        raise SystemExit(0)
+    _ast_tree = _load_script(command, script_name, conf.script_encoding)
 
     # ------------------------------------------------------------------
     # NOTE: --lint is handled as an early exit in cli/__init__.py (AST
@@ -741,12 +776,6 @@ def _run(
     _state.subvars.add_substitution("$DB_SERVER", db.server_name)
     _state.subvars.add_substitution("$SYSTEM_CMD_EXIT_STATUS", "0")
 
-    # ------------------------------------------------------------------
-    # --ping: report connection details and exit (no script executed)
-    # ------------------------------------------------------------------
-    if ping:
-        _ping_db(db)  # raises SystemExit(0) on success
-
     # ------------------------------------------------------------------
     # Execute the script
     # ------------------------------------------------------------------

execsql/data/execsql.conf.template

@@ -1,6 +1,6 @@
 # execsql.conf — Configuration file for execsql
 #
-# Documentation: https://execsql2.readthedocs.io/reference/configuration/
+# Documentation: https://execsql2.readthedocs.io/en/latest/reference/configuration/
 #
 # This file uses INI format. Section names are case-sensitive (lowercase).
 # Property names are not case-sensitive. Lines starting with # are comments.
@@ -263,7 +263,7 @@
 #message_css=
 
 # Obfuscated password (XOR, not cryptographically secure — use keyring instead).
-# See: https://execsql2.readthedocs.io/reference/security/#credentials
+# See: https://execsql2.readthedocs.io/en/latest/reference/security/#credentials
 #enc_password=
 
 
@@ -279,6 +279,38 @@
 # Values: Yes or No.  Default: Yes.
 #allow_system_cmd=Yes
 
+# Whether to allow the RM_FILE metacommand (which deletes a file).
+# Set to No to prevent scripts from deleting files.
+# Also controllable via --no-rm-file CLI flag.
+# Values: Yes or No.  Default: Yes.
+#allow_rm_file=Yes
+
+# Whether to allow the SERVE metacommand (which opens an HTTP server on
+# a local port to serve a single file). Set to No to disable.
+# Also controllable via --no-serve CLI flag.
+# Values: Yes or No.  Default: Yes.
+#allow_serve=Yes
+
+# Root directory under which INCLUDE / EXECUTE SCRIPT targets must
+# resolve. When set, attempts to include files outside this root via
+# ../, absolute paths, drive letters, or UNC paths are rejected with
+# an error. Default: no containment (any readable path is permitted).
+#include_root=
+
+# Root directory under which SERVE targets must resolve. Same
+# containment semantics as include_root. Default: no containment.
+#serve_root=
+
+# Root directory under which Jinja2 / string.Template loader paths
+# must resolve. Same containment semantics as include_root.
+# Default: no containment.
+#template_root=
+
+# Maximum byte size of any single substitution-variable expansion,
+# enforced by the substitute_vars() engine to defeat exponential-
+# expansion bombs. Default: 10 MB (10485760).
+#max_substitution_bytes=10485760
+
 # Whether to log all data variable assignments.
 # Values: Yes or No.  Default: Yes.
 #log_datavars=Yes

execsql/db/access.py

@@ -88,12 +88,6 @@ class AccessDatabase(Database):
     def __repr__(self) -> str:
         return f"AccessDatabase({self.db_name}, {self.encoding})"
 
-    def auto_commits_ddl(self) -> bool:
-        """MS Access (via Jet/ACE on pyodbc) implicitly commits DDL —
-        ``rollback()`` is a silent no-op for any transaction whose
-        boundary the DDL crossed."""
-        return True
-
     def open_db(self) -> None:
         """Open an ODBC connection to the Access database."""
         # Open an ODBC connection.

execsql/db/base.py

@@ -253,19 +253,6 @@ class Database(ABC):
         """
         return False
 
-    def auto_commits_ddl(self) -> bool:
-        """Return True if this adapter's driver implicitly commits DDL.
-
-        Oracle, MySQL, SQL Server, and MS Access all auto-commit DDL —
-        ``rollback()`` is a silent no-op for any transaction whose
-        boundary the DDL crossed. Callers that wrap DDL inside an
-        explicit ``BEGIN BATCH … END BATCH`` block on these adapters
-        get weaker rollback guarantees than on PostgreSQL / SQLite, and
-        should be aware of the asymmetry. See
-        ``docs/about/divergence.md`` for the full per-DBMS matrix.
-        """
-        return False
-
     def schema_qualified_table_name(self, schema_name: str | None, table_name: str) -> str:
         """Return the quoted, optionally schema-qualified form of *table_name*."""
         table_name = self.type.quoted(table_name)

execsql/db/mysql.py

@@ -73,12 +73,6 @@ class MySQLDatabase(Database):
             f"{self.need_passwd!r}, {self.port!r}, {self.encoding!r})"
         )
 
-    def auto_commits_ddl(self) -> bool:
-        """MySQL / MariaDB implicitly commit DDL — ``rollback()`` is a
-        silent no-op for any transaction whose boundary the DDL
-        crossed. See ``docs/about/divergence.md``."""
-        return True
-
     def quote_identifier(self, identifier: str) -> str:
         """MySQL / MariaDB native identifier quoting uses backticks.
 

execsql/db/oracle.py

@@ -61,12 +61,6 @@ class OracleDatabase(Database):
             f"{self.need_passwd!r}, {self.port!r}, {self.encoding!r})"
         )
 
-    def auto_commits_ddl(self) -> bool:
-        """Oracle implicitly commits DDL — ``rollback()`` is a silent
-        no-op for any transaction whose boundary the DDL crossed.
-        See ``docs/about/divergence.md`` for the per-DBMS matrix."""
-        return True
-
     def open_db(self) -> None:
         """Open a connection to the Oracle database."""
         import cx_Oracle

execsql/db/sqlserver.py

@@ -58,12 +58,6 @@ class SqlServerDatabase(Database):
             f"{self.need_passwd!r}, {self.port!r}, {self.encoding!r})"
         )
 
-    def auto_commits_ddl(self) -> bool:
-        """SQL Server implicitly commits DDL on Microsoft's pyodbc
-        driver in autocommit mode — ``rollback()`` is a silent no-op
-        for any transaction whose boundary the DDL crossed."""
-        return True
-
     def quote_identifier(self, identifier: str) -> str:
         """SQL Server native identifier quoting uses square brackets.
 

execsql/debug/repl.py

@@ -12,10 +12,26 @@ 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 ``;``).
+Dispatch is two-way (psql-style): input starting with ``.`` is a REPL
+command (``.continue``, ``.vars [VAR]``, ``.next``, etc.), everything
+else is SQL.  Multi-line SQL is supported: any non-``.`` input opens a
+buffer whose continuation prompt is ``  ...        > ``, accumulating
+until a line ends with ``;``.  ``.cancel`` (or Ctrl-C / EOF) discards
+the partial buffer.
+
+Variable lookup is explicit — ``.vars LOGFILE`` prints one variable;
+``.vars`` lists them all.  There is no bare-identifier lookup, so any
+SQL keyword you type starts a buffer the moment you press Enter.
+
+The trailing ``;`` is the SQL terminator both within one line and across
+multiple lines — the REPL has no read-only mode and DDL on most adapters
+is irreversible, so requiring ``;`` is a small intent gate against
+accidental DML/DDL on mistyped input.  Use SQL ``BEGIN; … ROLLBACK;`` to
+bracket exploratory DML if you need recoverability.
+
+Errors raised by any REPL helper — bad SQL, malformed dot-commands, etc. —
+are caught at the loop level so the session re-prompts instead of escaping
+through ``x_breakpoint`` and being stamped as a "Metacommand error".
 
 In non-interactive environments (CI, piped input, ``sys.stdin.isatty()`` is
 ``False``) the metacommand is silently skipped so automated pipelines are not
@@ -104,21 +120,21 @@ def _c(code: str, text: str) -> str:
 
 _HELP_COMMANDS = [
     (".continue", ".c", "Resume script execution"),
-    (".abort", ".q", "Halt the script (exit 1)"),
-    (".vars", ".v", "List user, system, local, and counter variables"),
-    (".vars all", ".v all", "Include environment variables (&) in the listing"),
+    (".quit", ".q", "Halt the script (exit 1)"),
+    (".vars", ".v", "List all execsql substitution variables"),
+    (".vars VAR", ".v VAR", "Print the value of a single variable (e.g. .vars logfile)"),
     (".next", ".n", "Execute the next statement then pause again (step mode)"),
     (".where", ".w", "Show the current script location and upcoming statement"),
     (".stack", "", "Show the command-list stack (script name, line, depth)"),
     (".set VAR VAL", ".s", "Set or update a substitution variable"),
     (".scripts", "", "List all registered SCRIPT definitions"),
     (".scripts NAME", "", "Show detail for a specific SCRIPT"),
+    (".cancel", "", "Discard a partial multi-line SQL buffer"),
     (".help", ".h", "Show this help text"),
 ]
 
 _HELP_OTHER = [
-    ("varname", "Print a variable's value (e.g. logfile, $ARG_1, &HOME)"),
-    ("SELECT ...;", "Run SQL ending with ';' (expects columns returned, e.g. SELECT)"),
+    ("SELECT ...;", "Run SQL — multi-line accepted, terminate with ';' to execute"),
 ]
 
 _HELP_CMD_WIDTH = 13  # width of the command column
@@ -216,40 +232,71 @@ def _debug_repl(*, step: bool = False) -> None:
     _hint_c = _c(_DIM, "'.c'")
     _write(f"  Type {_hint_help} for commands, {_hint_c} to resume.\n\n")
 
+    sql_buffer: list[str] = []
+
     while True:
+        prompt = "  ...        > " if sql_buffer else "execsql debug> "
         try:
-            line = input("execsql debug> ").strip()
+            line = input(prompt).strip()
         except EOFError:
+            if sql_buffer:
+                sql_buffer.clear()
+                _write("\n  (input discarded)\n")
+                continue
             _write("\n")
-            return  # Ctrl-D → continue
+            return
         except KeyboardInterrupt:
+            if sql_buffer:
+                sql_buffer.clear()
+                _write("\n  (input discarded)\n")
+                continue
             _write("\n")
-            return  # Ctrl-C → continue
+            return
 
         if not line:
             continue
 
-        # 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
+        try:
+            if line.startswith("."):
+                cmd = line[1:].strip().lower()
+                if cmd == "cancel":
+                    if sql_buffer:
+                        sql_buffer.clear()
+                        _write("  (input discarded)\n")
+                    continue
+                _handle_dot_command(line)
+                if cmd in ("continue", "c"):
+                    return
+                if cmd in ("abort", "q", "quit"):
+                    return
+                if cmd in ("next", "n"):
+                    return
+                continue
+
+            if sql_buffer:
+                sql_buffer.append(line)
+                joined = " ".join(sql_buffer)
+                if joined.rstrip().endswith(";"):
+                    _run_sql(joined)
+                    sql_buffer.clear()
+                continue
+
+            if line.rstrip().endswith(";"):
+                _run_sql(line)
+                continue
+
+            sql_buffer.append(line)
+        except SystemExit:
+            raise
+        except KeyboardInterrupt:
+            sql_buffer.clear()
+            _write("\n  (interrupted)\n")
             continue
-
-        # SQL (ends with semicolon)
-        if line.rstrip().endswith(";"):
-            _run_sql(line)
+        except Exception as exc:
+            sql_buffer.clear()
+            _write(f"  {_c(_RED, 'Error:')} {exc}\n")
             continue
 
-        # Everything else → variable lookup
-        _print_var(line)
-
 
 def _handle_dot_command(line: str) -> None:
     """Dispatch a dot-prefixed REPL command."""
@@ -262,10 +309,14 @@ def _handle_dot_command(line: str) -> None:
         raise SystemExit(1)
     elif cmd in ("help", "h"):
         _write(_format_help())
-    elif cmd in ("vars all", "v all"):
-        _print_all_vars(include_env=True)
     elif cmd in ("vars", "v"):
         _print_all_vars()
+    elif cmd.startswith("vars ") or cmd.startswith("v "):
+        rest = cmd.split(None, 1)[1].strip() if " " in cmd else ""
+        if rest:
+            _print_var(rest)
+        else:
+            _print_all_vars()
     elif cmd in ("where", "w"):
         _print_where()
     elif cmd == "stack":
@@ -383,7 +434,11 @@ def _print_all_vars(*, include_env: bool = False) -> None:
         _write(f"  {_c(_BOLD, label)}:\n")
         max_name = max(len(n) for n, _ in group)
         for name, value in group:
-            _write(f"    {_c(_CYAN, name):<{max_name}}  {_c(_DIM, '=')}  {value}\n")
+            # Pre-compute padding from RAW name length — the format-spec ``:<{max_name}``
+            # form measures the colored string, which (when ANSI is on) is ~9 chars
+            # longer per wrap and breaks the column alignment.
+            pad = " " * (max_name - len(name))
+            _write(f"    {_c(_CYAN, name)}{pad}  {_c(_DIM, '=')}  {value}\n")
 
     _print_group("User", user_vars)
     _print_group("System ($)", system_vars)
@@ -477,7 +532,7 @@ def _print_stack() -> None:
 
 
 def _run_sql(sql: str) -> None:
-    """Execute ad-hoc SQL against the current database and pretty-print the results."""
+    """Execute ad-hoc SQL and pretty-print results or affected rowcount."""
     dbs = _state.dbs
     if dbs is None:
         _write("  (no database connection is active)\n")
@@ -486,8 +541,35 @@ def _run_sql(sql: str) -> None:
     if db is None:
         _write("  (no database connection is active)\n")
         return
+
     try:
-        colnames, rows = db.select_data(sql)
+        with db._cursor() as curs:
+            try:
+                curs.execute(sql)
+            except Exception as exc:
+                try:
+                    db.rollback()
+                except Exception:
+                    pass
+                _write(f"  {_c(_RED, 'SQL error:')} {exc}\n")
+                return
+
+            try:
+                _state.subvars.add_substitution("$LAST_ROWCOUNT", curs.rowcount)
+            except Exception:
+                pass
+
+            if curs.description is None:
+                rowcount = curs.rowcount if curs.rowcount is not None else -1
+                if rowcount >= 0:
+                    row_word = "row" if rowcount == 1 else "rows"
+                    _write(f"  {_c(_DIM, f'({rowcount} {row_word} affected)')}\n")
+                else:
+                    _write(f"  {_c(_DIM, '(statement executed)')}\n")
+                return
+
+            colnames = [d[0] for d in curs.description]
+            rows = curs.fetchall()
     except Exception as exc:
         _write(f"  {_c(_RED, 'SQL error:')} {exc}\n")
         return

execsql/exporters/feather.py

@@ -58,20 +58,26 @@ def write_query_to_hdf5(
             other_msg="The tables Python library must be installed to export data to the HDF5 format.",
         ) from e
     try:
-        hdrs, rows = db.select_rowsource(select_stmt)
+        hdrs, row_iter = db.select_rowsource(select_stmt)
     except ErrInfo:
         raise
     except Exception as e:
         raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
+    # Materialize once so DataTable's type inference (below) and the write
+    # loop (further below) share the same rows without a second query.
+    rows = list(row_iter)
 
     def h5type(datatype, size):
-        if datatype in (_state.DT_Varchar, _state.DT_Text):
+        if datatype == _state.DT_Varchar:
             t = tables.StringCol(size)
             do_cast = False
         elif datatype == _state.DT_Text:
             t = tables.StringCol(_state.conf.hdf5_text_len)
             do_cast = False
-        elif datatype in (_state.DT_Integer, _state.DT_Long):
+        elif datatype == _state.DT_Long:
+            t = tables.Int64Col()
+            do_cast = False
+        elif datatype == _state.DT_Integer:
             t = tables.IntCol()
             do_cast = False
         elif datatype in (_state.DT_Float, _state.DT_Decimal):
@@ -87,25 +93,20 @@ def write_query_to_hdf5(
             raise ErrInfo("error", other_msg=f"Invalid data type for export to HDF5: {repr(datatype)}")
         return t, do_cast
 
-    # Create a dictionary of column names with the HDF5 data types
     tbl_desc = DataTable(hdrs, rows)
     h5type_dict = {}
     cast_flags = []
-    # Iterate over hdrs instead of tbl_desc.cols to preserve column order.
     for h in hdrs:
         dt = [col for col in tbl_desc.cols if col.name == h][0].dt
-        # dt is a tuple of: 0: the column name; 1: the data type class; 2: the maximum length or None if NA; other info.
+        # dt is (name, data-type-class, max-length-or-None, ...)
         h5typ, as_str = h5type(dt[1], dt[2])
         h5type_dict[h] = h5typ
         cast_flags.append(as_str)
-    # Open the HDF5 table
     filewriter_close(outfile)
     h5file_mode = "a" if append else "w"
     h5file = tables.open_file(outfile, mode=h5file_mode)
     h5grp = h5file.create_group("/", table_name, title=desc)
     h5tbl = h5file.create_table(h5grp, table_name, h5type_dict)
-    # Write the data.
-    hdrs, rows = db.select_rowsource(select_stmt)
     for datarow in rows:
         h5row = h5tbl.row
         for i, h in enumerate(hdrs):

execsql/format.py

@@ -16,11 +16,27 @@ import io
 import re
 from pathlib import Path
 
-import sqlglot
-import sqlglot.errors
-
 __all__ = ["collect_paths", "format_file", "main", "parse_keyword"]
 
+
+_SQLGLOT_MISSING_MSG = (
+    "execsql-format requires sqlglot for SQL reformatting.\n"
+    "  Install with:  pip install execsql2[formatter]\n"
+    "  Or skip SQL reformatting with the --no-sql flag."
+)
+
+
+def _require_sqlglot():
+    """Lazy import of sqlglot, raising ImportError with an install hint if missing."""
+    try:
+        import sqlglot
+        import sqlglot.errors  # noqa: F401
+
+        return sqlglot
+    except ImportError as e:
+        raise ImportError(_SQLGLOT_MISSING_MSG) from e
+
+
 # ---------------------------------------------------------------------------
 # Constants
 # ---------------------------------------------------------------------------
@@ -161,6 +177,9 @@ def _sqlglot_format(
     leading_comma: bool = False,
 ) -> list[str]:
     """Format a list of SQL-only lines (no comment-only lines) via sqlglot."""
+    sqlglot = _require_sqlglot()
+    import sqlglot.errors as sqlglot_errors
+
     text = "\n".join(sql_lines)
     protected, replacements = _protect_variables(text)
 
@@ -169,7 +188,7 @@ def _sqlglot_format(
 
     try:
         with contextlib.redirect_stderr(io.StringIO()):
-            ast = sqlglot.parse(protected, read="postgres", error_level=sqlglot.errors.ErrorLevel.IGNORE)
+            ast = sqlglot.parse(protected, read="postgres", error_level=sqlglot_errors.ErrorLevel.IGNORE)
             statements: list[str] = []
             for node in ast:
                 if node is None:

execsql/importers/base.py

@@ -15,7 +15,6 @@ from typing import Any
 from execsql.exceptions import ErrInfo
 from execsql.db.base import Database
 import execsql.state as _state
-from execsql.types import dbt_firebird
 
 __all__ = ["import_data_table"]
 
@@ -84,9 +83,9 @@ def import_data_table(
         sql = get_ts().create_table(db.type, schemaname, tablename)
         try:
             db.execute(sql)
-            # Don't commit here; commit will be done after populating the table
-            # ...except for Firebird.
-            if db.type == dbt_firebird:
+            # Most adapters delay commit until after populating the table; adapters
+            # that need DDL committed first (Firebird) must do it here.
+            if db.needs_explicit_commit_after_ddl():
                 db.conn.commit()
         except Exception as e:
             raise ErrInfo(

execsql/importers/xls.py

@@ -39,7 +39,12 @@ def xls_data(
 
         wbk = XlsFile()
     elif ext3 == "lsx":
-        # openpyxl imported lazily
+        from execsql.utils.fileio import check_zip_decompression_ratio
+
+        try:
+            check_zip_decompression_ratio(filename)
+        except FileNotFoundError:
+            pass
         from execsql.exporters.xls import XlsxFile
 
         wbk = XlsxFile()

execsql/metacommands/__init__.py

@@ -2,8 +2,8 @@
 
 Importing this module populates a ``MetaCommandList`` (``DISPATCH_TABLE``)
 with every metacommand regex and its handler function. The dispatch
-table is consumed by ``script.MetacommandStmt.run()`` via
-``_state.metacommandlist``.
+table is consumed by :func:`execsql.script.executor._exec_metacommand`
+via ``_state.metacommandlist``.
 
 The table itself is built by ``build_dispatch_table()`` in
 :mod:`execsql.metacommands.dispatch`. Handler functions are organized

execsql/metacommands/data.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from execsql.exceptions import ErrInfo
 
 """

execsql/script/executor.py

@@ -83,10 +83,6 @@ _DEFER_RX = re.compile(r"!\{([$@&~#+]?\w+)\}!")
 _VARLIKE = re.compile(r"!![$@&~#]?\w+!!", re.I)
 
 
-# Legacy module-level alias — ``_ast_scripts`` is now ``ctx.ast_scripts``
-# on the RuntimeContext.  Kept as a comment for grep-ability.
-
-
 def _stack_localvars(ctx: RuntimeContext) -> SubVarSet | None:
     """Build the merged ``~`` local + ``#`` param overlay for the current scope.
 
@@ -210,7 +206,7 @@ def _set_command_vars(ctx: RuntimeContext, source: str, line_no: int) -> None:
 
 
 # ---------------------------------------------------------------------------
-# SQL execution (bypasses SqlStmt.run's if_stack check)
+# SQL execution
 # ---------------------------------------------------------------------------
 
 
@@ -264,7 +260,7 @@ def _exec_sql(
 
 
 # ---------------------------------------------------------------------------
-# Metacommand execution (bypasses MetacommandStmt.run's if_stack check)
+# Metacommand execution
 # ---------------------------------------------------------------------------
 
 

execsql/script/parser.py

@@ -102,6 +102,19 @@ def _strip_quotes(s: str) -> str:
     return s
 
 
+def _unclosed_block_msg(top: _BlockFrame) -> str:
+    """Message blaming an unclosed opening block for a wrong-kind END-keyword error."""
+    if top.kind == "if":
+        return f"IF on line {top.start_line} of {top.source} has no matching ENDIF."
+    if top.kind == "loop":
+        return f"LOOP on line {top.start_line} of {top.source} has no matching ENDLOOP."
+    if top.kind == "batch":
+        return f"BEGIN BATCH on line {top.start_line} of {top.source} has no matching END BATCH."
+    if top.kind == "script":
+        return f"BEGIN SCRIPT on line {top.start_line} of {top.source} has no matching END SCRIPT."
+    return f"{top.kind.upper()} on line {top.start_line} of {top.source} is unclosed."
+
+
 _EXEC_SCRIPT_RX = re.compile(
     r"^\s*(?:EXEC(?:UTE)?|RUN)\s+SCRIPT"
     r"(?P<exists>\s+IF\s+EXISTS)?"
@@ -529,11 +542,17 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                 end_name = m.group("name")
                 if end_name is not None:
                     end_name = end_name.lower()
-                if not block_stack or block_stack[-1].kind != "script":
+                if not block_stack:
+                    raise ErrInfo(
+                        type="cmd",
+                        command_text=line,
+                        other_msg=f"END SCRIPT on line {file_lineno} of {source_name} has no matching BEGIN SCRIPT.",
+                    )
+                if block_stack[-1].kind != "script":
                     raise ErrInfo(
                         type="cmd",
                         command_text=line,
-                        other_msg=f"Unmatched END SCRIPT metacommand on line {file_lineno} of file {source_name}.",
+                        other_msg=_unclosed_block_msg(block_stack[-1]),
                     )
                 frame = block_stack[-1]
                 script_node = frame.node
@@ -595,7 +614,7 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                     raise ErrInfo(
                         type="cmd",
                         command_text=line,
-                        other_msg=f"ELSEIF without matching IF on line {file_lineno} of {source_name}.",
+                        other_msg=f"ELSEIF on line {file_lineno} of {source_name} has no matching IF.",
                     )
                 frame = block_stack[-1]
                 frame._in_else = False
@@ -616,7 +635,7 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                     raise ErrInfo(
                         type="cmd",
                         command_text=line,
-                        other_msg=f"ANDIF without matching IF on line {file_lineno} of {source_name}.",
+                        other_msg=f"ANDIF on line {file_lineno} of {source_name} has no matching IF.",
                     )
                 modifier = ConditionModifier(
                     kind="AND",
@@ -638,7 +657,7 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                     raise ErrInfo(
                         type="cmd",
                         command_text=line,
-                        other_msg=f"ORIF without matching IF on line {file_lineno} of {source_name}.",
+                        other_msg=f"ORIF on line {file_lineno} of {source_name} has no matching IF.",
                     )
                 modifier = ConditionModifier(
                     kind="OR",
@@ -660,7 +679,7 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                     raise ErrInfo(
                         type="cmd",
                         command_text=line,
-                        other_msg=f"ELSE without matching IF on line {file_lineno} of {source_name}.",
+                        other_msg=f"ELSE on line {file_lineno} of {source_name} has no matching IF.",
                     )
                 frame = block_stack[-1]
                 frame._in_else = True
@@ -671,11 +690,17 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
             # -- ENDIF --
             m = _ENDIF_RX.match(cmd_text)
             if m:
-                if not block_stack or block_stack[-1].kind != "if":
+                if not block_stack:
                     raise ErrInfo(
                         type="cmd",
                         command_text=line,
-                        other_msg=f"ENDIF without matching IF on line {file_lineno} of {source_name}.",
+                        other_msg=f"ENDIF on line {file_lineno} of {source_name} has no matching IF.",
+                    )
+                if block_stack[-1].kind != "if":
+                    raise ErrInfo(
+                        type="cmd",
+                        command_text=line,
+                        other_msg=_unclosed_block_msg(block_stack[-1]),
                     )
                 frame = block_stack.pop()
                 frame.node.span = SourceSpan(source_name, frame.start_line, file_lineno)
@@ -702,11 +727,17 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
             # -- ENDLOOP --
             m = _ENDLOOP_RX.match(cmd_text)
             if m:
-                if not block_stack or block_stack[-1].kind != "loop":
+                if not block_stack:
+                    raise ErrInfo(
+                        type="cmd",
+                        command_text=line,
+                        other_msg=f"ENDLOOP on line {file_lineno} of {source_name} has no matching LOOP.",
+                    )
+                if block_stack[-1].kind != "loop":
                     raise ErrInfo(
                         type="cmd",
                         command_text=line,
-                        other_msg=f"ENDLOOP without matching LOOP on line {file_lineno} of {source_name}.",
+                        other_msg=_unclosed_block_msg(block_stack[-1]),
                     )
                 frame = block_stack.pop()
                 frame.node.span = SourceSpan(source_name, frame.start_line, file_lineno)
@@ -729,11 +760,17 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
             # -- END BATCH --
             m = _END_BATCH_RX.match(cmd_text)
             if m:
-                if not block_stack or block_stack[-1].kind != "batch":
+                if not block_stack:
+                    raise ErrInfo(
+                        type="cmd",
+                        command_text=line,
+                        other_msg=f"END BATCH on line {file_lineno} of {source_name} has no matching BEGIN BATCH.",
+                    )
+                if block_stack[-1].kind != "batch":
                     raise ErrInfo(
                         type="cmd",
                         command_text=line,
-                        other_msg=f"END BATCH without matching BEGIN BATCH on line {file_lineno} of {source_name}.",
+                        other_msg=_unclosed_block_msg(block_stack[-1]),
                     )
                 frame = block_stack.pop()
                 frame.node.span = SourceSpan(source_name, frame.start_line, file_lineno)

{execsql2-2.18.1.data → execsql2-2.19.0.data}/data/execsql2_extras/example_config_prompt.sql

@@ -122,7 +122,7 @@
 	from configspecs cs inner join configusage cu
 		on cu.sub_var = cs.sub_var
 	where
-		usage = '!!#usage!!';
+		usage = !'!#usage!'!;
 	-- !x! prompt entry_form !!~spectbl!! message "You may change any of the configuration settings below."
 	-- !x! if(sub_defined(~boolean_int)) {config boolean_int !!~boolean_int!!}
 	-- !x! if(sub_defined(~boolean_words)) {config boolean_words !!~boolean_words!!}

{execsql2-2.18.1.data → execsql2-2.19.0.data}/data/execsql2_extras/execsql.conf

@@ -1,6 +1,6 @@
 # execsql.conf — Configuration file for execsql
 #
-# Documentation: https://execsql2.readthedocs.io/reference/configuration/
+# Documentation: https://execsql2.readthedocs.io/en/latest/reference/configuration/
 #
 # This file uses INI format. Section names are case-sensitive (lowercase).
 # Property names are not case-sensitive. Lines starting with # are comments.
@@ -263,7 +263,7 @@
 #message_css=
 
 # Obfuscated password (XOR, not cryptographically secure — use keyring instead).
-# See: https://execsql2.readthedocs.io/reference/security/#credentials
+# See: https://execsql2.readthedocs.io/en/latest/reference/security/#credentials
 #enc_password=
 
 
@@ -279,6 +279,38 @@
 # Values: Yes or No.  Default: Yes.
 #allow_system_cmd=Yes
 
+# Whether to allow the RM_FILE metacommand (which deletes a file).
+# Set to No to prevent scripts from deleting files.
+# Also controllable via --no-rm-file CLI flag.
+# Values: Yes or No.  Default: Yes.
+#allow_rm_file=Yes
+
+# Whether to allow the SERVE metacommand (which opens an HTTP server on
+# a local port to serve a single file). Set to No to disable.
+# Also controllable via --no-serve CLI flag.
+# Values: Yes or No.  Default: Yes.
+#allow_serve=Yes
+
+# Root directory under which INCLUDE / EXECUTE SCRIPT targets must
+# resolve. When set, attempts to include files outside this root via
+# ../, absolute paths, drive letters, or UNC paths are rejected with
+# an error. Default: no containment (any readable path is permitted).
+#include_root=
+
+# Root directory under which SERVE targets must resolve. Same
+# containment semantics as include_root. Default: no containment.
+#serve_root=
+
+# Root directory under which Jinja2 / string.Template loader paths
+# must resolve. Same containment semantics as include_root.
+# Default: no containment.
+#template_root=
+
+# Maximum byte size of any single substitution-variable expansion,
+# enforced by the substitute_vars() engine to defeat exponential-
+# expansion bombs. Default: 10 MB (10485760).
+#max_substitution_bytes=10485760
+
 # Whether to log all data variable assignments.
 # Values: Yes or No.  Default: Yes.
 #log_datavars=Yes

{execsql2-2.18.1.dist-info → execsql2-2.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.18.1
+Version: 2.19.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
 Project-URL: Repository, https://github.com/geocoug/execsql
@@ -41,8 +41,7 @@ Classifier: Topic :: Database :: Front-Ends
 Requires-Python: >=3.10
 Requires-Dist: python-dateutil>=2.8
 Requires-Dist: rich>=13.0
-Requires-Dist: sqlglot>=25.0
-Requires-Dist: textual>=0.47.0
+Requires-Dist: textual>=1.0
 Requires-Dist: typer>=0.12
 Provides-Extra: all
 Requires-Dist: defusedxml; extra == 'all'
@@ -59,6 +58,7 @@ Requires-Dist: psycopg2-binary; extra == 'all'
 Requires-Dist: pymysql; extra == 'all'
 Requires-Dist: pyodbc; extra == 'all'
 Requires-Dist: pyyaml; extra == 'all'
+Requires-Dist: sqlglot>=25.0; extra == 'all'
 Requires-Dist: tables; extra == 'all'
 Requires-Dist: tkintermapview>=1.29; extra == 'all'
 Requires-Dist: xlrd; extra == 'all'
@@ -93,6 +93,7 @@ Requires-Dist: pre-commit>=3.5.0; extra == 'dev'
 Requires-Dist: pytest-cov>=5.0.0; extra == 'dev'
 Requires-Dist: pyyaml; extra == 'dev'
 Requires-Dist: ruff>=0.4; extra == 'dev'
+Requires-Dist: sqlglot>=25.0; extra == 'dev'
 Requires-Dist: tables; extra == 'dev'
 Requires-Dist: tox-uv>=1.13.1; extra == 'dev'
 Requires-Dist: twine>=6.1.0; extra == 'dev'
@@ -111,6 +112,8 @@ Requires-Dist: polars; extra == 'formats'
 Requires-Dist: pyyaml; extra == 'formats'
 Requires-Dist: tables; extra == 'formats'
 Requires-Dist: xlrd; extra == 'formats'
+Provides-Extra: formatter
+Requires-Dist: sqlglot>=25.0; extra == 'formatter'
 Provides-Extra: map
 Requires-Dist: tkintermapview>=1.29; extra == 'map'
 Provides-Extra: mssql
@@ -380,14 +383,20 @@ The `PROMPT` metacommand produces a GUI display of the data:
 
 # Formatting Scripts
 
-The `execsql-format` command normalizes execsql script files: it uppercases metacommand keywords, corrects block indentation, and optionally reformats SQL via sqlglot. It is installed automatically with the `execsql2` package.
+The `execsql-format` command normalizes execsql script files: it uppercases metacommand keywords, corrects block indentation, and optionally reformats SQL via `sqlglot`. The metacommand / indent / keyword reformatting is built into `execsql2`; SQL reformatting requires the `[formatter]` extra (or pass `--no-sql` to skip it):
 
 ```bash
+# Install with the SQL-reformatting extra
+pip install execsql2[formatter]
+
 # Format files in place
 execsql-format --in-place scripts/
 
 # Check formatting without writing (useful in CI)
 execsql-format --check scripts/
+
+# Run the formatter without sqlglot — keyword/indent normalization only
+execsql-format --no-sql --in-place scripts/
 ```
 
 `execsql-format` is also available as a [pre-commit](https://pre-commit.com/) hook:

{execsql2-2.18.1.dist-info → execsql2-2.19.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ execsql/__main__.py,sha256=HdbK-SAhyUmfB6xINY5AzxdMSxGzWSGEG_2dv42Jn64,315
 execsql/api.py,sha256=ZFTo_XZPhG21w2vxaeS1lS6o5XmF1FUJRIaypgTOjA8,20919
 execsql/config.py,sha256=OOrCcn9m3CNuXkxVOLp7uMhQikzUS2wh_QVhvIzRqIM,33296
 execsql/exceptions.py,sha256=EkM5cw2s0D9QCOgS4BU29FEyOnEtCxJ0esPT6l1hT9s,9205
-execsql/format.py,sha256=el_gQyMbj4VllToGEcU_61PtxUFotD1hXjrVzEhackM,25507
+execsql/format.py,sha256=HJlWD4kSOvq7lBv99rRF1Cq1FNaMjG-qA3iwSTZtf8Q,26050
 execsql/models.py,sha256=kCTUQg9-vReM6WNFfB_ZrEppuOW5u1uMBQThSkfPC0o,13264
 execsql/parser.py,sha256=P3ea8k7T_XLMrbhpFNZXwytdShrY302MKnhosqza1lo,15493
 execsql/plugins.py,sha256=2voLwT6eFap6BCBoZYndNNC_bMEJO1f_aP6xQTVXwYI,12815
@@ -14,28 +14,28 @@ execsql/cli/__init__.py,sha256=aJknKKIGxYCXpny0cyHXfqJsJ95dBtlEXXhPASFG8GQ,23114
 execsql/cli/dsn.py,sha256=svaZtrUXFRL2W5G6FRRiKtR6kehOp7urrVhIx_642Z8,2820
 execsql/cli/help.py,sha256=ThwdZuMIfLPxLAPpGWwXFY_UfyWvYOCjdlBNK20Vzd8,5718
 execsql/cli/lint.py,sha256=YqKzFNUhyb_Th69hYgKk1ZZVjCsZfJMIiUGqp06JwNs,17236
-execsql/cli/run.py,sha256=QoSHVBfg20n2knPrqf7RFJmcfFpC5aq7NkwX5o6qRnA,36326
+execsql/cli/run.py,sha256=4plvi8ZaGea5fUeOhtS2f4MrVnGTaetvJyz7qX07s0I,37706
 execsql/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-execsql/data/execsql.conf.template,sha256=1a2g2Vga7s128wcu3ftIFRkHlKKtuvkuOHSD1XuNT7o,9404
+execsql/data/execsql.conf.template,sha256=Sq1Huwb_Uf_lI7zW7m3h11fqU6zjGpGnCU4OVJ_tCe0,10696
 execsql/db/__init__.py,sha256=jTbuafuKOqYtXFR1wvCOoKK5Lr3l1uErfaIbIr6UywI,1063
-execsql/db/access.py,sha256=pqxFzxF5yXBv_UzJEtp5YHNJy3yHqxLYCRzVLV4qolo,19404
-execsql/db/base.py,sha256=m0xOGU-GAUU6SR1kF6LUnybaeX3fUgXqsofbzemyM28,35295
+execsql/db/access.py,sha256=GcY5Pq_vXdp8Thzm6aSLg9vfp5koovGiYKXipQtRt50,19167
+execsql/db/base.py,sha256=UUiYSztUen8xCWVCxDkRQeD098Yv1iA3WPl_qo4XjDI,34686
 execsql/db/dsn.py,sha256=59OzMAuCIfHcdOZNarK9TlDzaBJjhZ1SFFMvyXlH6u8,6086
 execsql/db/duckdb.py,sha256=79lRzKRhw1Pjfqcrba27S4Oq8a8AbDO_d0XkaNKKPQo,3197
 execsql/db/factory.py,sha256=YHdgyqQYy16548O3fGyElLC5C7DdIgva4Z29OsDxXjs,5367
 execsql/db/firebird.py,sha256=p_7RFWhFI7y5ukKCMXeDPE0wjeQ6dpO4IK6uz2dYjrc,9224
-execsql/db/mysql.py,sha256=HOFziabEN-ZD97LIfTrfhQB_yXwcCi9ZsqPqt6LFDHk,17964
-execsql/db/oracle.py,sha256=vYs1Oqym0LdAV5WQFdJFDesHlsx7RjsOaDyX0UTegPQ,12286
+execsql/db/mysql.py,sha256=gOm1IRzFmxnT4ekGEXiF2yM3jB6r4p38Cmtt1Utj27Y,17712
+execsql/db/oracle.py,sha256=1_odb5xmlm8vjdJdQXz7SHm9dzIbZ5sxP_IxTklH3kA,12018
 execsql/db/postgres.py,sha256=UNzrXzMniEyT3Z7qjCA_HLEUY0PVr1cJShuhAxtl5l0,21241
 execsql/db/sqlite.py,sha256=xooU6bvD9Y3frRpnbyesE63r6E1fwEHkkcN1YD_UIUE,11519
-execsql/db/sqlserver.py,sha256=6HtjLa__SlVyqbM7S80Wsipe-IFIDnzmYNg8BLvuQJM,9006
+execsql/db/sqlserver.py,sha256=sxtOrcN1pGJQ0x7CctrKIL9XFIaHCDVIVvEvxzEOdzY,8744
 execsql/debug/__init__.py,sha256=j6EGUR0dHzUhWN1mHHtf1-Lhjq3Sb1V-vmnq2Ztgj1M,178
-execsql/debug/repl.py,sha256=d-Pq4wBQU0rcvjXWqDkq_FOxL29vJ7VCP3xoG6TtXpE,22309
+execsql/debug/repl.py,sha256=JObeoEXh15qyk4Q3WQCCqMcBtojlIcu_Xg-ZRDZJi5Q,25491
 execsql/exporters/__init__.py,sha256=-Cnji-OgodJV8ftcDcOyTof0kQMy9J5kKVC8GVFpc3o,670
 execsql/exporters/base.py,sha256=XTPenHl5TbmbZ3cfPYLVFirGNiVps3Kt3AQKFVKy6ss,6408
 execsql/exporters/delimited.py,sha256=GIEeennL_elvcZgq5oSvgxAKAgwr8ea3o5_M_pLmc4g,32341
 execsql/exporters/duckdb.py,sha256=R4WbvzBEIK1ptnIc8w6c7jcinG-cuuFYC85_NYCumH0,3146
-execsql/exporters/feather.py,sha256=Ie7DCheyAj5y3ktpaMN76Mu3rnTQ0biKcxmaJdcIWvg,4184
+execsql/exporters/feather.py,sha256=ardyidIcuhrqRBJh9ftUZkG3ZCY7NS7eGC-VAnpFIXI,4131
 execsql/exporters/html.py,sha256=BPTGYODiC5_5zaQsVkZ9QVAl67yfCWFTsjK0D-QOJkM,9717
 execsql/exporters/json.py,sha256=G9lyJcjgmMvymu_MoVrkSqx2H6JRN7qwA5UEomnPkVQ,4343
 execsql/exporters/latex.py,sha256=w_B83_5vKPe8uYxCWGdqvxwJeq0mw5zzKYDiAb7dbN0,4503
@@ -59,17 +59,17 @@ execsql/gui/console.py,sha256=pCBUcFGjlKXMkMjztbmt9glP3me9jAKAgQxnmUE38-0,19396
 execsql/gui/desktop.py,sha256=hdy-1-QxeKXe3GDG1lhxkQHhTjZxH7KNl_mVg5ki1qw,59080
 execsql/gui/tui.py,sha256=INBCuW6iEEV15P_JrHeviI1JlNCXfoiyPBU-IC5MaLY,65200
 execsql/importers/__init__.py,sha256=zZwdQxMaValCNqUrVdvaA7XPU3J8NmqVJ4uolNWY2iU,299
-execsql/importers/base.py,sha256=FGVz3ntN6xHL99rQixlQj3tAf570K_oU83UtbYE1lJg,4124
+execsql/importers/base.py,sha256=k4ni92H33_-A32dNfxhBd6R5WPwM3o_8dSGABisUlR0,4136
 execsql/importers/csv.py,sha256=GUVRP294vHlOlF8XNecPEzatUBOOFIqnrEV9cBQkiv0,4849
 execsql/importers/feather.py,sha256=g2B69d2uv9vmnXcmjFyTVsMP40LYEzFYkhk3gD26mGw,1900
 execsql/importers/json.py,sha256=fL47h09Zzx4Qw3TTQRQJbdPdD3qVMiU-kK9C7j1IQzg,5534
 execsql/importers/ods.py,sha256=VsxIkr7opBamB0PbSFmMWt7G11w8lLUH1k_kRwz28zw,2847
-execsql/importers/xls.py,sha256=IB-ShXw2zHJUWPUtMCDbkjxYue-hACyR66tKNOZqzSw,3685
-execsql/metacommands/__init__.py,sha256=6PE1rXfJzIpHCxIgbeokh6fY2cAe82KR04J6pzawVlE,12993
+execsql/importers/xls.py,sha256=7mGYqXko5_wyvEUz186xSzIx8Eeobn5A6DCVAg4YfTM,3838
+execsql/metacommands/__init__.py,sha256=H_D1Z5kN6zfYtxatejQhQhQV1tlVZ7rcdFZ_9uhXu2Q,13010
 execsql/metacommands/conditions.py,sha256=5njexsBqSN_MNQdnw9Ra51BcS7ekACHNvBI2MXZF6_g,29995
 execsql/metacommands/connect.py,sha256=W24gYGmYDXNQyzBTsqWtl9-qbX2FS0v_c4s_OHj97mY,15327
 execsql/metacommands/control.py,sha256=btF9hP_jzTuTIODPK72CYF0v_oKYpwXpKLATt-Ti2kc,7988
-execsql/metacommands/data.py,sha256=u9D6F3ambIqXhEHVmFOI6RDrbmdXQ-FUiqw7aMGo5bQ,12135
+execsql/metacommands/data.py,sha256=PPO6AnF_swFxy9GNrtMsv3YttT5ZrjOMA4QtEORDcso,12136
 execsql/metacommands/debug.py,sha256=MeVXAob8ItEg2QzuSUkKDaQCEABnH6u0XcAwJzw36CE,13015
 execsql/metacommands/dispatch.py,sha256=t7x0xWHJA0PeCrYf7jYeSMJgf0yxcZ_xh-_YAtBPHLw,87192
 execsql/metacommands/io.py,sha256=vlGBje5sgnqeilooMdhJDgSRIhysHy5_7LrKtik9Xjs,3011
@@ -85,8 +85,8 @@ execsql/script/__init__.py,sha256=eGJPBDWj42aaId2lX_quSrqoKrvGwGElIrGDNCyoV1Y,35
 execsql/script/ast.py,sha256=TQ4_7Lfw1F8_k6ycdvMZdzwNafrZiljSrthVRWUsuIk,20585
 execsql/script/control.py,sha256=WqLy-HLPqHG3vEzYpKMiIJsD7LpORjyQuUWzFzcGz4w,2327
 execsql/script/engine.py,sha256=52RmtQJGk4KWqXpZY7jfKeiPojAoULHWaigOcm1azm4,20979
-execsql/script/executor.py,sha256=UTQ4k8EjxH5CdKYZ0E_l-0WyQ-i769mUJw6cJmMvSxI,36018
-execsql/script/parser.py,sha256=K-mgwuQ729KdmimOpEmb0OBzMyOvX3gxhBKLgr5P4VA,33697
+execsql/script/executor.py,sha256=Y0con6Mz4n240krEVeVSqmeCLVvIXyF4aLlNBMyZQyc,35790
+execsql/script/parser.py,sha256=z19gERLqyvEoDx4hDUws3Z8EKqTM7huNOitTOSmg8_0,35300
 execsql/script/variables.py,sha256=t0BwrRuA8m1LYHGLkDPNbqW6QmudXroOFYsO0fwK2N0,16302
 execsql/utils/__init__.py,sha256=0uR6JwVJQRX3vceByNBduCAf5dd5assKjeqJUWvpZoA,278
 execsql/utils/auth.py,sha256=dnLie8jFxN_l7ZrrRufVuxGw92iG62DIVatIjlEb4pM,8717
@@ -100,24 +100,24 @@ execsql/utils/numeric.py,sha256=xh02ANSRk3nUpQ-rtm66ILoMqoi7HtzCoRMIOT9U8QI,1570
 execsql/utils/regex.py,sha256=diEzTZqU_HHwVMadPAvN1Vgzhl7I03eVaEFGCXyGGL8,3770
 execsql/utils/strings.py,sha256=UQNjpRCEFa1UO6feU-M-9e24wWAvizs_iu_4fFusLxo,8516
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.18.1.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.18.1.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.18.1.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.18.1.data/data/execsql2_extras/execsql.conf,sha256=1a2g2Vga7s128wcu3ftIFRkHlKKtuvkuOHSD1XuNT7o,9404
-execsql2-2.18.1.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.18.1.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
-execsql2-2.18.1.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
-execsql2-2.18.1.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
-execsql2-2.18.1.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
-execsql2-2.18.1.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
-execsql2-2.18.1.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
-execsql2-2.18.1.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
-execsql2-2.18.1.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
-execsql2-2.18.1.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
-execsql2-2.18.1.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
-execsql2-2.18.1.dist-info/METADATA,sha256=czc8snw8MBbrf19X5tlYXFe5cCcpSFQmE6_pi0ezAYk,21911
-execsql2-2.18.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.18.1.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.18.1.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.18.1.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
-execsql2-2.18.1.dist-info/RECORD,,
+execsql2-2.19.0.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.19.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.19.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
+execsql2-2.19.0.data/data/execsql2_extras/execsql.conf,sha256=Sq1Huwb_Uf_lI7zW7m3h11fqU6zjGpGnCU4OVJ_tCe0,10696
+execsql2-2.19.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.19.0.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
+execsql2-2.19.0.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
+execsql2-2.19.0.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
+execsql2-2.19.0.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
+execsql2-2.19.0.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
+execsql2-2.19.0.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
+execsql2-2.19.0.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
+execsql2-2.19.0.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
+execsql2-2.19.0.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
+execsql2-2.19.0.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
+execsql2-2.19.0.dist-info/METADATA,sha256=hafmsG77iDxgwzrG7s4oMg5o97R-fMx_BH513avRy2w,22340
+execsql2-2.19.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+execsql2-2.19.0.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.19.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.19.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
+execsql2-2.19.0.dist-info/RECORD,,

{execsql2-2.18.1.dist-info → execsql2-2.19.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.29.0
+Generator: hatchling 1.30.1
 Root-Is-Purelib: true
 Tag: py3-none-any