execsql2 2.21.0__tar.gz → 2.21.2__tar.gz

{execsql2-2.21.0 → execsql2-2.21.2}/.github/workflows/ci-cd.yml

@@ -20,8 +20,8 @@ jobs:
         permissions:
             contents: read
         steps:
-            - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
-            - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
+            - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+            - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1  # v6.3.0
               with:
                   python-version: "3.13"
             - run: python -m pip install ruff
@@ -48,13 +48,13 @@ jobs:
             contents: read
         steps:
             - name: Check out repository code
-              uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
+              uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
             - name: Setup Python ${{ matrix.python-version }}
-              uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
+              uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1  # v6.3.0
               with:
                   python-version: ${{ matrix.python-version }}
             - name: Cache pip dependencies
-              uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae  # v5.0.5
+              uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8  # v6.0.0
               with:
                   path: ~/.cache/pip
                   key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{
@@ -139,9 +139,9 @@ jobs:
                     --health-interval 10s --health-timeout 5s --health-retries 20
         steps:
             - name: Check out repository code
-              uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
+              uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
             - name: Setup Python ${{ matrix.python-version }}
-              uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
+              uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1  # v6.3.0
               with:
                   python-version: ${{ matrix.python-version }}
             - name: Install tkinter (Ubuntu)
@@ -187,8 +187,8 @@ jobs:
         permissions:
             contents: read
         steps:
-            - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
-            - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
+            - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+            - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1  # v6.3.0
               with:
                   python-version: ${{ matrix.python-version }}
             - name: Install Microsoft Access Database Engine 2016 (x64)
@@ -238,9 +238,9 @@ jobs:
         permissions:
             contents: read
         steps:
-            - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
+            - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
             - name: Set up Python
-              uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
+              uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1  # v6.3.0
               with:
                   python-version: "3.13"
                   cache: "pip"
@@ -288,14 +288,14 @@ jobs:
             contents: write
         steps:
             - name: Checkout
-              uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
+              uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
             - name: Download dist
               uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
               with:
                   name: ${{ github.event.repository.name }}
                   path: dist/
             - name: Create release
-              uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda  # v3.0.0
+              uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b  # v3.0.1
               with:
                   draft: false
                   prerelease: false

{execsql2-2.21.0 → execsql2-2.21.2}/CHANGELOG.md

@@ -13,6 +13,22 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.21.2] - 2026-06-30
+
+### Fixed
+
+- Fixed `EXPORT … AS PARQUET` and `EXPORT … AS FEATHER` `ComputeError` when a result column has more than 100 leading `NULL` values followed by non-null numeric values.
+
+______________________________________________________________________
+
+## [2.21.1] - 2026-06-24
+
+### Fixed
+
+- PostgreSQL: `EXPORT` and other repeated queries against objects a script drops/recreates or alters no longer fail with `FeatureNotSupported: cached plan must not change result type`. psycopg3's automatic server-side prepared statements are now disabled (`prepare_threshold=None`), restoring the psycopg2 behavior.
+
+______________________________________________________________________
+
 ## [2.21.0] - 2026-06-24
 
 ### Changed

{execsql2-2.21.0 → execsql2-2.21.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.21.0
+Version: 2.21.2
 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
@@ -403,7 +403,7 @@ execsql-format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.21.0
+    rev: v2.21.2
     hooks:
       - id: execsql-format
 ```

{execsql2-2.21.0 → execsql2-2.21.2}/README.md

@@ -272,7 +272,7 @@ execsql-format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.21.0
+    rev: v2.21.2
     hooks:
       - id: execsql-format
 ```

{execsql2-2.21.0 → execsql2-2.21.2}/docs/about/divergence.md

@@ -210,7 +210,7 @@ All 33 mutable runtime globals in `state.py` have been consolidated into a `Runt
 
 ### Database Adapters
 
-- **PostgreSQL driver is psycopg3** — the PostgreSQL adapter uses `psycopg` (psycopg3, installed via the `psycopg[binary]` extra) instead of upstream's `psycopg2`. The connection now passes the libpq `dbname` keyword (psycopg3 rejects psycopg2's `database`), `VACUUM` toggles `conn.autocommit` instead of the removed `set_session()`, server-side `COPY` import uses psycopg3's `cursor.copy()` context manager instead of `copy_expert()`, and binary `IMPORT` sends raw `bytes` instead of `psycopg2.Binary()`. This also makes `db.conn` directly usable by the `PG_UPSERT` metacommand's pg-upsert ≥1.23.0 dependency, which itself requires a psycopg3 connection.
+- **PostgreSQL driver is psycopg3** — the PostgreSQL adapter uses `psycopg` (psycopg3, installed via the `psycopg[binary]` extra) instead of upstream's `psycopg2`. The connection now passes the libpq `dbname` keyword (psycopg3 rejects psycopg2's `database`), `VACUUM` toggles `conn.autocommit` instead of the removed `set_session()`, server-side `COPY` import uses psycopg3's `cursor.copy()` context manager instead of `copy_expert()`, and binary `IMPORT` sends raw `bytes` instead of `psycopg2.Binary()`. This also makes `db.conn` directly usable by the `PG_UPSERT` metacommand's pg-upsert ≥1.23.0 dependency, which itself requires a psycopg3 connection. The connection sets `prepare_threshold=None` to disable psycopg3's automatic server-side prepared statements, which psycopg2 never used; without this, re-running a query (e.g. via `EXPORT`) against an object the script drops/recreates or alters raises `FeatureNotSupported: cached plan must not change result type`.
 - **`Database` is an ABC** — `open_db()` and `exec_cmd()` are abstract methods. Subclasses that omit them raise `TypeError` at instantiation instead of at call time.
 - **Connection timeouts** — PostgreSQL and SQLite adapters accept a connection timeout parameter (default 30 seconds).
 - **DuckDB temporal types** — `TIMESTAMPTZ`, `TIMESTAMP`, `DATE`, `TIME` now map to native DuckDB types instead of `TEXT`.

{execsql2-2.21.0 → execsql2-2.21.2}/docs/guides/formatter.md

@@ -160,7 +160,7 @@ select id,name,created_at from users where active = true order by name;
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.21.0
+    rev: v2.21.2
     hooks:
       - id: execsql-format
 ```

{execsql2-2.21.0 → execsql2-2.21.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.21.0"
+version = "2.21.2"
 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" }
@@ -178,7 +178,7 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.bumpversion]
-current_version = "2.21.0"
+current_version = "2.21.2"
 commit = true
 tag = true
 tag_name = "v{new_version}"

{execsql2-2.21.0 → execsql2-2.21.2}/src/execsql/db/postgres.py

@@ -78,6 +78,12 @@ class PostgresDatabase(Database):
 
         def db_conn(db: PostgresDatabase, db_name: str):
             try:
+                # prepare_threshold=None disables psycopg3's automatic server-side
+                # prepared statements.  execsql re-runs the same query text (e.g. via
+                # EXPORT) against objects that scripts may drop/recreate or alter
+                # between runs; a cached plan whose result type then changes triggers
+                # PostgreSQL's "cached plan must not change result type" error.  psycopg2
+                # never auto-prepared, so this preserves backwards-compatible behavior.
                 if db.user and db.password:
                     return psycopg.connect(
                         host=str(db.server_name),
@@ -86,6 +92,7 @@ class PostgresDatabase(Database):
                         user=db.user,
                         password=db.password,
                         connect_timeout=db.connect_timeout,
+                        prepare_threshold=None,
                     )
                 else:
                     return psycopg.connect(
@@ -93,6 +100,7 @@ class PostgresDatabase(Database):
                         dbname=db_name,
                         port=db.port,
                         connect_timeout=db.connect_timeout,
+                        prepare_threshold=None,
                     )
             except Exception as e:
                 msg = (

{execsql2-2.21.0 → execsql2-2.21.2}/src/execsql/exporters/feather.py

@@ -33,7 +33,7 @@ def write_query_to_feather(outfile: str, headers: list[str], rows: Any) -> None:
         ) from e
     rows_list = list(rows)
     if rows_list:
-        df = pl.DataFrame(rows_list, schema=headers, orient="row")
+        df = pl.DataFrame(rows_list, schema=headers, orient="row", infer_schema_length=None)
     else:
         df = pl.DataFrame({h: [] for h in headers})
     filewriter_close(outfile)

{execsql2-2.21.0 → execsql2-2.21.2}/src/execsql/exporters/parquet.py

@@ -28,7 +28,7 @@ def write_query_to_parquet(outfile: str, headers: list[str], rows: Any) -> None:
         ) from e
     rows_list = list(rows)
     if rows_list:
-        df = pl.DataFrame(rows_list, schema=headers, orient="row")
+        df = pl.DataFrame(rows_list, schema=headers, orient="row", infer_schema_length=None)
     else:
         df = pl.DataFrame({h: [] for h in headers})
     filewriter_close(outfile)

{execsql2-2.21.0 → execsql2-2.21.2}/tests/db/test_postgres.py

@@ -93,3 +93,49 @@ class TestPostgresConnectTimeout:
         # Credential-less path still uses ``dbname``.
         assert call_kwargs["dbname"] == "testdb"
         assert "database" not in call_kwargs
+
+
+# ---------------------------------------------------------------------------
+# Regression: psycopg3 auto-prepared statements must stay disabled
+#
+# psycopg3 promotes a query to a server-side prepared statement after the same
+# query text runs ``prepare_threshold`` times (default 5).  Scripts that re-run
+# a query (e.g. via EXPORT) against an object they drop/recreate or alter then
+# hit "cached plan must not change result type".  psycopg2 never auto-prepared,
+# so the adapter passes ``prepare_threshold=None`` to restore that behavior.
+# ---------------------------------------------------------------------------
+
+
+class TestPostgresPrepareThresholdDisabled:
+    @patch.dict("sys.modules", {"psycopg": _make_mock_psycopg()})
+    def test_prepare_threshold_disabled_with_credentials(self):
+        import sys
+
+        mock_psycopg = sys.modules["psycopg"]
+        from execsql.db.postgres import PostgresDatabase
+
+        PostgresDatabase(
+            server_name="localhost",
+            db_name="testdb",
+            user_name="user",
+            password="pass",
+        )
+        call_kwargs = mock_psycopg.connect.call_args[1]
+        assert "prepare_threshold" in call_kwargs
+        assert call_kwargs["prepare_threshold"] is None
+
+    @patch.dict("sys.modules", {"psycopg": _make_mock_psycopg()})
+    def test_prepare_threshold_disabled_without_credentials(self):
+        import sys
+
+        mock_psycopg = sys.modules["psycopg"]
+        from execsql.db.postgres import PostgresDatabase
+
+        PostgresDatabase(
+            server_name="localhost",
+            db_name="testdb",
+            user_name=None,
+        )
+        call_kwargs = mock_psycopg.connect.call_args[1]
+        assert "prepare_threshold" in call_kwargs
+        assert call_kwargs["prepare_threshold"] is None

{execsql2-2.21.0 → execsql2-2.21.2}/tests/exporters/test_parquet.py

@@ -60,3 +60,11 @@ class TestWriteQueryToParquet:
         assert len(result["id"]) == 100
         assert result["id"][0] == 0
         assert result["label"][99] == "item_99"
+
+    def test_leading_nulls_then_float(self, noop_filewriter_close, tmp_path):
+        out = str(tmp_path / "out.parquet")
+        rows = [(None,)] * 100 + [(12.5,), (5.2,)]
+        write_query_to_parquet(out, ["val"], iter(rows))
+        result = pl.read_parquet(out).to_dict(as_series=False)
+        assert result["val"][100] == pytest.approx(12.5)
+        assert result["val"][101] == pytest.approx(5.2)

{execsql2-2.21.0 → execsql2-2.21.2}/tests/integration/test_postgres.py

@@ -412,3 +412,54 @@ class TestExportJSON:
         assert data[1]["label"] == "beta"
 
         _exec_pg("DROP TABLE IF EXISTS items")
+
+
+# ---------------------------------------------------------------------------
+# Regression: psycopg3 cached-plan / auto-prepared statements
+#
+# psycopg3 promotes a query to a server-side prepared statement after the same
+# query text runs prepare_threshold times (default 5).  Re-EXPORTing a view that
+# the script drops/recreates with a different result type used to raise
+# "FeatureNotSupported: cached plan must not change result type".  The adapter
+# now connects with prepare_threshold=None; this exercises the full pipeline to
+# prove the fix end-to-end.  See CHANGELOG 2.21.1.
+# ---------------------------------------------------------------------------
+
+
+class TestCachedPlanRegression:
+    def test_repeated_export_after_view_result_type_change(self, tmp_path):
+        """EXPORT the same view past the prepare threshold, then recreate it with
+        a different column type and EXPORT again — must not error."""
+        _exec_pg("DROP VIEW IF EXISTS val_summ")
+        _exec_pg("DROP TABLE IF EXISTS val_src")
+        _write_conf(tmp_path)
+        out = tmp_path / "summ.txt"
+
+        # Six exports of identical query text cross psycopg3's default
+        # prepare_threshold (5); the view is then recreated returning a TEXT
+        # column instead of an INTEGER one and exported again.
+        first_exports = "\n".join(f"-- !x! EXPORT val_summ TO {out} AS TXT" for _ in range(6))
+        second_exports = "\n".join(f"-- !x! EXPORT val_summ TO {out} AS TXT" for _ in range(6))
+        script = write_script(
+            tmp_path,
+            f"""\
+            CREATE TABLE val_src (id INTEGER, name TEXT);
+            INSERT INTO val_src VALUES (1, 'alpha');
+
+            CREATE VIEW val_summ AS SELECT id AS c FROM val_src;
+            {first_exports}
+
+            DROP VIEW val_summ;
+            CREATE VIEW val_summ AS SELECT name AS c FROM val_src;
+            {second_exports}
+            """,
+        )
+
+        result = _run_execsql_pg(tmp_path, script)
+        assert result.returncode == 0, f"stderr: {result.stderr}"
+        assert "cached plan must not change result type" not in result.stderr
+        # The final export reflects the recreated (TEXT) view.
+        assert "alpha" in out.read_text()
+
+        _exec_pg("DROP VIEW IF EXISTS val_summ")
+        _exec_pg("DROP TABLE IF EXISTS val_src")

{execsql2-2.21.0 → execsql2-2.21.2}/uv.lock

@@ -722,7 +722,7 @@ wheels = [
 
 [[package]]
 name = "execsql2"
-version = "2.21.0"
+version = "2.21.2"
 source = { editable = "." }
 dependencies = [
     { name = "python-dateutil" },