execsql2 2.21.2__tar.gz → 2.22.0__tar.gz

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

@@ -28,6 +28,55 @@ jobs:
             - run: ruff check src/ tests/
             - run: ruff format --check src/ tests/
 
+    typecheck:
+        name: typecheck
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+        steps:
+            - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+            - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1  # v6.3.0
+              with:
+                  python-version: "3.13"
+                  cache: "pip"
+            - run: python -m pip install --upgrade pip
+            - run: python -m pip install ".[dev]"
+            - run: mypy src/execsql/
+
+    pre-commit:
+        name: pre-commit
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+        steps:
+            - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+            - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1  # v6.3.0
+              with:
+                  python-version: "3.13"
+                  cache: "pip"
+            - run: python -m pip install --upgrade pip
+            - run: python -m pip install ".[dev]"
+            # mypy runs in the dedicated typecheck job; the local hook needs uv
+            - run: pre-commit run --all-files
+              env:
+                  SKIP: mypy
+
+    docs:
+        name: docs
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+        steps:
+            - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+            - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1  # v6.3.0
+              with:
+                  python-version: "3.13"
+                  cache: "pip"
+            - run: python -m pip install --upgrade pip
+            - run: python -m pip install ".[dev]"
+            - run: cp CHANGELOG.md docs/about/change_log.md
+            - run: zensical build
+
     tests:
         strategy:
             fail-fast: false
@@ -233,7 +282,7 @@ jobs:
     build:
         name: Build distribution 📦
         runs-on: ubuntu-latest
-        needs: [ lint, tests, integration-tests ]
+        needs: [ lint, typecheck, pre-commit, docs, tests, integration-tests ]
         if: startsWith(github.ref, 'refs/tags/v')
         permissions:
             contents: read

{execsql2-2.21.2 → execsql2-2.22.0}/.pre-commit-config.yaml

@@ -80,3 +80,15 @@ repos:
     rev: v0.25
     hooks:
       - id: validate-pyproject
+  # Static type checking — same command as `just typecheck`, run in the
+  # project environment so results match local and CI. Whole-program run
+  # (pass_filenames: false) because mypy cannot check files in isolation.
+  # The CI pre-commit job sets SKIP=mypy; CI has a dedicated typecheck gate.
+  - repo: local
+    hooks:
+      - id: mypy
+        name: mypy
+        entry: uv run mypy src/execsql/
+        language: system
+        pass_filenames: false
+        files: ^(src/execsql/.*\.pyi?|pyproject\.toml)$

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

@@ -13,6 +13,21 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.22.0] - 2026-07-03
+
+### Added
+
+- `run()` now accepts `allow_rm_file=False` and `allow_serve=False` to disable the `RM_FILE` and `SERVE` metacommands for library callers, matching the existing `allow_system_cmd` kwarg and the `--no-rm-file` / `--no-serve` CLI flags.
+- `[config] system_cmd_timeout` can bound foreground `SYSTEM_CMD` execution; the default remains no timeout.
+
+### Fixed
+
+- `EXPORT … FORMAT SQLITE` and `EXPORT … FORMAT DUCKDB` correctly preserve source column types when exporting from a typed database: text columns stay text (not re-inferred as TIMESTAMP or numeric from value shape), `decimal.Decimal` values bind without error (converted to their exact string representation for SQLite), and unsupported Python objects such as PostGIS geometry are stringified instead of raising a bind error.
+- `EXPORT … FORMAT LATEX` into a ZIP archive no longer crashes with `AttributeError`.
+- Connecting to a server-based database without a server or database name now stops with a clear error message instead of a driver traceback.
+
+______________________________________________________________________
+
 ## [2.21.2] - 2026-06-30
 
 ### Fixed

{execsql2-2.21.2 → execsql2-2.22.0}/CONTRIBUTING.md

@@ -32,13 +32,19 @@ Linting and formatting are handled by [ruff](https://docs.astral.sh/ruff/):
 just lint
 ```
 
-[pre-commit](https://pre-commit.com/) hooks enforce additional checks (gitleaks, uv-lock, mdformat, markdownlint, typos, validate-pyproject) on every commit. To run them manually against all files:
+Static type checking is handled by [mypy](https://mypy.readthedocs.io/) and must pass with zero errors:
+
+```bash
+just typecheck
+```
+
+[pre-commit](https://pre-commit.com/) hooks enforce additional checks (gitleaks, uv-lock, mdformat, markdownlint, typos, validate-pyproject, mypy) on every commit. To run them manually against all files:
 
 ```bash
 just pre-commit
 ```
 
-CI rejects PRs that fail linting or any pre-commit check.
+CI rejects PRs that fail ruff lint/format, mypy type checking, the full pre-commit suite, docs build, or tests.
 
 ## Running Tests
 
@@ -96,12 +102,18 @@ Pre-releases are published to PyPI but are not installed by default — `pip ins
 
 Triggered on pushes to `main`, any `v*.*.*` tag, and pull requests.
 
-| Job                | Trigger            | What it does                                    |
-| ------------------ | ------------------ | ----------------------------------------------- |
-| `tests`            | all events         | Runs the test matrix (3 OS × 5 Python versions) |
-| `build`            | `v*.*.*` tags only | Builds sdist + wheel, checks with twine         |
-| `publish`          | `v*.*.*` tags only | Publishes to PyPI via OIDC trusted publishing   |
-| `generate-release` | `v*.*.*` tags only | Creates a GitHub Release with dist artifacts    |
+| Job                    | Trigger            | What it does                                          |
+| ---------------------- | ------------------ | ----------------------------------------------------- |
+| `lint`                 | all events         | Runs `ruff check` and `ruff format --check`           |
+| `typecheck`            | all events         | Runs `mypy src/execsql/` (zero-error gate)            |
+| `pre-commit`           | all events         | Runs the full pre-commit suite against all files      |
+| `docs`                 | all events         | Builds the documentation site                         |
+| `tests`                | all events         | Runs the test matrix (3 OS × 5 Python versions)       |
+| `integration-tests`    | all events         | Runs tests against live database service containers   |
+| `access-tests-windows` | all events         | Runs MS Access driver tests on Windows (non-blocking) |
+| `build`                | `v*.*.*` tags only | Builds sdist + wheel, checks with twine               |
+| `publish`              | `v*.*.*` tags only | Publishes to PyPI via OIDC trusted publishing         |
+| `generate-release`     | `v*.*.*` tags only | Creates a GitHub Release with dist artifacts          |
 
 ### PyPI trusted publishing setup
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.21.2
+Version: 2.22.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
@@ -173,7 +173,7 @@ Optional extras install database drivers and feature bundles:
 
 ```bash
 # Database drivers
-pip install execsql2[postgres]    # PostgreSQL (psycopg2-binary)
+pip install execsql2[postgres]    # PostgreSQL (psycopg3 / psycopg[binary])
 pip install execsql2[mysql]       # MySQL / MariaDB (pymysql)
 pip install execsql2[mssql]       # SQL Server (pyodbc)
 pip install execsql2[duckdb]      # DuckDB
@@ -403,7 +403,7 @@ execsql-format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.21.2
+    rev: v2.22.0
     hooks:
       - id: execsql-format
 ```

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

@@ -42,7 +42,7 @@ Optional extras install database drivers and feature bundles:
 
 ```bash
 # Database drivers
-pip install execsql2[postgres]    # PostgreSQL (psycopg2-binary)
+pip install execsql2[postgres]    # PostgreSQL (psycopg3 / psycopg[binary])
 pip install execsql2[mysql]       # MySQL / MariaDB (pymysql)
 pip install execsql2[mssql]       # SQL Server (pyodbc)
 pip install execsql2[duckdb]      # DuckDB
@@ -272,7 +272,7 @@ execsql-format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.21.2
+    rev: v2.22.0
     hooks:
       - id: execsql-format
 ```

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

@@ -179,7 +179,7 @@ ______________________________________________________________________
 
 ### CLI Interface
 
-The CLI framework changed from `optparse` to [Typer](https://typer.tiangolo.com/) with Rich-formatted help text. All original short flags (`-a` through `-z`) are preserved. The tool can be invoked as either `execsql` or `execsql2`.
+The CLI framework changed from `optparse` to [Typer](https://typer.tiangolo.com/) with Rich-formatted help text. All original short flags (`-a` through `-z`) are preserved. The PyPI distribution is named `execsql2`, but the installed executable remains `execsql` for compatibility.
 
 Seven upstream long-form flags were renamed underscore → hyphen and the underscore forms are **not** accepted: `--database-encoding`, `--script-encoding`, `--output-encoding`, `--import-encoding`, `--import-buffer`, `--user-logfile`, `--visible-prompts` (upstream wrote these with underscores). Scripts and CI pipelines that invoke the long-form flags must update the spelling; the short letters (`-e`, `-f`, `-g`, `-i`, `-l`, `-v`, `-z`) are unchanged.
 
@@ -271,45 +271,49 @@ These are behavioral changes driven by security or correctness issues in the ups
 
 ### Bug Fixes
 
-| Area                                                | Fix                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| --------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Oracle default port                                 | Corrected from `5432` (PostgreSQL) to `1521`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| MySQL `LOAD DATA INFILE` encoding                   | Python encoding names are now mapped to MySQL charset names.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `dt_cast` type converters                           | Base `Database` class auto-populates 8 type converters that were previously left empty after the refactor.                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| `FileWriter` CPU busy-loop                          | Uses blocking `queue.get(timeout=0.1)` instead of `get_nowait()` in a tight loop.                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| Substitution variable cycles                        | 100-iteration limit prevents infinite loops on cyclic variable references.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| Script location in error messages                   | `ErrInfo.script_file` and `script_line_no` are now populated via `stamp_errinfo()` so error output includes "Line N of script foo.sql" context — restoring behavior present in the monolith.                                                                                                                                                                                                                                                                                                                                                               |
-| `$ERROR_MESSAGE` not updated                        | `$ERROR_MESSAGE` is now set on every error path: `exit_now()`, non-halting SQL errors, and non-halting metacommand errors. Previously it was initialized to `""` and never changed.                                                                                                                                                                                                                                                                                                                                                                        |
-| Metacommand error message lost                      | When `halt_on_metacommand_err` is `ON`, the original handler `ErrInfo` is now re-raised; the generic "Unknown metacommand" message no longer replaces the specific error from the handler.                                                                                                                                                                                                                                                                                                                                                                 |
-| Empty script name in error msg                      | `_execute_script_direct()` and `_execute_script_textual_console()` no longer append "in script , line 0" to uncaught-exception messages when `current_script_line()` returns an empty string.                                                                                                                                                                                                                                                                                                                                                              |
-| `PROMPT COMPARE` diff comparison                    | Diff engine uses native Python equality instead of string comparison — numeric types, Decimals, and booleans compare correctly. `None` is distinguished from empty string. Columns are matched by name (not position), key columns are excluded from comparison, and duplicate PKs keep the first row.                                                                                                                                                                                                                                                     |
-| `win_config_file` broken                            | Checked `os.name == "windows"` which Python never returns (correct value is `"nt"`). Fixed to `os.name == "nt"`.                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| ELSEIF + ANDIF/ORIF                                 | ANDIF/ORIF after an ELSEIF were silently attached to the parent IF condition instead of the ELSEIF clause. The compound condition was never evaluated for the ELSEIF branch. Fixed in the AST parser and executor.                                                                                                                                                                                                                                                                                                                                         |
-| Cursor leak in `select_rowsource()`                 | Cursor was not closed on query execution failure. Row generators in EXPORT and COPY paths were not explicitly closed on error, relying on garbage collection for cleanup.                                                                                                                                                                                                                                                                                                                                                                                  |
-| `NumericParser` right-associative                   | Arithmetic operators were parsed right-to-left. `10 - 3 - 2` evaluated as `9` instead of `5`. Fixed to left-associative parsing.                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| Empty-column check precedence                       | `DataTable` and `Database.populate_table()` had an operator precedence bug in the extra-column emptiness check — a redundant `and conf.del_empty_cols` caused incorrect short-circuit evaluation.                                                                                                                                                                                                                                                                                                                                                          |
-| SQLite import string processing                     | `SQLiteDatabase.populate_table()` applied `trim_strings`, `replace_newlines`, and `empty_strings` after copying row data, so processing never reached the INSERT. Fixed to process before extraction.                                                                                                                                                                                                                                                                                                                                                      |
-| `$CURRENT_DATABASE`/`$CURRENT_DBMS` stale after USE | These variables were only set at startup and on CONNECT, not refreshed when `USE` switched the active database. Now set in `set_static_system_vars()` so they update on any connection change.                                                                                                                                                                                                                                                                                                                                                             |
-| `DT_Text.data_type_name` wrong                      | Was `"character"` (same as `DT_Character`), making error messages indistinguishable. Corrected to `"text"`.                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| `DT_Varchar` non-string data unchecked              | `_from_data()` only enforced the 255-char limit for `str` inputs; non-string values passed through without conversion or length check.                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `WriteHooks.write_err()` crash on empty string      | `strval[-1]` raised `IndexError` on empty input. Fixed to use `str.endswith()`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| `NumericParser` division by zero                    | `NumericAstNode.eval()` raised unhandled `ZeroDivisionError`. Now raises `NumericParserError` with a clear message.                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `CondAstNode.eval()` could return `None`            | Missing fallthrough for unknown node types silently returned `None`. Now raises `CondParserError`.                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-| `DT_Timestamp` claims time-only values              | `dateutil.parser.parse()` silently fills in today's date for bare time strings like `"13:15:45"`, so `DT_Timestamp` matched before `DT_Time` in the inference order. `parse_datetime()` now rejects time-only strings.                                                                                                                                                                                                                                                                                                                                     |
-| `CounterVars.substitute` skipped pos 0–1            | `re.I` was passed as the positional `pos` argument, skipping the first 2 characters of every string during counter variable expansion. Counter variables at the very start of a line were never matched.                                                                                                                                                                                                                                                                                                                                                   |
-| `exec_cmd` (SQLite/DuckDB) always raised TypeError  | Passed bytes to `curs.execute()` via `.encode()`, which Python 3 `sqlite3`/`duckdb` reject. `EXECUTE PROCEDURE` metacommand was non-functional on these backends.                                                                                                                                                                                                                                                                                                                                                                                          |
-| MySQL `LOAD DATA INFILE` injection                  | File path, delimiter, and quotechar were interpolated without escaping. Now single-quotes are escaped consistent with the PostgreSQL COPY path.                                                                                                                                                                                                                                                                                                                                                                                                            |
-| Config file chain infinite loop                     | The `config_file` directive could chain config files without limit. A circular reference (via symlinks or different relative paths) caused an infinite loop at startup. Now capped at 20 files.                                                                                                                                                                                                                                                                                                                                                            |
-| Cursor leaks in database adapters                   | ~15 methods across all adapters used `curs = self.cursor()` / `curs.close()` without `try/finally`. If the query raised, the cursor leaked. Converted to `with self._cursor() as curs:`.                                                                                                                                                                                                                                                                                                                                                                   |
-| JSON export malformed on special column names       | Column names containing `"` or `\` produced invalid JSON. Now uses `json.dumps()` for all field names.                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| Temp file creation TOCTOU race                      | `TempFileMgr.new_temp_fn()` discarded the `NamedTemporaryFile` handle, creating a race window. Now uses `tempfile.mkstemp()` for secure creation.                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `shlex.split` on Windows incorrect mode             | Called without `posix=False` on Windows, mishandling backslash-heavy paths in SHELL commands.                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| AST executor `~`/`+` variable scoping broken        | The AST executor passed `localvars` through function parameters but never pushed `CommandList` frames onto `commandliststack`. Legacy metacommand handlers (`x_sub`, `x_rm_sub`, `xf_sub_defined`, `SUB_LOCAL`, prompt handlers, REPL) access `commandliststack[-1]` for `~` local and `+` outer-scope variables. This caused `~` vars to be invisible to SQL, `SUB_DEFINED(~var)` to always return false, and the REPL `.vars`/`.stack` to show empty state. Fixed by pushing/popping `CommandList` frames in `execute()` and `_execute_script_native()`. |
-| Firebird adapter import                             | Adapter imported `fdb` (the unmaintained legacy driver) while the `[firebird]` extra declared `firebird-driver`. `pip install execsql2[firebird]` followed by a Firebird connect raised `ModuleNotFoundError: No module named 'fdb'`. Adapter now imports `firebird.driver`, matching the declared dependency.                                                                                                                                                                                                                                             |
-| Connect timeouts on network adapters                | MySQL, SQL Server / Access / DSN (pyodbc), Firebird, and SMTP all now apply a 30 s connect timeout matching the existing PostgreSQL default. A silently-dropped network peer (firewall rule, dead VM) used to hang scripts indefinitely; now the connect fails fast.                                                                                                                                                                                                                                                                                       |
-| AST parser INCLUDE quoted paths broken              | The AST parser captured the full INCLUDE target including surrounding quotes (`"path"`), but the legacy dispatch regex stripped them. Quoted INCLUDE paths failed with "File does not exist" even when the file was present. Fixed by stripping matched quote pairs in the parser.                                                                                                                                                                                                                                                                         |
-| AST parser `BEGIN SCRIPT name(params)` rejected     | The regex required whitespace between the script name and parameter list. `BEGIN SCRIPT foo(a,b)` (no space before `(`) silently failed to match, causing the matching `END SCRIPT` to raise "Unmatched END SCRIPT metacommand." Fixed by allowing optional whitespace before the parameter expression.                                                                                                                                                                                                                                                    |
-| AST executor forward SCRIPT references broken       | The legacy engine registered all `BEGIN SCRIPT` blocks at parse time (two-pass), so `EXECUTE SCRIPT foo` could appear before the `BEGIN SCRIPT foo` definition. The AST executor walked the tree in a single pass, so forward references failed with "There is no SCRIPT named foo." Fixed by adding a pre-registration scan of all SCRIPT blocks before execution begins.                                                                                                                                                                                 |
+| Area                                                | Fix                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Oracle default port                                 | Corrected from `5432` (PostgreSQL) to `1521`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| MySQL `LOAD DATA INFILE` encoding                   | Python encoding names are now mapped to MySQL charset names.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| `dt_cast` type converters                           | Base `Database` class auto-populates 8 type converters that were previously left empty after the refactor.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| `FileWriter` CPU busy-loop                          | Uses blocking `queue.get(timeout=0.1)` instead of `get_nowait()` in a tight loop.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| Substitution variable cycles                        | 100-iteration limit prevents infinite loops on cyclic variable references.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| Script location in error messages                   | `ErrInfo.script_file` and `script_line_no` are now populated via `stamp_errinfo()` so error output includes "Line N of script foo.sql" context — restoring behavior present in the monolith.                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| `$ERROR_MESSAGE` not updated                        | `$ERROR_MESSAGE` is now set on every error path: `exit_now()`, non-halting SQL errors, and non-halting metacommand errors. Previously it was initialized to `""` and never changed.                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| Metacommand error message lost                      | When `halt_on_metacommand_err` is `ON`, the original handler `ErrInfo` is now re-raised; the generic "Unknown metacommand" message no longer replaces the specific error from the handler.                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| Empty script name in error msg                      | `_execute_script_direct()` and `_execute_script_textual_console()` no longer append "in script , line 0" to uncaught-exception messages when `current_script_line()` returns an empty string.                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| `PROMPT COMPARE` diff comparison                    | Diff engine uses native Python equality instead of string comparison — numeric types, Decimals, and booleans compare correctly. `None` is distinguished from empty string. Columns are matched by name (not position), key columns are excluded from comparison, and duplicate PKs keep the first row.                                                                                                                                                                                                                                                                                                         |
+| `win_config_file` broken                            | Checked `os.name == "windows"` which Python never returns (correct value is `"nt"`). Fixed to `os.name == "nt"`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| ELSEIF + ANDIF/ORIF                                 | ANDIF/ORIF after an ELSEIF were silently attached to the parent IF condition instead of the ELSEIF clause. The compound condition was never evaluated for the ELSEIF branch. Fixed in the AST parser and executor.                                                                                                                                                                                                                                                                                                                                                                                             |
+| Cursor leak in `select_rowsource()`                 | Cursor was not closed on query execution failure. Row generators in EXPORT and COPY paths were not explicitly closed on error, relying on garbage collection for cleanup.                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| `NumericParser` right-associative                   | Arithmetic operators were parsed right-to-left. `10 - 3 - 2` evaluated as `9` instead of `5`. Fixed to left-associative parsing.                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| Empty-column check precedence                       | `DataTable` and `Database.populate_table()` had an operator precedence bug in the extra-column emptiness check — a redundant `and conf.del_empty_cols` caused incorrect short-circuit evaluation.                                                                                                                                                                                                                                                                                                                                                                                                              |
+| SQLite import string processing                     | `SQLiteDatabase.populate_table()` applied `trim_strings`, `replace_newlines`, and `empty_strings` after copying row data, so processing never reached the INSERT. Fixed to process before extraction.                                                                                                                                                                                                                                                                                                                                                                                                          |
+| `$CURRENT_DATABASE`/`$CURRENT_DBMS` stale after USE | These variables were only set at startup and on CONNECT, not refreshed when `USE` switched the active database. Now set in `set_static_system_vars()` so they update on any connection change.                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| `DT_Text.data_type_name` wrong                      | Was `"character"` (same as `DT_Character`), making error messages indistinguishable. Corrected to `"text"`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| `DT_Varchar` non-string data unchecked              | `_from_data()` only enforced the 255-char limit for `str` inputs; non-string values passed through without conversion or length check.                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| `WriteHooks.write_err()` crash on empty string      | `strval[-1]` raised `IndexError` on empty input. Fixed to use `str.endswith()`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| `NumericParser` division by zero                    | `NumericAstNode.eval()` raised unhandled `ZeroDivisionError`. Now raises `NumericParserError` with a clear message.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| `CondAstNode.eval()` could return `None`            | Missing fallthrough for unknown node types silently returned `None`. Now raises `CondParserError`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| `DT_Timestamp` claims time-only values              | `dateutil.parser.parse()` silently fills in today's date for bare time strings like `"13:15:45"`, so `DT_Timestamp` matched before `DT_Time` in the inference order. `parse_datetime()` now rejects time-only strings.                                                                                                                                                                                                                                                                                                                                                                                         |
+| `CounterVars.substitute` skipped pos 0–1            | `re.I` was passed as the positional `pos` argument, skipping the first 2 characters of every string during counter variable expansion. Counter variables at the very start of a line were never matched.                                                                                                                                                                                                                                                                                                                                                                                                       |
+| `exec_cmd` (SQLite/DuckDB) always raised TypeError  | Passed bytes to `curs.execute()` via `.encode()`, which Python 3 `sqlite3`/`duckdb` reject. `EXECUTE PROCEDURE` metacommand was non-functional on these backends.                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| MySQL `LOAD DATA INFILE` injection                  | File path, delimiter, and quotechar were interpolated without escaping. Now single-quotes are escaped consistent with the PostgreSQL COPY path.                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| Missing server/database name at connect             | Connecting to a server-based database without a server or database name now stops with a clear fatal error ("Configured database requires a server name, but none is provided.") instead of crashing inside the driver with a `TypeError`.                                                                                                                                                                                                                                                                                                                                                                     |
+| Config file chain infinite loop                     | The `config_file` directive could chain config files without limit. A circular reference (via symlinks or different relative paths) caused an infinite loop at startup. Now capped at 20 files.                                                                                                                                                                                                                                                                                                                                                                                                                |
+| Cursor leaks in database adapters                   | ~15 methods across all adapters used `curs = self.cursor()` / `curs.close()` without `try/finally`. If the query raised, the cursor leaked. Converted to `with self._cursor() as curs:`.                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| JSON export malformed on special column names       | Column names containing `"` or `\` produced invalid JSON. Now uses `json.dumps()` for all field names.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| Temp file creation TOCTOU race                      | `TempFileMgr.new_temp_fn()` discarded the `NamedTemporaryFile` handle, creating a race window. Now uses `tempfile.mkstemp()` for secure creation.                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| `shlex.split` on Windows incorrect mode             | Called without `posix=False` on Windows, mishandling backslash-heavy paths in SHELL commands.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| AST executor `~`/`+` variable scoping broken        | The AST executor passed `localvars` through function parameters but never pushed `CommandList` frames onto `commandliststack`. Legacy metacommand handlers (`x_sub`, `x_rm_sub`, `xf_sub_defined`, `SUB_LOCAL`, prompt handlers, REPL) access `commandliststack[-1]` for `~` local and `+` outer-scope variables. This caused `~` vars to be invisible to SQL, `SUB_DEFINED(~var)` to always return false, and the REPL `.vars`/`.stack` to show empty state. Fixed by pushing/popping `CommandList` frames in `execute()` and `_execute_script_native()`.                                                     |
+| Firebird adapter import                             | Adapter imported `fdb` (the unmaintained legacy driver) while the `[firebird]` extra declared `firebird-driver`. `pip install execsql2[firebird]` followed by a Firebird connect raised `ModuleNotFoundError: No module named 'fdb'`. Adapter now imports `firebird.driver`, matching the declared dependency.                                                                                                                                                                                                                                                                                                 |
+| Connect timeouts on network adapters                | MySQL, SQL Server / Access / DSN (pyodbc), Firebird, and SMTP all now apply a 30 s connect timeout matching the existing PostgreSQL default. A silently-dropped network peer (firewall rule, dead VM) used to hang scripts indefinitely; now the connect fails fast.                                                                                                                                                                                                                                                                                                                                           |
+| AST parser INCLUDE quoted paths broken              | The AST parser captured the full INCLUDE target including surrounding quotes (`"path"`), but the legacy dispatch regex stripped them. Quoted INCLUDE paths failed with "File does not exist" even when the file was present. Fixed by stripping matched quote pairs in the parser.                                                                                                                                                                                                                                                                                                                             |
+| AST parser `BEGIN SCRIPT name(params)` rejected     | The regex required whitespace between the script name and parameter list. `BEGIN SCRIPT foo(a,b)` (no space before `(`) silently failed to match, causing the matching `END SCRIPT` to raise "Unmatched END SCRIPT metacommand." Fixed by allowing optional whitespace before the parameter expression.                                                                                                                                                                                                                                                                                                        |
+| AST executor forward SCRIPT references broken       | The legacy engine registered all `BEGIN SCRIPT` blocks at parse time (two-pass), so `EXECUTE SCRIPT foo` could appear before the `BEGIN SCRIPT foo` definition. The AST executor walked the tree in a single pass, so forward references failed with "There is no SCRIPT named foo." Fixed by adding a pre-registration scan of all SCRIPT blocks before execution begins.                                                                                                                                                                                                                                     |
+| DB-export type inference overrides source types     | `DataTable`/`Column` inferred column types from the *string shape* of values — correct for CSV import (everything is `str`) but wrong for DB-query exports where the driver returns typed Python objects. A text column with values like `"2026-06-30 10:07:20 PM"` was inferred as `TIMESTAMP`, causing DuckDB bind errors. SQLite, DuckDB, HDF5, and JSON-schema exports now pass `infer_strings=False` to `DataTable`: string values are classified as text types only, while native Python objects (`Decimal`, `datetime`, etc.) still run through the full accumulator set for accurate schema inference. |
+| `EXPORT FORMAT SQLITE` rejects `decimal.Decimal`    | SQLite's Python adapter does not accept `Decimal` in `executemany`, raising `ProgrammingError`. SQLite exports now convert `Decimal` values to their exact string representation before binding; SQLite's NUMERIC affinity stores them without loss of precision.                                                                                                                                                                                                                                                                                                                                              |
+| Unsupported Python objects crash native exports     | `EXPORT FORMAT SQLITE` and `EXPORT FORMAT DUCKDB` raised bind errors when the DB driver returned user-defined Python objects (e.g. PostGIS geometry). Both exporters now stringify any object whose type is not in the adapter's safe-binding set, preserving values as their `str()` form instead of crashing.                                                                                                                                                                                                                                                                                                |
 
 ______________________________________________________________________
 

{execsql2-2.21.2 → execsql2-2.22.0}/docs/dev/architecture.md

@@ -6,7 +6,7 @@ ______________________________________________________________________
 
 ## Execution Flow
 
-When a user runs `execsql2 script.sql mydb.sqlite -t l`, the following sequence occurs:
+When a user runs `execsql script.sql mydb.sqlite -t l`, the following sequence occurs:
 
 ```mermaid
 flowchart TD

{execsql2-2.21.2 → execsql2-2.22.0}/docs/getting-started/installation.md

@@ -14,7 +14,8 @@ Or with [uv](https://docs.astral.sh/uv/):
 uv add execsql2
 ```
 
-This installs the `execsql2` command-line tool.
+This installs the `execsql` and `execsql-format` command-line tools. The PyPI distribution is named
+`execsql2`; the executable remains `execsql` for compatibility.
 
 To install with optional dependencies:
 

{execsql2-2.21.2 → execsql2-2.22.0}/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.2
+    rev: v2.22.0
     hooks:
       - id: execsql-format
 ```

{execsql2-2.21.2 → execsql2-2.22.0}/docs/guides/sql_syntax.md

@@ -12,7 +12,7 @@ When adding a very large amount of data with the [IMPORT](../reference/metacomma
 
 ## Implicit DROP TABLE Statements
 
-The "REPLACEMENT" keyword for the [IMPORT](../reference/metacommands.md#import) and [COPY](../reference/metacommands.md#copy) metacommands allows a previously existing table to be replaced. To accomplish this, execsql issues a "DROP TABLE" statement to the database in use. PostgreSQL, SQLite, MySQL, MariaDB, Oracle, and DuckDB support a form of the "DROP TABLE" statement that automatically removes all foreign keys to the named table. execsql uses these forms of the "DROP TABLE" statement for these DBMSs, and therefore use of the "REPLACEMENT" keyword always succeeds at removing the named table before trying to create a new table with the same name. SQL Server, MS-Access, and Firebird do not have a form of the "DROP TABLE" statement that automatically removes foreign keys. Therefore, if the "REPLACEMENT" keyword is used with any of these three DBMSs, for a table that has foreign keys into it, that table will not be dropped, and an error will subsequently occur when execsql issues a "CREATE TABLE" statement to create a new table of the same name. To avoid this, when using any of these three DBMSs, you should include in the script the appropriate SQL commands to remove foreign keys (and possibly even to remove the table) before using the IMPORT or COPY metacommands.
+The "REPLACEMENT" keyword for the [IMPORT](../reference/metacommands.md#import) and [COPY](../reference/metacommands.md#copy) metacommands allows a previously existing table to be replaced. To accomplish this, execsql issues a "DROP TABLE" statement to the database in use. This is not an atomic replacement: if the drop succeeds but a later create or load step fails, the old table has already been removed. If the drop fails, execsql stops the metacommand before creating or loading the replacement table. PostgreSQL, SQLite, MySQL, MariaDB, Oracle, and DuckDB support a form of the "DROP TABLE" statement that automatically removes all foreign keys to the named table. execsql uses these forms of the "DROP TABLE" statement for these DBMSs. SQL Server, MS-Access, and Firebird do not have a form of the "DROP TABLE" statement that automatically removes foreign keys. Therefore, if the "REPLACEMENT" keyword is used with any of these three DBMSs, for a table that has foreign keys into it, that table will not be dropped, and the IMPORT or COPY command will stop. To avoid this, when using any of these three DBMSs, you should include in the script the appropriate SQL commands to remove foreign keys (and possibly even to remove the table) before using the IMPORT or COPY metacommands.
 
 ## Boolean Data Types
 

{execsql2-2.21.2 → execsql2-2.22.0}/docs/reference/configuration.md

@@ -333,6 +333,9 @@ The section and property names that may be used in a configuration file are list
 `allow_system_cmd` { #allow_system_cmd }
 :   When set to "No", the `SYSTEM_CMD` (SHELL) metacommand is disabled. Any script that attempts to execute an OS command will fail with an error. The default is "Yes". This can also be set via the `--no-system-cmd` CLI flag or `allow_system_cmd=False` in the library API. See [Security — Disabling SYSTEM_CMD](security.md#disable_system_cmd) for details.
 
+`system_cmd_timeout` { #system_cmd_timeout }
+:   Maximum number of seconds a foreground `SYSTEM_CMD` may run before *execsql* stops it. The default is `0`, which means no timeout. When a foreground command times out, `$SYSTEM_CMD_EXIT_STATUS` is set to `124` and the metacommand fails. `SYSTEM_CMD ... CONTINUE` starts a detached background process and is not timeout-managed by this setting.
+
 `allow_rm_file` { #allow_rm_file }
 :   When set to "No", the `RM_FILE` metacommand (which deletes a file) is disabled. Any script that attempts to remove a file will fail with an error. The default is "Yes". This can also be set via the `--no-rm-file` CLI flag or `allow_rm_file=False` in the library API. Symmetric with `allow_system_cmd`.
 

{execsql2-2.21.2 → execsql2-2.22.0}/docs/reference/metacommands.md

@@ -857,8 +857,8 @@ The second (destination) table must have column names that are identical to the
 
 If the "NEW" keyword is used, the destination table will be automatically created with column names and data types that are compatible with the first (source) table. The data types used for the columns in the newly created table will be determined by a scan of all of the data in the first table, but may not exactly match those in the first table. If the destination table already exists when the "NEW" keyword is used, an error will occur.
 
-If the "REPLACEMENT" keyword is used, the destination table will also be created to be compatible with the source table, but any existing destination table of the same name will be dropped first. *execsql* uses a "drop table" statement to drop an existing destination table, and this statement may not succeed if there are dependencies on that table (see the discussion of [implicit drop table
-statements](../guides/sql_syntax.md#implicit_drop)). If the destination table is not dropped, then data from the source table will be added to the existing table, or an error will occur if the table formats are not compatible.
+If the "REPLACEMENT" keyword is used, the destination table will also be created to be compatible with the source table, but any existing destination table of the same name will be dropped first. This replacement is not atomic: if the drop succeeds but a later create or load step fails, the old destination table has already been removed. If the drop fails, *execsql* stops the COPY command before creating or loading the replacement table. *execsql* uses a "drop table" statement to drop an existing destination table, and this statement may not succeed if there are dependencies on that table (see the discussion of [implicit drop table
+statements](../guides/sql_syntax.md#implicit_drop)).
 
 If there are constraints on the second table that are not met by the data being added, an error will occur. If an error occurs at any point during the data copying process, no new data will be added to the second table.
 
@@ -1108,10 +1108,12 @@ DUCKDB
 
 :   A [DuckDB](https://duckdb.org/) file-based database. If the specified database file does not exist, it will be created. If the database file already exists and has a table of the same name as the table or view that is exported, then the existing table will be replaced unless the "APPEND" keyword is used. When "APPEND" is used and the table already exists, an error will occur. The "DESCRIPTION" keyword is ignored when this format is used. DuckDB database files cannot be created in a zipfile; if the "ZIPFILE" keyword is used, an error will occur.
 
+    When exporting a query result from a typed database (PostgreSQL, MySQL, etc.), the column schema is inferred from the Python types returned by the database driver rather than re-parsed from the string shape of values. A `TEXT` column whose values look like timestamps or numbers is exported as `VARCHAR`, not as `TIMESTAMP` or `INTEGER`. Python objects not natively bindable by DuckDB (e.g. PostGIS geometry) are stringified rather than raising a bind error.
+
 
 FEATHER
 
-:   The Feather binary file format established by the [Apache Arrow](https://arrow.apache.org/) project. The "APPEND" and "DESCRIPTION" keywords are ignored when this format is used. Exporting data in this format requires that the entire data set be first converted to a [pandas](https://pandas.pydata.org/) data frame in memory, so there is a system-specific limit to the size of the data set that can be exported in this format. The *feather* and *pandas* libraries must be installed to export data in the Feather format. Not all data types that may be present in a database can necessarily be exported to a Feather data file, so some data types, like timestamps, may have to be converted to character data before export. Data exported in feather format cannot be written into a zipfile.
+:   The Feather binary file format established by the [Apache Arrow](https://arrow.apache.org/) project. The "APPEND" and "DESCRIPTION" keywords are ignored when this format is used. Exporting data in this format uses [Polars](https://pola.rs/) and materializes the result in memory before writing, so there is a system-specific limit to the size of the data set that can be exported in this format. Install the `formats` extra, which includes `polars`, to export data in Feather format. Not all data types that may be present in a database can necessarily be exported to a Feather data file, so some data types, like timestamps, may have to be converted to character data before export. Data exported in Feather format cannot be written into a zipfile.
 
 
 HDF5
@@ -1163,6 +1165,8 @@ SQLITE
 
 :   A [SQLite](https://www.sqlite.org/index.html) file-based database. If the specified database file does not exist, it will be created. If the database file already exists and has a table of the same name as the table or view that is exported, then the existing table will be replaced unless the "APPEND" keyword is used. When "APPEND" is used and the table already exists, an error will occur. The "DESCRIPTION" keyword is ignored when this format is used. SQLite database files cannot be created in a zipfile; if the "ZIPFILE" keyword is used, an error will occur.
 
+    When exporting a query result from a typed database (PostgreSQL, MySQL, etc.), the column schema is inferred from the Python types returned by the database driver rather than re-parsed from the string shape of values. A `TEXT` column whose values look like timestamps or numbers is exported as a text column, not as `TIMESTAMP` or `INTEGER`. `decimal.Decimal` values are stored as their exact string representation (SQLite's NUMERIC affinity handles them losslessly). Python objects not natively bindable by SQLite (e.g. PostGIS geometry) are stringified rather than raising a bind error.
+
 
 
 ODS
@@ -1905,7 +1909,7 @@ The delimiter characters that will be recognized in a text file, and that can be
 
 The SKIP key phrase specifies the number of lines (or rows) at the beginning of the file (or worksheet) to discard before evaluating the remainder of the input as a data table.
 
-If the NEW keyword is used, the input will be scanned to determine the data type of each column, and a CREATE TABLE statement run to create a new table for the data. Scanning of the file to determine data formats is separate from the scanning that may be done to determine the quote and delimiter characters. If the table already exists when the NEW keyword is used, a fatal error will result and *execsql* will halt. If the REPLACEMENT keyword is used, the result is the same as if the NEW keyword were used, except that an existing table of the given name will be deleted first. *execsql* uses a "drop table" statement to drop an existing table, and the "drop table" statement may not succeed if there are dependencies on that table (see the discussion of [implicit drop table
+If the NEW keyword is used, the input will be scanned to determine the data type of each column, and a CREATE TABLE statement run to create a new table for the data. Scanning of the file to determine data formats is separate from the scanning that may be done to determine the quote and delimiter characters. If the table already exists when the NEW keyword is used, a fatal error will result and *execsql* will halt. If the REPLACEMENT keyword is used, the result is the same as if the NEW keyword were used, except that an existing table of the given name will be deleted first. This replacement is not atomic: if the drop succeeds but a later create or load step fails, the old table has already been removed. If the drop fails, *execsql* stops the IMPORT command before creating or loading the replacement table. *execsql* uses a "drop table" statement to drop an existing table, and the "drop table" statement may not succeed if there are dependencies on that table (see the discussion of [implicit drop table
 statements](../guides/sql_syntax.md#implicit_drop)). If the table to be dropped does not exist, an informational message will be written to the log.
 
 If neither the NEW or REPLACEMENT keywords are used, the table must exist, must have column names identical to those in the input data, and columns must have data types that are compatible with (though not necessarily identical to) those in the input data. If neither the NEW or REPLACEMENT keywords are used, the input data is not scanned to determine the data type of each column.
@@ -3061,7 +3065,7 @@ On non-POSIX operating systems (specifically, Windows), any backslashes in the c
 
 The command line that is run will be automatically [logged](../guides/logging.md#logging) in `execsql.log`.
 
-The exit status of the command that is invoked will be stored in the [system variable](substitution_vars.md#system_vars) \$SYSTEM_CMD_EXIT_STATUS if the CONTINUE keyword has not been used. When the CONTINUE keyword is used, the process ID of the background process is stored in \$SYSTEM_CMD_PID.
+The exit status of the command that is invoked will be stored in the [system variable](substitution_vars.md#system_vars) \$SYSTEM_CMD_EXIT_STATUS if the CONTINUE keyword has not been used. A foreground command can be bounded with the [`system_cmd_timeout`](configuration.md#system_cmd_timeout) configuration setting; when a command times out, \$SYSTEM_CMD_EXIT_STATUS is set to `124` and the metacommand fails. When the CONTINUE keyword is used, the process ID of the background process is stored in \$SYSTEM_CMD_PID, and the background process is detached rather than timeout-managed.
 
 
 ## TIMER

{execsql2-2.21.2 → execsql2-2.22.0}/docs/reference/security.md

@@ -109,9 +109,9 @@ This catches mainstream cloud, payment, observability, and VCS conventions: `AWS
 
 ## File System Access { #filesystem }
 
-execsql can read and write any file that the process user has permission to access. There is no base-directory restriction, no path allowlist, and no protection against `../` traversal sequences in output paths specified by `EXPORT`, `WRITE`, or `INCLUDE` metacommands.
+By default, execsql can read and write any file that the process user has permission to access. Configure containment roots for shared or semi-trusted environments; otherwise path arguments may resolve outside the current directory.
 
-The [`INCLUDE`](metacommands.md#include) metacommand executes a script from any accessible path with full privileges. If the included path is constructed from a variable, an attacker who controls that variable can cause execsql to execute an arbitrary script file.
+The [`INCLUDE`](metacommands.md#include) metacommand executes a script from any accessible path unless `include_root` is set. If the included path is constructed from a variable, an attacker who controls that variable can cause execsql to execute an arbitrary script file.
 
 ```sql
 -- Risky: included path derived from a variable
@@ -121,6 +121,18 @@ The [`INCLUDE`](metacommands.md#include) metacommand executes a script from any
 
 Validate any variable used to construct file paths before use in file-related metacommands.
 
+## Path containment roots { #path-containment-roots }
+
+Containment roots are opt-in. When configured, paths must resolve under the configured root; attempts to escape with `../`, absolute paths, drive letters, or UNC paths are rejected.
+
+| Setting         | Applies to                                | Default      |
+| --------------- | ----------------------------------------- | ------------ |
+| `include_root`  | `INCLUDE` and `EXECUTE SCRIPT` targets    | unrestricted |
+| `serve_root`    | `SERVE` targets                           | unrestricted |
+| `template_root` | Jinja2 and `string.Template` loader paths | unrestricted |
+
+These roots do not contain every filesystem operation. In particular, `EXPORT` and `WRITE` output paths are governed by their output-directory behavior, and remain writable anywhere the process user can write unless separately constrained by how you invoke execsql.
+
 ## Email (SMTP) { #smtp }
 
 TLS is off by default. The relevant `execsql.conf` settings are:

{execsql2-2.21.2 → execsql2-2.22.0}/justfile

@@ -24,9 +24,9 @@ update-hooks:
 
 # ── Code Quality ──────────────────────────────────────────────────────────────
 
-# Lint, spell-check, and test
+# Lint, type-check, and test
 [group('quality')]
-check: format lint test
+check: format lint typecheck test
 
 # Run linter
 [group('quality')]

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.21.2"
+version = "2.22.0"
 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.2"
+current_version = "2.22.0"
 commit = true
 tag = true
 tag_name = "v{new_version}"
@@ -236,6 +236,15 @@ exclude = [
     "_execsql/",
 ]
 
+[[tool.mypy.overrides]]
+# numpy is only reached transitively (via polars and duckdb's stubs), and
+# numpy >= 2.5 stubs use PEP 695 `type` statements that fail to parse under
+# python_version 3.10. follow_imports_for_stubs is required for the skip to
+# apply to numpy's .pyi files.
+module = ["numpy", "numpy.*"]
+follow_imports = "skip"
+follow_imports_for_stubs = true
+
 [tool.typos.default.extend-words]
 # SQL table alias used throughout upsert templates
 ot = "ot"