execsql2 2.12.3__py3-none-any.whl → 2.12.5__py3-none-any.whl

execsql/metacommands/__init__.py

@@ -168,6 +168,11 @@ from execsql.metacommands.script_ext import (
     x_extendscript_sql,
     x_executescript,
 )
+from execsql.metacommands.upsert import (
+    x_pg_upsert,
+    x_pg_upsert_check,
+    x_pg_upsert_qa,
+)
 from execsql.metacommands.system import (
     x_system_cmd,
     x_email,
@@ -401,6 +406,10 @@ __all__ = [
     "x_write_warnings",
     "x_gui_level",
     "x_execute",
+    # upsert handlers
+    "x_pg_upsert",
+    "x_pg_upsert_check",
+    "x_pg_upsert_qa",
     # regex helpers
     "ins_rxs",
     "ins_quoted_rx",

execsql/metacommands/dispatch.py

@@ -168,6 +168,11 @@ from execsql.metacommands.script_ext import (
     x_extendscript_metacommand,
     x_extendscript_sql,
 )
+from execsql.metacommands.upsert import (
+    x_pg_upsert,
+    x_pg_upsert_check,
+    x_pg_upsert_qa,
+)
 from execsql.metacommands.system import (
     x_cancel_halt,
     x_cancel_halt_email,
@@ -2142,6 +2147,31 @@ def build_dispatch_table() -> MetaCommandList:
         x_write,
     )
 
+    # ------------------------------------------------------------------
+    # PG_UPSERT — pg-upsert integration (optional dependency)
+    # ------------------------------------------------------------------
+    # Order matters: CHECK and QA patterns must precede the general pattern
+    # so that "PG_UPSERT CHECK ..." and "PG_UPSERT QA ..." are matched
+    # before "PG_UPSERT FROM ...".
+    mcl.add(
+        r"^\s*PG_UPSERT\s+CHECK\s+FROM\s+(?P<staging_schema>\S+)\s+TO\s+(?P<base_schema>\S+)\s+TABLES\s+(?P<tail>.+)$",
+        x_pg_upsert_check,
+        description="PG_UPSERT CHECK",
+        category="action",
+    )
+    mcl.add(
+        r"^\s*PG_UPSERT\s+QA\s+FROM\s+(?P<staging_schema>\S+)\s+TO\s+(?P<base_schema>\S+)\s+TABLES\s+(?P<tail>.+)$",
+        x_pg_upsert_qa,
+        description="PG_UPSERT QA",
+        category="action",
+    )
+    mcl.add(
+        r"^\s*PG_UPSERT\s+FROM\s+(?P<staging_schema>\S+)\s+TO\s+(?P<base_schema>\S+)\s+TABLES\s+(?P<tail>.+)$",
+        x_pg_upsert,
+        description="PG_UPSERT",
+        category="action",
+    )
+
     # ------------------------------------------------------------------
     # SUB (top-level variable assignment — kept near end so more specific
     # SUB_* patterns above take precedence)

execsql/metacommands/upsert.py

@@ -0,0 +1,448 @@
+"""PG_UPSERT metacommand handler.
+
+Integrates pg-upsert (https://pg-upsert.readthedocs.io/) as an optional
+dependency, providing QA-checked, FK-dependency-ordered upserts from a
+staging schema to a base schema on PostgreSQL.
+
+Requires: ``pip install execsql2[upsert]``
+"""
+
+from __future__ import annotations
+
+import json
+import logging
+import re
+from typing import Any
+
+import execsql.state as _state
+from execsql.exceptions import ErrInfo
+from execsql.types import dbt_postgres
+from execsql.utils.errors import exception_desc
+
+
+# ---------------------------------------------------------------------------
+# Keyword parser for the trailing portion after TABLES
+# ---------------------------------------------------------------------------
+
+_KW_METHOD = re.compile(r"\bMETHOD\s+(upsert|update|insert)\b", re.IGNORECASE)
+_KW_EXCLUDE = re.compile(
+    r"\bEXCLUDE\s+([\w\s,]+?)(?=\s+(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE_NULL|LOGFILE)\b|\s*$)",
+    re.IGNORECASE,
+)
+_KW_EXCLUDE_NULL = re.compile(
+    r"\bEXCLUDE_NULL\s+([\w\s,]+?)(?=\s+(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE|LOGFILE)\b|\s*$)",
+    re.IGNORECASE,
+)
+_KW_COMMIT = re.compile(r"\bCOMMIT\b", re.IGNORECASE)
+_KW_INTERACTIVE = re.compile(r"\bINTERACTIVE\b", re.IGNORECASE)
+_KW_COMPACT = re.compile(r"\bCOMPACT\b", re.IGNORECASE)
+_KW_LOGFILE = re.compile(r"""\bLOGFILE\s+(?:"([^"]+)"|'([^']+)'|(\S+))""", re.IGNORECASE)
+
+# All recognized keywords — used to split table names from options.
+_ALL_KEYWORDS = re.compile(
+    r"\b(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE_NULL|EXCLUDE|LOGFILE)\b",
+    re.IGNORECASE,
+)
+
+
+def _parse_tables_and_options(tail: str) -> dict[str, Any]:
+    """Parse the trailing text after ``TABLES`` into table names and options.
+
+    Parameters
+    ----------
+    tail:
+        Everything captured after the ``TABLES`` keyword in the regex.
+
+    Returns
+    -------
+    dict with keys: tables, method, commit, interactive, compact,
+    exclude_cols, exclude_null_check_cols.
+    """
+    # Split at the first keyword to isolate the table list.
+    kw_match = _ALL_KEYWORDS.search(tail)
+    if kw_match:
+        table_part = tail[: kw_match.start()]
+        opts_part = tail[kw_match.start() :]
+    else:
+        table_part = tail
+        opts_part = ""
+
+    tables = [t.strip() for t in table_part.split(",") if t.strip()]
+
+    method = "upsert"
+    m = _KW_METHOD.search(opts_part)
+    if m:
+        method = m.group(1).lower()
+
+    exclude_cols: list[str] = []
+    m = _KW_EXCLUDE.search(opts_part)
+    if m:
+        exclude_cols = [c.strip() for c in m.group(1).split(",") if c.strip()]
+
+    exclude_null: list[str] = []
+    m = _KW_EXCLUDE_NULL.search(opts_part)
+    if m:
+        exclude_null = [c.strip() for c in m.group(1).split(",") if c.strip()]
+
+    logfile: str | None = None
+    m = _KW_LOGFILE.search(opts_part)
+    if m:
+        logfile = m.group(1) or m.group(2) or m.group(3)
+
+    return {
+        "tables": tables,
+        "method": method,
+        "commit": bool(_KW_COMMIT.search(opts_part)),
+        "interactive": bool(_KW_INTERACTIVE.search(opts_part)),
+        "compact": bool(_KW_COMPACT.search(opts_part)),
+        "exclude_cols": exclude_cols,
+        "exclude_null_check_cols": exclude_null,
+        "logfile": logfile,
+    }
+
+
+# ---------------------------------------------------------------------------
+# Logging bridge: pg_upsert.display → execsql exec_log
+# ---------------------------------------------------------------------------
+
+
+class _ExecLogHandler(logging.Handler):
+    """Route pg_upsert's plain-text file logger to execsql's exec_log."""
+
+    def __init__(self, exec_log: Any) -> None:
+        super().__init__()
+        self._exec_log = exec_log
+
+    def emit(self, record: logging.LogRecord) -> None:
+        self._exec_log.log_user_msg(self.format(record))
+
+
+class _FileWriterHandler(logging.Handler):
+    """Route pg_upsert log messages through execsql's async FileWriter.
+
+    This ensures that pg-upsert log output and execsql WRITE TEE output
+    arrive in the same order they were issued, since both go through the
+    same FileWriter queue.
+    """
+
+    def __init__(self, filename: str) -> None:
+        super().__init__()
+        self._filename = filename
+
+    def emit(self, record: logging.LogRecord) -> None:
+        from execsql.utils.fileio import filewriter_write
+
+        filewriter_write(self._filename, self.format(record) + "\n")
+
+
+# ---------------------------------------------------------------------------
+# Result → substitution variables
+# ---------------------------------------------------------------------------
+
+
+def _set_subvars(result: Any) -> None:
+    """Populate ``$PG_UPSERT_*`` substitution variables from an UpsertResult."""
+    sv = _state.subvars.add_substitution
+    sv("$PG_UPSERT_QA_PASSED", str(result.qa_passed).upper())
+    sv("$PG_UPSERT_ROWS_UPDATED", str(result.total_updated))
+    sv("$PG_UPSERT_ROWS_INSERTED", str(result.total_inserted))
+    sv("$PG_UPSERT_COMMITTED", str(result.committed).upper())
+    sv("$PG_UPSERT_STAGING_SCHEMA", result.staging_schema)
+    sv("$PG_UPSERT_BASE_SCHEMA", result.base_schema)
+    sv("$PG_UPSERT_TABLES", ", ".join(t.table_name for t in result.tables))
+    sv("$PG_UPSERT_METHOD", result.upsert_method)
+    sv("$PG_UPSERT_DURATION", str(result.duration_seconds))
+    sv("$PG_UPSERT_STARTED_AT", result.started_at)
+    sv("$PG_UPSERT_FINISHED_AT", result.finished_at)
+    sv("$PG_UPSERT_RESULT_JSON", json.dumps(result.to_dict(), separators=(",", ":")))
+
+
+def _qa_failure_msg(result: Any) -> str:
+    """Build a concise QA failure message listing which tables failed."""
+    failed = [t.table_name for t in result.tables if not t.qa_passed]
+    if failed:
+        return f"PG_UPSERT QA failed for: {', '.join(failed)}"
+    return "PG_UPSERT QA checks failed."
+
+
+# ---------------------------------------------------------------------------
+# Import guard + helpers
+# ---------------------------------------------------------------------------
+
+
+def _require_pg_upsert() -> None:
+    """Raise ErrInfo if pg_upsert is not installed."""
+    try:
+        import pg_upsert  # noqa: F401
+    except ImportError as exc:
+        raise ErrInfo(
+            "exception",
+            other_msg=("PG_UPSERT requires the pg-upsert package. Install it with: pip install execsql2[upsert]"),
+        ) from exc
+
+
+def _require_postgres(db: Any, metacommandline: str | None) -> None:
+    """Raise ErrInfo if the current connection is not PostgreSQL."""
+    if db.type != dbt_postgres:
+        raise ErrInfo(
+            "cmd",
+            command_text=metacommandline,
+            other_msg=(f"PG_UPSERT requires a PostgreSQL connection. Current DBMS: {db.type.dbms_id}"),
+        )
+
+
+def _build_result_from_qa_errors(ups: Any) -> Any:
+    """Build an UpsertResult from ``ups.qa_errors`` after a QA/CHECK run."""
+    from pg_upsert.models import TableResult, UpsertResult
+
+    table_results: dict[str, Any] = {}
+    for table_name in ups.tables:
+        table_results[table_name] = TableResult(table_name=table_name)
+    for err in ups.qa_errors:
+        if err.table in table_results:
+            table_results[err.table].qa_errors.append(err)
+    return UpsertResult(
+        tables=list(table_results.values()),
+        committed=False,
+        staging_schema=ups.staging_schema,
+        base_schema=ups.base_schema,
+        upsert_method=ups.upsert_method,
+    )
+
+
+def _create_pgupsert(
+    db: Any,
+    staging_schema: str,
+    base_schema: str,
+    opts: dict[str, Any],
+) -> Any:
+    """Create and return a PgUpsert instance with execsql's connection."""
+    from pg_upsert import PgUpsert
+
+    ui_mode = "tkinter"
+    if _state.conf:
+        ui_mode = _state.conf.gui_framework
+
+    ups = PgUpsert(
+        conn=db.conn,
+        staging_schema=staging_schema,
+        base_schema=base_schema,
+        tables=opts["tables"],
+        do_commit=opts["commit"],
+        interactive=opts["interactive"],
+        compact=opts["compact"],
+        upsert_method=opts["method"],
+        exclude_cols=opts["exclude_cols"],
+        exclude_null_check_cols=opts["exclude_null_check_cols"],
+        ui_mode=ui_mode,
+    )
+    return ups
+
+
+def _attach_log_handlers(
+    logfile: str | None = None,
+) -> tuple[list[logging.Logger], list[logging.Handler], dict[str, int]]:
+    """Attach logging handlers to pg_upsert loggers.
+
+    Always attaches the exec_log bridge to ``pg_upsert.display``.
+    If *logfile* is given, also attaches a FileHandler (append mode) to both
+    ``pg_upsert`` and ``pg_upsert.display`` — matching pg-upsert CLI behavior.
+
+    Returns (loggers, handlers) so the caller can detach in a finally block.
+    """
+    display_logger = logging.getLogger("pg_upsert.display")
+    # pg-upsert's display logger has propagate=False and level=NOTSET, which
+    # gives it an effective level of WARNING (inherited from root).  Its messages
+    # are logged at INFO, so we must explicitly lower the level.
+    prev_display_level = display_logger.level
+    if display_logger.getEffectiveLevel() > logging.INFO:
+        display_logger.setLevel(logging.INFO)
+
+    exec_handler = _ExecLogHandler(_state.exec_log)
+    display_logger.addHandler(exec_handler)
+
+    loggers: list[logging.Logger] = [display_logger]
+    handlers: list[logging.Handler] = [exec_handler]
+    prev_levels: dict[str, int] = {"pg_upsert.display": prev_display_level}
+
+    if logfile:
+        file_handler = _FileWriterHandler(logfile)
+        file_handler.setFormatter(logging.Formatter("%(message)s"))
+        # Attach to both loggers, same as pg-upsert CLI does
+        main_logger = logging.getLogger("pg_upsert")
+        prev_levels["pg_upsert"] = main_logger.level
+        if main_logger.getEffectiveLevel() > logging.INFO:
+            main_logger.setLevel(logging.INFO)
+        main_logger.addHandler(file_handler)
+        display_logger.addHandler(file_handler)
+        loggers.append(main_logger)
+        handlers.append(file_handler)
+
+    return loggers, handlers, prev_levels
+
+
+def _detach_log_handlers(
+    loggers: list[logging.Logger],
+    handlers: list[logging.Handler],
+    prev_levels: dict[str, int],
+) -> None:
+    """Remove all handlers added by ``_attach_log_handlers``."""
+    for handler in handlers:
+        for lgr in loggers:
+            lgr.removeHandler(handler)
+        if hasattr(handler, "close"):
+            handler.close()
+    # Restore original logger levels
+    for name, level in prev_levels.items():
+        logging.getLogger(name).setLevel(level)
+
+
+def _run_with_autocommit_guard(db: Any, fn: Any) -> Any:
+    """Temporarily disable autocommit, run *fn*, then restore."""
+    was_autocommit = db.autocommit
+    if was_autocommit:
+        db.autocommit_off()
+    try:
+        return fn()
+    finally:
+        if was_autocommit:
+            db.autocommit_on()
+
+
+def _handle_pg_upsert_errors(fn: Any, metacommandline: str | None) -> Any:
+    """Run *fn*, translating pg-upsert exceptions to ErrInfo."""
+    from pg_upsert import UserCancelledError
+
+    try:
+        return fn()
+    except UserCancelledError as exc:
+        raise ErrInfo(
+            "cmd",
+            command_text=metacommandline,
+            other_msg="PG_UPSERT cancelled by user.",
+        ) from exc
+    except ErrInfo:
+        raise
+    except Exception as exc:
+        raise ErrInfo(
+            "exception",
+            exception_msg=exception_desc(),
+            other_msg="PG_UPSERT failed unexpectedly.",
+        ) from exc
+
+
+# ---------------------------------------------------------------------------
+# Metacommand handlers
+# ---------------------------------------------------------------------------
+
+
+def x_pg_upsert(**kwargs: Any) -> None:
+    """PG_UPSERT FROM <staging> TO <base> TABLES <t1>, <t2> [options]
+
+    Full pipeline: QA checks → upsert → optional commit.
+    """
+    _require_pg_upsert()
+    db = _state.dbs.current()
+    metacommandline = kwargs.get("metacommandline")
+    _require_postgres(db, metacommandline)
+
+    staging = kwargs["staging_schema"]
+    base = kwargs["base_schema"]
+    opts = _parse_tables_and_options(kwargs["tail"])
+
+    ups = _create_pgupsert(db, staging, base, opts)
+    loggers, handlers, prev_levels = _attach_log_handlers(opts.get("logfile"))
+
+    try:
+        result = _run_with_autocommit_guard(
+            db,
+            lambda: _handle_pg_upsert_errors(ups.run, metacommandline),
+        )
+    finally:
+        _detach_log_handlers(loggers, handlers, prev_levels)
+
+    _set_subvars(result)
+
+    if not result.qa_passed:
+        raise ErrInfo(
+            "cmd",
+            command_text=metacommandline,
+            other_msg=_qa_failure_msg(result),
+        )
+
+
+def x_pg_upsert_qa(**kwargs: Any) -> None:
+    """PG_UPSERT QA FROM <staging> TO <base> TABLES <t1>, <t2> [options]
+
+    QA-only mode: run all QA checks without upserting.
+    """
+    _require_pg_upsert()
+    db = _state.dbs.current()
+    metacommandline = kwargs.get("metacommandline")
+    _require_postgres(db, metacommandline)
+
+    staging = kwargs["staging_schema"]
+    base = kwargs["base_schema"]
+    opts = _parse_tables_and_options(kwargs["tail"])
+    opts["commit"] = False  # QA-only never commits
+
+    ups = _create_pgupsert(db, staging, base, opts)
+    loggers, handlers, prev_levels = _attach_log_handlers(opts.get("logfile"))
+
+    try:
+        _run_with_autocommit_guard(
+            db,
+            lambda: _handle_pg_upsert_errors(ups.qa_all, metacommandline),
+        )
+    finally:
+        _detach_log_handlers(loggers, handlers, prev_levels)
+
+    result = _build_result_from_qa_errors(ups)
+    _set_subvars(result)
+
+    if not result.qa_passed:
+        raise ErrInfo(
+            "cmd",
+            command_text=metacommandline,
+            other_msg=_qa_failure_msg(result),
+        )
+
+
+def x_pg_upsert_check(**kwargs: Any) -> None:
+    """PG_UPSERT CHECK FROM <staging> TO <base> TABLES <t1>, <t2>
+
+    Schema check only: column existence + type mismatch.
+    """
+    _require_pg_upsert()
+    db = _state.dbs.current()
+    metacommandline = kwargs.get("metacommandline")
+    _require_postgres(db, metacommandline)
+
+    staging = kwargs["staging_schema"]
+    base = kwargs["base_schema"]
+    opts = _parse_tables_and_options(kwargs["tail"])
+    opts["commit"] = False
+
+    ups = _create_pgupsert(db, staging, base, opts)
+    loggers, handlers, prev_levels = _attach_log_handlers(opts.get("logfile"))
+
+    try:
+        _run_with_autocommit_guard(
+            db,
+            lambda: _handle_pg_upsert_errors(
+                lambda: ups.qa_column_existence().qa_type_mismatch(),
+                metacommandline,
+            ),
+        )
+    finally:
+        _detach_log_handlers(loggers, handlers, prev_levels)
+
+    result = _build_result_from_qa_errors(ups)
+    _set_subvars(result)
+
+    if not result.qa_passed:
+        raise ErrInfo(
+            "cmd",
+            command_text=metacommandline,
+            other_msg=_qa_failure_msg(result),
+        )

{execsql2-2.12.3.dist-info → execsql2-2.12.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.12.3
+Version: 2.12.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
@@ -51,6 +51,7 @@ Requires-Dist: keyring; extra == 'all'
 Requires-Dist: odfpy; extra == 'all'
 Requires-Dist: openpyxl; extra == 'all'
 Requires-Dist: oracledb; extra == 'all'
+Requires-Dist: pg-upsert>=1.17.0; extra == 'all'
 Requires-Dist: polars; extra == 'all'
 Requires-Dist: psycopg2-binary; extra == 'all'
 Requires-Dist: pymysql; extra == 'all'
@@ -107,6 +108,8 @@ Provides-Extra: oracle
 Requires-Dist: oracledb; extra == 'oracle'
 Provides-Extra: postgres
 Requires-Dist: psycopg2-binary; extra == 'postgres'
+Provides-Extra: upsert
+Requires-Dist: pg-upsert>=1.17.0; extra == 'upsert'
 Description-Content-Type: text/markdown
 
 > [!NOTE]

{execsql2-2.12.3.dist-info → execsql2-2.12.5.dist-info}/RECORD

@@ -61,13 +61,13 @@ execsql/importers/csv.py,sha256=Mu848WNzuhVO1ade-WurPyxqGOuVNRO8UwRF3-bav_I,4845
 execsql/importers/feather.py,sha256=g2B69d2uv9vmnXcmjFyTVsMP40LYEzFYkhk3gD26mGw,1900
 execsql/importers/ods.py,sha256=MJsdsjropzCvxAA3DDZfAL_AnmZ4yij7DnrjGyDJqHQ,2843
 execsql/importers/xls.py,sha256=e0Zfe47ZiCpA1Ae3XDJ1ko3sCiH3-8U6XLKi6NvD0jQ,3683
-execsql/metacommands/__init__.py,sha256=EmYUZZq1oaubbSQ26-8F9jJI_JnOJ2R697NeossXF1Q,11202
+execsql/metacommands/__init__.py,sha256=jrp5PvAZyQYvZ0a_qYNxjv1ZqxDlGYE_P3dyqRTgVSM,11394
 execsql/metacommands/conditions.py,sha256=Fzrk83-pWbFOoKahYdQW7CZjQeh3zByDUbfgpTM_bjQ,29259
 execsql/metacommands/connect.py,sha256=Nsm0D91i3RX-R2rzQQ-Br-gULaI6Uvdn9fqb7DOAVfE,14804
 execsql/metacommands/control.py,sha256=PAZFK1ck5SDSm5QdFV1ctif3KpEiyYWIXdDceRWgQ6k,8513
 execsql/metacommands/data.py,sha256=tRQBGTAuW-eJ2tBNWaoZI9OjTyNNyHJISo7gOdL-sm8,11370
 execsql/metacommands/debug.py,sha256=pnT24dfvfOx8xFu86mO5czfVCGKbcvgBLyXnqaMWO4w,8184
-execsql/metacommands/dispatch.py,sha256=OQwLOo9XT3N9C96wsRt0zmu1Nn4HL-7cSBOsGCfp5V4,84041
+execsql/metacommands/dispatch.py,sha256=2Ec7dJmOFstbY3tEuFoTODV8yaHpR-Sfa-ZydOmvIxo,85205
 execsql/metacommands/io.py,sha256=Duh60caM4go9JczbGYNMKKYpcMimwPzF6EQ_tshKxdE,2971
 execsql/metacommands/io_export.py,sha256=7lkCSnPhXy9FVau9_hT1u68NOVdG2DsWmvUh9hM1QWI,18359
 execsql/metacommands/io_fileops.py,sha256=RrcJTh_cgj7bJ-bezjo0yNl-fN3CoWV-aZ71z1KHYZs,9803
@@ -76,6 +76,7 @@ execsql/metacommands/io_write.py,sha256=NpL2aYGfBpbqmPpYsqniYltYfd_SCA1EQz3_4qSd
 execsql/metacommands/prompt.py,sha256=xd3mAkdbn4AE4hUPuSfN5DgZGUZmk-Db23iL-JJPwXs,36918
 execsql/metacommands/script_ext.py,sha256=TUgAldB2LSJAwZrCvDDi804hQ1d9BDQD2GDqHNPVOcM,2280
 execsql/metacommands/system.py,sha256=sUR5kLL7idTVg8WXIMdd-Kv7nkERIiaeL0beWsz8NyY,7293
+execsql/metacommands/upsert.py,sha256=Ze_FhbCRM-8tjvqPKfL3E9abZVRGFfwPI0_NAihiEMU,14906
 execsql/script/__init__.py,sha256=HbVQmQEVn4gBtzwy5_nlbDGuRnbWd4dI4nG-q1KyBxs,3498
 execsql/script/control.py,sha256=s-1eZdGARM6H1FwZ6VDdO_f50j7bvvRtTHesfUm9tbc,6144
 execsql/script/engine.py,sha256=6LYabzy1LI-_ISjYzTJos0BrLO62QF6FEKdqcN0YzK4,42995
@@ -92,24 +93,24 @@ 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.12.3.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.12.3.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.12.3.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.12.3.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
-execsql2-2.12.3.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.12.3.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
-execsql2-2.12.3.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
-execsql2-2.12.3.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
-execsql2-2.12.3.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
-execsql2-2.12.3.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
-execsql2-2.12.3.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
-execsql2-2.12.3.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
-execsql2-2.12.3.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
-execsql2-2.12.3.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
-execsql2-2.12.3.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
-execsql2-2.12.3.dist-info/METADATA,sha256=snFjAb6heF3pzQ-Yyxwmip-LgS0aH3OPjkQ_FXQucj8,17436
-execsql2-2.12.3.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.12.3.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.12.3.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.12.3.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
-execsql2-2.12.3.dist-info/RECORD,,
+execsql2-2.12.5.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.12.5.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.12.5.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
+execsql2-2.12.5.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
+execsql2-2.12.5.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.12.5.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
+execsql2-2.12.5.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
+execsql2-2.12.5.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
+execsql2-2.12.5.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
+execsql2-2.12.5.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
+execsql2-2.12.5.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
+execsql2-2.12.5.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
+execsql2-2.12.5.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
+execsql2-2.12.5.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
+execsql2-2.12.5.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
+execsql2-2.12.5.dist-info/METADATA,sha256=Z0cWFXEpF8ujF1fqnSsBO33IIylqc9t583xJ9H33Xss,17560
+execsql2-2.12.5.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+execsql2-2.12.5.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.12.5.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.12.5.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
+execsql2-2.12.5.dist-info/RECORD,,