execsql2 2.22.3__py3-none-any.whl → 2.22.5__py3-none-any.whl

execsql/format.py

@@ -14,6 +14,7 @@ from __future__ import annotations
 import contextlib
 import io
 import re
+from collections.abc import Iterator
 from pathlib import Path
 
 __all__ = ["collect_paths", "format_file", "main", "parse_keyword"]
@@ -169,6 +170,170 @@ def parse_keyword(payload: str) -> str:
 _EXECSQL_VAR_RE = re.compile(r"""!(['"]?)!([^!\s][^!]*)!\1!|!\{[^}]+\}!""")
 
 
+# Characters that may appear in an identifier, used to tell an ``E'...'``
+# escape-string prefix from a trailing ``e`` on an identifier (``abce'x'`` is
+# the identifier ``abce`` followed by a separate literal).
+_IDENT_CHAR_RE = re.compile(r"[A-Za-z0-9_$]")
+
+
+def _iter_sql_literals(sql: str) -> Iterator[tuple[int, int, str]]:
+    """Yield ``(start, end, kind)`` spans for every string literal in *sql*.
+
+    This is a lexical walk rather than a regex sweep, because an apostrophe
+    only starts a literal in some contexts.  Line comments, block comments
+    (which nest in PostgreSQL), and quoted identifiers are skipped entirely,
+    so quotes inside them never open a literal.
+
+    *kind* is one of:
+
+    ``"estring"``
+        A PostgreSQL escape string, ``E'...'``.  Backslash escapes are
+        significant inside it, which is what makes it unsafe to hand to
+        sqlglot — see :func:`_protect_estrings`.
+    ``"plain"``
+        An ordinary ``'...'`` literal, where only a doubled ``''`` escapes.
+    ``"dollar"``
+        A dollar-quoted body, ``$$...$$`` or ``$tag$...$tag$``, in which no
+        character is special.
+    """
+    i, n = 0, len(sql)
+    while i < n:
+        c = sql[i]
+
+        if c == "-" and sql.startswith("--", i):
+            nl = sql.find("\n", i)
+            i = n if nl < 0 else nl + 1
+            continue
+
+        if c == "/" and sql.startswith("/*", i):
+            depth, i = 1, i + 2
+            while i < n and depth:
+                if sql.startswith("/*", i):
+                    depth, i = depth + 1, i + 2
+                elif sql.startswith("*/", i):
+                    depth, i = depth - 1, i + 2
+                else:
+                    i += 1
+            continue
+
+        if c == '"':
+            i += 1
+            while i < n:
+                if sql[i] == '"':
+                    if sql.startswith('""', i):
+                        i += 2
+                        continue
+                    i += 1
+                    break
+                i += 1
+            continue
+
+        if c == "$":
+            m = _DOLLAR_QUOTE_RE.match(sql, i)
+            if m:
+                tag = m.group(0)
+                close = sql.find(tag, m.end())
+                stop = n if close < 0 else close + len(tag)
+                yield i, stop, "dollar"
+                i = stop
+                continue
+
+        # E'...' — only when the `e` is not the tail of an identifier.
+        if c in "eE" and sql.startswith("'", i + 1) and not (i and _IDENT_CHAR_RE.match(sql[i - 1])):
+            j = i + 2
+            while j < n:
+                if sql[j] == "\\" and j + 1 < n:
+                    j += 2
+                    continue
+                if sql[j] == "'":
+                    if sql.startswith("''", j):
+                        j += 2
+                        continue
+                    j += 1
+                    break
+                j += 1
+            yield i, j, "estring"
+            i = j
+            continue
+
+        if c == "'":
+            j = i + 1
+            while j < n:
+                if sql[j] == "'":
+                    if sql.startswith("''", j):
+                        j += 2
+                        continue
+                    j += 1
+                    break
+                j += 1
+            yield i, j, "plain"
+            i = j
+            continue
+
+        i += 1
+
+
+def _sql_literal_texts(sql: str) -> list[str]:
+    """Return the source text of every string literal in *sql*, in order."""
+    return [sql[start:end] for start, end, _ in _iter_sql_literals(sql)]
+
+
+# Placeholder standing in for a masked E'...' literal.  It is a plain literal
+# so that sqlglot sees a string where a string was, and lays the statement out
+# the same way it would have for the real one.
+_ESTR_PLACEHOLDER = "execsqlestr"
+_ESTR_RESTORE_RE = re.compile(rf"'{_ESTR_PLACEHOLDER}(\d+)'")
+
+
+def _protect_estrings(sql: str) -> tuple[str, list[str]]:
+    """Replace ``E'...'`` literals with placeholders, return (protected, originals).
+
+    sqlglot's Postgres tokenizer consumes backslash escapes inside an escape
+    string but its generator never re-emits them, so ``E'\\\\s+'`` round-trips
+    to ``e'\\s+'`` — a different string (tobymao/sqlglot#8191).  Masking these
+    literals keeps them out of the round trip entirely and restores them
+    byte-for-byte, independently of the installed sqlglot version.
+    """
+    originals: list[str] = []
+    out: list[str] = []
+    last = 0
+    for start, end, kind in _iter_sql_literals(sql):
+        if kind != "estring":
+            continue
+        out.append(sql[last:start])
+        out.append(f"'{_ESTR_PLACEHOLDER}{len(originals)}'")
+        originals.append(sql[start:end])
+        last = end
+    if not originals:
+        return sql, []
+    out.append(sql[last:])
+    return "".join(out), originals
+
+
+def _restore_estrings(sql: str, originals: list[str]) -> str | None:
+    """Put masked ``E'...'`` literals back; return None if any went missing.
+
+    A missing placeholder means sqlglot dropped or mangled the literal, so the
+    caller must fall back to the unformatted text rather than emit SQL with a
+    placeholder left in it.
+    """
+    if not originals:
+        return sql
+    seen: set[int] = set()
+
+    def replace(m: re.Match[str]) -> str:
+        idx = int(m.group(1))
+        if idx >= len(originals):
+            return m.group(0)
+        seen.add(idx)
+        return originals[idx]
+
+    restored = _ESTR_RESTORE_RE.sub(replace, sql)
+    if len(seen) != len(originals) or _ESTR_PLACEHOLDER in restored:
+        return None
+    return restored
+
+
 def _protect_variables(sql: str) -> tuple[str, list[tuple[str, str]]]:
     """Replace execsql substitutions with valid SQL identifiers, return (protected, replacements)."""
     replacements: list[tuple[str, str]] = []
@@ -224,6 +389,9 @@ def _sqlglot_format(
 
     text = "\n".join(sql_lines)
     protected, replacements = _protect_variables(text)
+    # Keep E'...' literals out of the round trip; sqlglot loses their
+    # backslash escapes (see _protect_estrings).
+    protected, estrings = _protect_estrings(protected)
 
     # Count semicolons in input as a rough statement count.
     input_semis = protected.count(";")
@@ -275,8 +443,29 @@ def _sqlglot_format(
         output_alnum_len = len(_alnum.sub("", joined))
         if input_alnum_len and output_alnum_len < input_alnum_len * 0.7:
             return sql_lines
+
+        # Literal round-trip check.  The alphanumeric check above is a
+        # gross-token-loss detector: it deletes every non-alphanumeric
+        # character before counting, so a transformation that changes only
+        # punctuation — a dropped backslash, a swapped quote — is invisible to
+        # it at any threshold.  Requiring every literal to survive verbatim
+        # closes that blind spot for the whole class, not just for the E'...'
+        # case masked above.
+        #
+        # Containment, not equality: sqlglot rewrites dialect-specific
+        # constructs into Postgres equivalents that can legitimately repeat a
+        # literal (``SUBSTRING_INDEX(d, ',', 1)`` expands into a form using
+        # ``','`` more than once), so the output may hold more literals than
+        # the input.  What must never happen is an input literal coming back
+        # altered or not at all — that is content loss, and it falls back.
+        if set(_sql_literal_texts(protected)) - set(_sql_literal_texts(joined)):
+            return sql_lines
+
         joined = re.sub(r"\bINTO TEMPORARY\b(?!\s+TABLE)", "INTO TEMPORARY TABLE", joined)
-        return _restore_variables(joined, replacements).split("\n")
+        restored = _restore_estrings(joined, estrings)
+        if restored is None:
+            return sql_lines
+        return _restore_variables(restored, replacements).split("\n")
     except Exception:
         return sql_lines
 

execsql/gui/base.py

@@ -9,11 +9,66 @@ from typing import TYPE_CHECKING, Any
 if TYPE_CHECKING:
     pass
 
-__all__ = ["DiffResult", "GuiBackend", "compare_stats", "compute_row_diffs"]
+__all__ = ["DiffResult", "GuiBackend", "compare_stats", "compute_row_diffs", "format_table", "row_count_text"]
 
 DIFF_MARKER = "● "
 
 
+# ---------------------------------------------------------------------------
+# Plain-text table rendering (shared by the console backend and by
+# non-interactive metacommand fallbacks such as HALT ... DISPLAY)
+# ---------------------------------------------------------------------------
+
+
+def row_count_text(n: int) -> str:
+    """Return a human-readable row count string, e.g. ``'3 rows'`` or ``'1 row'``."""
+    return f"{n:,} row{'s' if n != 1 else ''}"
+
+
+def format_table(
+    headers: list,
+    rows: list,
+    row_states: list[str] | None = None,
+    changed_cols: list[set[str]] | None = None,
+) -> str:
+    """Render *headers* and *rows* as a plain-text table.
+
+    Columns are left-aligned and padded to the widest value.  When *row_states*
+    and *changed_cols* are provided, cells that differ in ``"changed"`` rows are
+    prefixed with the diff marker (``"● "``) and the marker width is included in
+    the column sizing.
+
+    Returns an empty string when *headers* is empty.  The result has no trailing
+    newline.
+    """
+    if not headers:
+        return ""
+    headers_str = [str(h) for h in headers]
+
+    # Pre-compute display values so column widths account for markers.
+    display_rows: list[list[str]] = []
+    for ridx, row in enumerate(rows):
+        cells: list[str] = []
+        state = row_states[ridx] if row_states and ridx < len(row_states) else ""
+        diff_set = changed_cols[ridx] if changed_cols and ridx < len(changed_cols) else set()
+        for ci, cell in enumerate(row):
+            val = str(cell) if cell is not None else ""
+            if state == "changed" and ci < len(headers_str) and headers_str[ci] in diff_set:
+                val = f"{DIFF_MARKER}{val}"
+            cells.append(val)
+        display_rows.append(cells)
+
+    col_widths = [len(h) for h in headers_str]
+    for cells in display_rows:
+        for i, cell in enumerate(cells):
+            col_widths[i] = max(col_widths[i], len(cell))
+    fmt = "  " + "  ".join(f"{{:<{w}}}" for w in col_widths)
+    sep = "  " + "  ".join("-" * w for w in col_widths)
+    lines = [fmt.format(*headers_str), sep]
+    lines.extend(fmt.format(*cells) for cells in display_rows)
+    return "\n".join(lines)
+
+
 # ---------------------------------------------------------------------------
 # Value comparison helpers
 # ---------------------------------------------------------------------------

execsql/gui/console.py

@@ -11,7 +11,13 @@ import sys
 import time
 from typing import Any, cast
 
-from execsql.gui.base import DIFF_MARKER, GuiBackend, compare_stats as _compare_stats, compute_row_diffs
+from execsql.gui.base import (
+    GuiBackend,
+    compare_stats as _compare_stats,
+    compute_row_diffs,
+    format_table,
+    row_count_text as _row_count_text,
+)
 
 __all__ = ["ConsoleBackend"]
 
@@ -23,11 +29,6 @@ def _print_help_url(args: dict) -> None:
         print(f"  Help: {url}", file=sys.stderr)
 
 
-def _row_count_text(n: int) -> str:
-    """Return a human-readable row count string, e.g. '3 rows' or '1 row'."""
-    return f"{n:,} row{'s' if n != 1 else ''}"
-
-
 def _print_table(
     headers: list,
     rows: list,
@@ -42,33 +43,9 @@ def _print_table(
     """
     if file is None:
         file = sys.stderr
-    if not headers:
-        return
-    headers_str = [str(h) for h in headers]
-
-    # Pre-compute display values so column widths account for markers.
-    display_rows: list[list[str]] = []
-    for ridx, row in enumerate(rows):
-        cells: list[str] = []
-        state = row_states[ridx] if row_states and ridx < len(row_states) else ""
-        diff_set = changed_cols[ridx] if changed_cols and ridx < len(changed_cols) else set()
-        for ci, cell in enumerate(row):
-            val = str(cell) if cell is not None else ""
-            if state == "changed" and ci < len(headers_str) and headers_str[ci] in diff_set:
-                val = f"{DIFF_MARKER}{val}"
-            cells.append(val)
-        display_rows.append(cells)
-
-    col_widths = [len(h) for h in headers_str]
-    for cells in display_rows:
-        for i, cell in enumerate(cells):
-            col_widths[i] = max(col_widths[i], len(cell))
-    fmt = "  " + "  ".join(f"{{:<{w}}}" for w in col_widths)
-    sep = "  " + "  ".join("-" * w for w in col_widths)
-    print(fmt.format(*headers_str), file=file)
-    print(sep, file=file)
-    for cells in display_rows:
-        print(fmt.format(*cells), file=file)
+    rendered = format_table(headers, rows, row_states=row_states, changed_cols=changed_cols)
+    if rendered:
+        print(rendered, file=file)
 
 
 def _prompt_buttons(button_list: list) -> int | None:

execsql/gui/tui.py

@@ -89,14 +89,18 @@ def _help_button(url: str | None) -> Button | None:
     return None
 
 
-def _button_row(button_list: list) -> list[Button]:
+def _button_row(button_list: list, no_cancel: bool = False) -> list[Button]:
     """Create Button widgets from a button_list of (label, value, key?) tuples.
 
-    A Cancel button (id ``btn_cancel_exit``) is always prepended so it appears
-    on the left while the primary action button sits on the far right.
-    Entries in *button_list* with a falsy value (0 or None) are treated as the
-    cancel label source and are otherwise excluded from the numbered buttons so
-    that ``btn_N`` indices stay aligned with ``button_list`` positions.
+    A Cancel button (id ``btn_cancel_exit``) is prepended so it appears on the
+    left while the primary action button sits on the far right.  Entries in
+    *button_list* with a falsy value (0 or None) are treated as the cancel
+    label source and are otherwise excluded from the numbered buttons so that
+    ``btn_N`` indices stay aligned with ``button_list`` positions.
+
+    When *no_cancel* is set, the Cancel button is omitted — dialogs such as
+    HALT have no meaningful cancel action, and cancelling one would exit with
+    the generic status 2 rather than the status the caller asked for.
     """
     cancel_label = "Cancel"
     primary_buttons = []
@@ -107,6 +111,8 @@ def _button_row(button_list: list) -> list[Button]:
         else:
             variant: Literal["primary", "default"] = "primary" if i == 0 else "default"
             primary_buttons.append(Button(label, id=f"btn_{i}", variant=variant))
+    if no_cancel:
+        return primary_buttons
     return [Button(cancel_label, id="btn_cancel_exit", variant="warning")] + primary_buttons
 
 
@@ -182,7 +188,14 @@ class _BaseDialog(ModalScreen):
         return self._result
 
     def action_cancel(self) -> None:
-        """Dismiss the dialog as cancelled (triggered by Escape key)."""
+        """Dismiss the dialog as cancelled (triggered by Escape key).
+
+        Ignored for dialogs that pass ``no_cancel`` (e.g. HALT), which have no
+        meaningful cancel action.  This matches the Tkinter backend, which does
+        not bind ``<Escape>`` to cancellation in that case.
+        """
+        if self.args.get("no_cancel", False):
+            return
         self._result = {"button": None, "cancelled": True}
         self.dismiss(self._result)
 
@@ -210,31 +223,48 @@ class _BaseDialog(ModalScreen):
 
 
 class MsgScreen(_BaseDialog):
-    """Simple message dialog with Continue and Cancel buttons."""
+    """Message dialog with an optional data table.
+
+    Honours the caller's ``button_list`` and ``no_cancel`` arguments, and
+    renders ``column_headers``/``rowset`` when supplied (as the HALT
+    metacommand's DISPLAY clause does), matching the Tkinter MsgDialog.
+    """
 
     BINDINGS = [
         *_BaseDialog.BINDINGS,
         Binding("enter", "submit", "Continue", show=True),
     ]
 
+    def _button_list(self) -> list:
+        return cast(list, self.args.get("button_list") or [("Continue", 1, "<Return>")])
+
     def compose(self) -> ComposeResult:
         title = self.args.get("title", "Message")
         message = self.args.get("message", "")
+        headers = self.args.get("column_headers")
+        rows = self.args.get("rowset")
         with Container(id="dialog"):
             yield Label(title, id="title")
             yield Static(message, id="message")
+            if headers and rows:
+                with ScrollableContainer(id="table_container"):
+                    yield _make_table_widget("msg_table", headers, rows)
+                yield Static(_row_count_text(len(rows)), classes="row-count")
             with Horizontal(id="buttons"):
-                yield Button("Cancel", id="btn_cancel_exit", variant="warning")
-                yield Button("Continue", id="btn_close", variant="primary")
+                yield from _button_row(self._button_list(), no_cancel=self.args.get("no_cancel", False))
 
     def action_submit(self) -> None:
-        """Continue the dialog (triggered by Enter key)."""
-        self._result = {"button": 1}
-        self.dismiss(self._result)
+        """Dismiss with the first non-cancel button value (triggered by Enter)."""
+        for btn in self._button_list():
+            if btn[1]:
+                self._result = {"button": btn[1]}
+                self.dismiss(self._result)
+                return
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
-        if event.button.id == "btn_close":
-            self._result = {"button": 1}
+        btn_id = event.button.id
+        if btn_id and btn_id.startswith("btn_") and btn_id[4:].isdigit():
+            self._result = {"button": self._button_list()[int(btn_id[4:])][1]}
             self.dismiss(self._result)
 
 

execsql/metacommands/control.py

@@ -33,6 +33,7 @@ from execsql.exceptions import ErrInfo
 from typing import Any
 
 import execsql.state as _state
+from execsql.gui.base import format_table, row_count_text
 from execsql.script import current_script_line
 from execsql.utils.errors import exit_now
 from execsql.utils.fileio import EncodedFile, check_dir
@@ -214,6 +215,14 @@ def x_wait_until(**kwargs: Any) -> None:
 
 # x_halt_msg is also needed by x_halt - define it here
 def x_halt_msg(**kwargs: Any) -> None:
+    """Halt the script, reporting *errmsg* in a dialog or on the console.
+
+    The dialog is used only when the run is interactive — either a GUI console
+    is already running, or ``gui_level`` is greater than 1.  Otherwise the
+    message (and any ``DISPLAY`` rowset) is written to the error output and the
+    script exits, so that unattended runs fail instead of blocking forever on a
+    modal nobody can dismiss.
+    """
     import queue as _queue
 
     errmsg = kwargs["errmsg"]
@@ -242,6 +251,23 @@ def x_halt_msg(**kwargs: Any) -> None:
         headers, rows = db.select_data(sql)
     else:
         headers, rows = None, None
+
+    # Non-interactive runs (no GUI console, gui_level 0 or 1) must not block on
+    # a modal dialog: report on the console and exit instead.  This mirrors the
+    # guard in x_halt, which the message-bearing HALT forms never reach because
+    # their metacommand patterns are registered later and so take priority.
+    if not (gui_console_isrunning() or conf.gui_level > 1):
+        if errmsg:
+            _state.output.write_err(errmsg)
+        if headers:
+            # Unlike the dialog, render an empty rowset too — a HALT diagnostic
+            # showing zero rows is more useful than showing nothing at all.
+            _state.output.write_err(format_table(headers, rows or []))
+            _state.output.write_err(row_count_text(len(rows or [])))
+        _state.exec_log.log_exit_halt(*current_script_line(), msg=errmsg)
+        exit_now(errlevel, None)
+        return
+
     enable_gui()
     return_queue: _queue.Queue[Any] = _queue.Queue()
     gui_args = {

{execsql2-2.22.3.dist-info → execsql2-2.22.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: execsql2
-Version: 2.22.3
+Version: 2.22.5
 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
@@ -384,7 +384,7 @@ execsql-format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.22.3
+    rev: v2.22.5
     hooks:
       - id: execsql-format
 ```

{execsql2-2.22.3.dist-info → execsql2-2.22.5.dist-info}/RECORD

@@ -3,7 +3,7 @@ execsql/__main__.py,sha256=HdbK-SAhyUmfB6xINY5AzxdMSxGzWSGEG_2dv42Jn64,315
 execsql/api.py,sha256=EOtBwMnm-8fmB_KmvxyjglR6C7CjdYhCPBisJ9CFfJg,22227
 execsql/config.py,sha256=txKziUJLV7UPonj2sGFgkmlinDdSV50aHmR_cuCbEIo,34369
 execsql/exceptions.py,sha256=GlphAiR8iZu4UR4U50WgSqEUMd9_8AeQJ_hhPcJOeQU,9381
-execsql/format.py,sha256=3w-m0EsHapBdSKx6oTFWYlXspFLdUR_RF79gMvHhrqQ,34440
+execsql/format.py,sha256=tfg0m3EbDVRlAR3ZhwV8BjgMFckL3u3IdldyCONrutU,41400
 execsql/models.py,sha256=-DWTVrPNwM-n1h3e3rXMoBv9-wpWVdZahyy4RB7fRRE,15502
 execsql/parser.py,sha256=aOxZ7Mzgvk7G4-nvy9Bgz7xlaZm6oo81cffDeBk_LCk,15597
 execsql/plugins.py,sha256=l82VWa5NpvOQWD6vcO-WKP-vtn0wp9__wWDFAbwxZg0,12838
@@ -55,10 +55,10 @@ execsql/exporters/xml.py,sha256=t1PSr3i8xvTCWzd9jaxxAy5NcRpl6sqjnZALafKCqpM,2575
 execsql/exporters/yaml.py,sha256=R61Rs_0rd5G3bg344L4hC84GM79IfYXaDO2tkF-BluY,3121
 execsql/exporters/zip.py,sha256=341z4Z4MPtEkXJEtfiMSiuJigERh5_f8RDbNMBbt8KM,5078
 execsql/gui/__init__.py,sha256=oCb-cyhLZzVpWJ4WU5HbqEDBrV-lm0ytEwxemrOZyqs,2048
-execsql/gui/base.py,sha256=15wCaSLvSb21hToCczru46ghmd56ryMpEOOZ0R_dE3U,12740
-execsql/gui/console.py,sha256=hgFnxPP7lLolKgmKCBTSMXIt4uU2L4C32XcA82ytr2U,19438
+execsql/gui/base.py,sha256=DMTqHLlpZlGCsNKyrLlJPbaxvukC0n1YmR4aHEN3jPY,14983
+execsql/gui/console.py,sha256=dzdSl4NJNvRd9VvlwRCXHvfnXjQPimyTx7NcibcUZC8,18305
 execsql/gui/desktop.py,sha256=922OdzjV4OGNDIesOxKOmlsrNp1aJ8St8cVwED0H2sE,59521
-execsql/gui/tui.py,sha256=yXKBqbbJDNC6a25sUKpvy3BR10U2LhLSuGAxkw6ADcQ,65358
+execsql/gui/tui.py,sha256=jlCoP1lsEJgFsFikKVqF4B3s3KyKRs6JbWfwtlFHyDc,66800
 execsql/importers/__init__.py,sha256=zZwdQxMaValCNqUrVdvaA7XPU3J8NmqVJ4uolNWY2iU,299
 execsql/importers/base.py,sha256=3Iq_Sr4cCXKHpjjJYkhZX6uhsIIRAdmvAvTdC4mFlWo,4326
 execsql/importers/csv.py,sha256=Kec1VCycRdfstNoxIXsEsSFqQprZp_edpNiMZm43eTI,4914
@@ -69,7 +69,7 @@ execsql/importers/xls.py,sha256=D7Ul42gIRYZZC5QxD35ft_wmqQv2f1jNMSbnqlzV0ZA,3851
 execsql/metacommands/__init__.py,sha256=H_D1Z5kN6zfYtxatejQhQhQV1tlVZ7rcdFZ_9uhXu2Q,13010
 execsql/metacommands/conditions.py,sha256=2bfdVV_LCl91quG4SRLur9Jk60NsIOStHlBCeJJ-Djc,30068
 execsql/metacommands/connect.py,sha256=SPk4h9yiUgTD3w1gNOT_oYx8VShggsO357by5Hoy6OI,15344
-execsql/metacommands/control.py,sha256=EAURAsBjEZm3YwOJG0Gr3oI2H5_8p3Cu8-AguhBD_ds,8007
+execsql/metacommands/control.py,sha256=QT3CJyneANrHxgnbK7vlwmLbckRCbSSwSxy4D3oxN4A,9375
 execsql/metacommands/data.py,sha256=Rp18lHUKSTkwTFRjOQ7bDgZd42LNLVoTS3Zc_bcNEWY,12199
 execsql/metacommands/debug.py,sha256=MeVXAob8ItEg2QzuSUkKDaQCEABnH6u0XcAwJzw36CE,13015
 execsql/metacommands/dispatch.py,sha256=t7x0xWHJA0PeCrYf7jYeSMJgf0yxcZ_xh-_YAtBPHLw,87192
@@ -101,23 +101,23 @@ execsql/utils/numeric.py,sha256=_7bi5R6pHjMCkOPne_Sh5nUj-B8e9g6WFmjptFHaunA,1573
 execsql/utils/regex.py,sha256=B3mSBhRRx_DpUnX_t9IoYd05KvWAebiLMCZqQAmEwcw,3885
 execsql/utils/strings.py,sha256=UQNjpRCEFa1UO6feU-M-9e24wWAvizs_iu_4fFusLxo,8516
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.22.3.data/data/execsql2_extras/README.md,sha256=vX4NTL095dUoA_hesyRMGYBorEZ_Y_tJ9qrd-MVV09I,5032
-execsql2-2.22.3.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.22.3.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
-execsql2-2.22.3.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.22.3.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
-execsql2-2.22.3.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
-execsql2-2.22.3.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
-execsql2-2.22.3.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
-execsql2-2.22.3.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
-execsql2-2.22.3.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
-execsql2-2.22.3.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
-execsql2-2.22.3.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
-execsql2-2.22.3.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
-execsql2-2.22.3.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
-execsql2-2.22.3.dist-info/METADATA,sha256=gSLoVf2cJOEScG6F8dJdIk7uVWiXwd_uVzRKgYdJVgY,20382
-execsql2-2.22.3.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-execsql2-2.22.3.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.22.3.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.22.3.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
-execsql2-2.22.3.dist-info/RECORD,,
+execsql2-2.22.5.data/data/execsql2_extras/README.md,sha256=vX4NTL095dUoA_hesyRMGYBorEZ_Y_tJ9qrd-MVV09I,5032
+execsql2-2.22.5.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.22.5.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
+execsql2-2.22.5.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.22.5.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
+execsql2-2.22.5.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
+execsql2-2.22.5.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
+execsql2-2.22.5.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
+execsql2-2.22.5.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
+execsql2-2.22.5.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
+execsql2-2.22.5.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
+execsql2-2.22.5.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
+execsql2-2.22.5.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
+execsql2-2.22.5.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
+execsql2-2.22.5.dist-info/METADATA,sha256=OHGAN6pqfqOTBPDSst372rskkKNgeXUofH9K_mfl3sc,20382
+execsql2-2.22.5.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+execsql2-2.22.5.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.22.5.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.22.5.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
+execsql2-2.22.5.dist-info/RECORD,,

{execsql2-2.22.3.dist-info → execsql2-2.22.5.dist-info}/WHEEL

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