execsql2 2.12.5__tar.gz → 2.12.6__tar.gz

{execsql2-2.12.5 → execsql2-2.12.6}/CHANGELOG.md

@@ -13,8 +13,21 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.12.6] - 2026-04-03
+
+### Added
+
+- `PG_UPSERT` now supports per-table progress via pg-upsert's callback API. New substitution variables `$PG_UPSERT_CURRENT_TABLE`, `$PG_UPSERT_TABLE_QA_PASSED`, `$PG_UPSERT_TABLE_ROWS_UPDATED`, and `$PG_UPSERT_TABLE_ROWS_INSERTED` are updated as each table is processed.
+- New `CLEANUP` keyword for `PG_UPSERT` — drops all `ups_*` temporary tables and views after execution. Without it, temp objects persist for inspection (default).
+
+______________________________________________________________________
+
 ## [2.12.5] - 2026-04-03
 
+### Fixed
+
+- Fixed CLI test `test_nonexistent_file_error_message_is_clear` failing with `ValueError: stderr not separately captured` when CliRunner mixes stderr into stdout.
+
 ______________________________________________________________________
 
 ## [2.12.4] - 2026-04-03

{execsql2-2.12.5 → execsql2-2.12.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.12.5
+Version: 2.12.6
 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,7 +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: pg-upsert>=1.18.0; extra == 'all'
 Requires-Dist: polars; extra == 'all'
 Requires-Dist: psycopg2-binary; extra == 'all'
 Requires-Dist: pymysql; extra == 'all'
@@ -109,7 +109,7 @@ 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'
+Requires-Dist: pg-upsert>=1.18.0; extra == 'upsert'
 Description-Content-Type: text/markdown
 
 > [!NOTE]

{execsql2-2.12.5 → execsql2-2.12.6}/docs/reference/metacommands.md

@@ -2099,6 +2099,7 @@ Keywords can appear in any order after the table list.
 | `INTERACTIVE` | Enable pg-upsert's interactive UI dialogs (tkinter or textual) for reviewing QA failures. Without it, runs non-interactively. |
 | `COMPACT` | Use compact grid format for QA summary instead of detailed per-table panels. |
 | `LOGFILE <path>` | Append pg-upsert's plain-text log output to the given file. Supports quoted paths for spaces: `LOGFILE "path/to/log.txt"`. |
+| `CLEANUP` | Drop all `ups_*` temporary tables and views after execution. Without it, temp objects persist for inspection (default). |
 
 ### Substitution variables
 
@@ -2118,6 +2119,10 @@ Set after every `PG_UPSERT` execution:
 | `$PG_UPSERT_STARTED_AT` | string | ISO 8601 start timestamp |
 | `$PG_UPSERT_FINISHED_AT` | string | ISO 8601 end timestamp |
 | `$PG_UPSERT_RESULT_JSON` | JSON string | Full result for detailed inspection |
+| `$PG_UPSERT_CURRENT_TABLE` | string | Last table processed (updated per table during execution) |
+| `$PG_UPSERT_TABLE_QA_PASSED` | TRUE/FALSE | QA result for the current table (updated per table) |
+| `$PG_UPSERT_TABLE_ROWS_UPDATED` | integer | Rows updated for the current table (updated per table) |
+| `$PG_UPSERT_TABLE_ROWS_INSERTED` | integer | Rows inserted for the current table (updated per table) |
 
 !!! note "Using `$PG_UPSERT_RESULT_JSON` with WRITE"
     The JSON value is stored as compact single-line JSON. Because it contains double quotes (`"`), square brackets (`[]`), and apostrophes may appear in data, use tilde or backtick delimiters with WRITE:

{execsql2-2.12.5 → execsql2-2.12.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.12.5"
+version = "2.12.6"
 description = "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."
 readme = { file = "README.md", content-type = "text/markdown" }
 license = { file = "LICENSE.txt" }
@@ -58,7 +58,7 @@ odbc = ["pyodbc"]
 # Feature bundles
 formats = ["odfpy", "xlrd", "openpyxl", "Jinja2", "polars", "tables", "PyYAML"]
 auth = ["keyring"]
-upsert = ["pg-upsert>=1.17.0"]
+upsert = ["pg-upsert>=1.18.0"]
 # Convenience groups
 all-db = [
     "psycopg2-binary",
@@ -161,7 +161,7 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.bumpversion]
-current_version = "2.12.5"
+current_version = "2.12.6"
 commit = true
 commit_args = "--no-verify"
 tag = true

{execsql2-2.12.5 → execsql2-2.12.6}/src/execsql/metacommands/upsert.py

@@ -26,21 +26,22 @@ from execsql.utils.errors import exception_desc
 
 _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*$)",
+    r"\bEXCLUDE\s+([\w\s,]+?)(?=\s+(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE_NULL|LOGFILE|CLEANUP)\b|\s*$)",
     re.IGNORECASE,
 )
 _KW_EXCLUDE_NULL = re.compile(
-    r"\bEXCLUDE_NULL\s+([\w\s,]+?)(?=\s+(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE|LOGFILE)\b|\s*$)",
+    r"\bEXCLUDE_NULL\s+([\w\s,]+?)(?=\s+(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE|LOGFILE|CLEANUP)\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_CLEANUP = re.compile(r"\bCLEANUP\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",
+    r"\b(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE_NULL|EXCLUDE|LOGFILE|CLEANUP)\b",
     re.IGNORECASE,
 )
 
@@ -98,6 +99,7 @@ def _parse_tables_and_options(tail: str) -> dict[str, Any]:
         "exclude_cols": exclude_cols,
         "exclude_null_check_cols": exclude_null,
         "logfile": logfile,
+        "cleanup": bool(_KW_CLEANUP.search(opts_part)),
     }
 
 
@@ -210,6 +212,22 @@ def _build_result_from_qa_errors(ups: Any) -> Any:
     )
 
 
+def _make_callback() -> Any:
+    """Return a pg-upsert pipeline callback that sets per-table subvars."""
+    from pg_upsert import CallbackEvent
+
+    def _on_event(event: Any) -> None:
+        sv = _state.subvars.add_substitution
+        sv("$PG_UPSERT_CURRENT_TABLE", event.table)
+        if event.event == CallbackEvent.QA_TABLE_COMPLETE:
+            sv("$PG_UPSERT_TABLE_QA_PASSED", str(event.qa_passed).upper())
+        elif event.event == CallbackEvent.UPSERT_TABLE_COMPLETE:
+            sv("$PG_UPSERT_TABLE_ROWS_UPDATED", str(event.rows_updated))
+            sv("$PG_UPSERT_TABLE_ROWS_INSERTED", str(event.rows_inserted))
+
+    return _on_event
+
+
 def _create_pgupsert(
     db: Any,
     staging_schema: str,
@@ -235,6 +253,7 @@ def _create_pgupsert(
         exclude_cols=opts["exclude_cols"],
         exclude_null_check_cols=opts["exclude_null_check_cols"],
         ui_mode=ui_mode,
+        callback=_make_callback(),
     )
     return ups
 
@@ -362,6 +381,8 @@ def x_pg_upsert(**kwargs: Any) -> None:
         _detach_log_handlers(loggers, handlers, prev_levels)
 
     _set_subvars(result)
+    if opts.get("cleanup"):
+        ups.cleanup()
 
     if not result.qa_passed:
         raise ErrInfo(
@@ -399,6 +420,8 @@ def x_pg_upsert_qa(**kwargs: Any) -> None:
 
     result = _build_result_from_qa_errors(ups)
     _set_subvars(result)
+    if opts.get("cleanup"):
+        ups.cleanup()
 
     if not result.qa_passed:
         raise ErrInfo(
@@ -439,6 +462,8 @@ def x_pg_upsert_check(**kwargs: Any) -> None:
 
     result = _build_result_from_qa_errors(ups)
     _set_subvars(result)
+    if opts.get("cleanup"):
+        ups.cleanup()
 
     if not result.qa_passed:
         raise ErrInfo(

{execsql2-2.12.5 → execsql2-2.12.6}/tests/metacommands/test_pg_upsert.py

@@ -230,7 +230,7 @@ class TestParseTablesAndOptions:
 
     def test_all_keywords_combined(self):
         result = _parse_tables_and_options(
-            'books, authors METHOD update EXCLUDE rev_time EXCLUDE_NULL created_at INTERACTIVE COMPACT LOGFILE "upsert.log" COMMIT',
+            'books, authors METHOD update EXCLUDE rev_time EXCLUDE_NULL created_at INTERACTIVE COMPACT LOGFILE "upsert.log" CLEANUP COMMIT',
         )
         assert result["tables"] == ["books", "authors"]
         assert result["method"] == "update"
@@ -240,6 +240,7 @@ class TestParseTablesAndOptions:
         assert result["compact"] is True
         assert result["commit"] is True
         assert result["logfile"] == "upsert.log"
+        assert result["cleanup"] is True
 
     def test_keyword_order_independent(self):
         r1 = _parse_tables_and_options("books COMPACT INTERACTIVE COMMIT")
@@ -995,3 +996,117 @@ class TestLoggerLevelRestoration:
 
         assert display_logger.level == orig_display
         assert main_logger.level == orig_main
+
+
+# ---------------------------------------------------------------------------
+# CLEANUP keyword tests
+# ---------------------------------------------------------------------------
+
+
+class TestCleanup:
+    def test_cleanup_keyword_parsed(self):
+        result = _parse_tables_and_options("books CLEANUP COMMIT")
+        assert result["cleanup"] is True
+
+    def test_no_cleanup_by_default(self):
+        result = _parse_tables_and_options("books COMMIT")
+        assert result["cleanup"] is False
+
+    def test_cleanup_calls_ups_cleanup(self, mock_state):
+        state, db = mock_state
+        fake_result = FakeUpsertResult(
+            tables=[FakeTableResult(table_name="books")],
+            staging_schema="staging",
+            base_schema="public",
+        )
+
+        with (
+            patch("execsql.metacommands.upsert._require_pg_upsert"),
+            patch("execsql.metacommands.upsert._create_pgupsert") as mock_create,
+        ):
+            mock_ups = mock_create.return_value
+            mock_ups.run.return_value = fake_result
+            x_pg_upsert(
+                staging_schema="staging",
+                base_schema="public",
+                tail="books CLEANUP COMMIT",
+                metacommandline="PG_UPSERT FROM staging TO public TABLES books CLEANUP COMMIT",
+            )
+            mock_ups.cleanup.assert_called_once()
+
+    def test_no_cleanup_without_keyword(self, mock_state):
+        state, db = mock_state
+        fake_result = FakeUpsertResult(
+            tables=[FakeTableResult(table_name="books")],
+            staging_schema="staging",
+            base_schema="public",
+        )
+
+        with (
+            patch("execsql.metacommands.upsert._require_pg_upsert"),
+            patch("execsql.metacommands.upsert._create_pgupsert") as mock_create,
+        ):
+            mock_ups = mock_create.return_value
+            mock_ups.run.return_value = fake_result
+            x_pg_upsert(
+                staging_schema="staging",
+                base_schema="public",
+                tail="books COMMIT",
+                metacommandline="PG_UPSERT FROM staging TO public TABLES books COMMIT",
+            )
+            mock_ups.cleanup.assert_not_called()
+
+
+# ---------------------------------------------------------------------------
+# Callback per-table subvar tests
+# ---------------------------------------------------------------------------
+
+
+class TestCallback:
+    def test_callback_sets_qa_table_subvars(self, mock_state):
+        from execsql.metacommands.upsert import _make_callback
+
+        state, db = mock_state
+
+        # Create a fake QA_TABLE_COMPLETE event
+        mock_event = MagicMock()
+        mock_event.event = MagicMock()
+        mock_event.event.value = "qa_table_complete"
+        mock_event.table = "books"
+        mock_event.qa_passed = True
+
+        # We need the real CallbackEvent enum for comparison
+        # Patch _state so the callback can access subvars
+        with patch("execsql.metacommands.upsert._state", state):
+            cb = _make_callback()
+
+            # Simulate CallbackEvent.QA_TABLE_COMPLETE match
+            from pg_upsert import CallbackEvent
+
+            mock_event.event = CallbackEvent.QA_TABLE_COMPLETE
+            cb(mock_event)
+
+        calls = {c[0][0]: c[0][1] for c in state.subvars.add_substitution.call_args_list}
+        assert calls["$PG_UPSERT_CURRENT_TABLE"] == "books"
+        assert calls["$PG_UPSERT_TABLE_QA_PASSED"] == "TRUE"
+
+    def test_callback_sets_upsert_table_subvars(self, mock_state):
+        from execsql.metacommands.upsert import _make_callback
+        from pg_upsert import CallbackEvent
+
+        state, db = mock_state
+
+        mock_event = MagicMock()
+        mock_event.event = CallbackEvent.UPSERT_TABLE_COMPLETE
+        mock_event.table = "authors"
+        mock_event.rows_updated = 15
+        mock_event.rows_inserted = 3
+
+        with patch("execsql.metacommands.upsert._state", state):
+            cb = _make_callback()
+            cb(mock_event)
+
+        calls = {c[0][0]: c[0][1] for c in state.subvars.add_substitution.call_args_list}
+        assert calls["$PG_UPSERT_CURRENT_TABLE"] == "authors"
+        assert calls["$PG_UPSERT_TABLE_ROWS_UPDATED"] == "15"
+        assert calls["$PG_UPSERT_TABLE_ROWS_INSERTED"] == "3"

{execsql2-2.12.5 → execsql2-2.12.6}/uv.lock

@@ -648,7 +648,7 @@ wheels = [
 
 [[package]]
 name = "execsql2"
-version = "2.12.5"
+version = "2.12.6"
 source = { editable = "." }
 dependencies = [
     { name = "rich" },
@@ -766,7 +766,7 @@ requires-dist = [
     { name = "openpyxl", marker = "extra == 'formats'" },
     { name = "oracledb", marker = "extra == 'all-db'" },
     { name = "oracledb", marker = "extra == 'oracle'" },
-    { name = "pg-upsert", marker = "extra == 'upsert'", specifier = ">=1.17.0" },
+    { name = "pg-upsert", marker = "extra == 'upsert'", specifier = ">=1.18.0" },
     { name = "polars", marker = "extra == 'formats'" },
     { name = "pre-commit", marker = "extra == 'dev'", specifier = ">=3.5.0" },
     { name = "psycopg2-binary", marker = "extra == 'all-db'" },
@@ -1780,7 +1780,7 @@ wheels = [
 
 [[package]]
 name = "pg-upsert"
-version = "1.17.0"
+version = "1.18.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "psycopg2-binary" },
@@ -1788,9 +1788,9 @@ dependencies = [
     { name = "rich" },
     { name = "typer" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/8c/a1/bb8eff0005eead3de3b1c650e1f3085aede27835901f5f8fef9723b28bd7/pg_upsert-1.17.0.tar.gz", hash = "sha256:fb561100f9268d5477d691675e8cc4101398d1b572290c7bb36e23bc72ea6767", size = 1444254, upload-time = "2026-04-03T16:11:56.624Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/43/86/2e6adaa45b6746635e77ce7dc94729af28bcedc9f2daa139a5cbeb00926d/pg_upsert-1.18.0.tar.gz", hash = "sha256:1188d56f8dc6b3436f509b43a280e6f0c932e3e896615b657094c4a24c41af82", size = 1446377, upload-time = "2026-04-03T18:38:55.253Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/bf/80/bf5197d1422a3ac116f80192dc09928439d4e54712de85ee7f7b0d0d7d06/pg_upsert-1.17.0-py3-none-any.whl", hash = "sha256:cf81a94a6e2deeb2cab4b2a1f80ea67ab748892a5e4c3c4e75f14acd226313d2", size = 78942, upload-time = "2026-04-03T16:11:55.102Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/24/ecf173ed388766a090896d18ca1234264e1b4f69fff5a103d32703f8d935/pg_upsert-1.18.0-py3-none-any.whl", hash = "sha256:eeb4c27f89bd421d58818359043aad9b4593775f6b677d1eaed832ece6c11645", size = 80421, upload-time = "2026-04-03T18:38:53.689Z" },
 ]
 
 [[package]]