execsql2 2.22.0__py3-none-any.whl → 2.22.1__py3-none-any.whl

execsql/api.py

@@ -528,6 +528,14 @@ def run(
         except Exception as exc:
             errors.append(ScriptError(message=str(exc), source="<runtime>"))
 
+        # Non-halting errors (halt_on_error=False, METACOMMAND_ERROR_HALT OFF)
+        # are recorded in status.error_history as execution continues; a
+        # halting error never reaches the history, so there is no overlap
+        # with the exception paths above.
+        if ctx.status is not None:
+            for err_source, err_line, err_cmd, err_msg in ctx.status.error_history:
+                errors.append(ScriptError(message=err_msg, source=err_source, line=err_line, sql=err_cmd))
+
         elapsed = time.perf_counter() - t0
 
         # ------------------------------------------------------------------

execsql/cli/__init__.py

@@ -292,7 +292,7 @@ def main(
         "-a",
         "--assign-arg",
         metavar="VALUE",
-        help="Define the replacement string for a substitution variable [cyan]\\$ARG_x[/cyan].",
+        help="Define the replacement string for a substitution variable [cyan]$ARG_x[/cyan].",
     ),
     user_logfile: bool = typer.Option(
         False,

execsql/config.py

@@ -56,6 +56,9 @@ class StatObj:
         self.metacommand_error = False
         self.cancel_halt = True
         self.dialog_canceled = False
+        # Cumulative record of non-halting errors: (source, line_no, command, message).
+        # Unlike sql_error/metacommand_error, this is never reset between statements.
+        self.error_history: list[tuple[str, int | None, str, str]] = []
         # BatchLevels is defined in the main module; defer import to avoid circular deps
         from execsql.script import BatchLevels
 

execsql/script/executor.py

@@ -278,6 +278,7 @@ def _exec_sql(
             ctx.exec_log.log_status_info(f"SQL error: {e.errmsg()}")
         if status.halt_on_err:
             exit_now(1, e)
+        status.error_history.append((source, line_no, cmd, e.errmsg()))
         return
     subvars.add_substitution("$LAST_SQL", cmd)
 
@@ -334,6 +335,7 @@ def _exec_metacommand(
             ctx.exec_log.log_status_info(f"Metacommand error: {e.errmsg()}")
         if status.halt_on_metacommand_err:
             raise e
+        status.error_history.append((source, line_no, cmd, e.errmsg()))
         return None
     # No handler matched — truly unknown metacommand
     status.metacommand_error = True

execsql/utils/fileio.py

@@ -78,7 +78,9 @@ def check_dir(filename: str) -> None:
         import execsql.state as _state
 
         conf = _state.conf
-        if conf.make_export_dirs:
+        # conf is None when called via the library API (e.g. a db factory
+        # function) before run() has initialized global state.
+        if conf is not None and conf.make_export_dirs:
             make_export_dirs(filename)
         else:
             dn = str(Path(filename).parent)

{execsql2-2.22.0.dist-info → execsql2-2.22.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.22.0
+Version: 2.22.1
 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
@@ -130,10 +130,7 @@ Requires-Dist: pg-upsert>=1.23.0; extra == 'upsert'
 Description-Content-Type: text/markdown
 
 > [!NOTE]
-> **This is a maintained fork of [execsql](https://execsql.readthedocs.io/).**
-> The original monolith has been fully refactored into a modular package.
-> The CLI and configuration are backwards-compatible with upstream v1.130.1.
-> Report issues at [github.com/geocoug/execsql/issues](https://github.com/geocoug/execsql/issues).
+> ***execsql2* is a maintained fork of [execsql](https://execsql.readthedocs.io/)**, originally authored by R.Dreas Nielsen and no longer actively maintained upstream. The monolith has been fully refactored into a modular package; the CLI and configuration remain backwards-compatible with upstream v1.130.1. Maintained by [Caleb Grant](https://github.com/geocoug) and distributed on PyPI as [`execsql2`](https://pypi.org/project/execsql2/). Report issues at [github.com/geocoug/execsql/issues](https://github.com/geocoug/execsql/issues).
 
 <div align="center">
 
@@ -155,48 +152,59 @@ Description-Content-Type: text/markdown
 
 </div>
 
-# Fork
+## Overview
 
-*execsql2* is a maintained fork of [execsql](https://execsql.readthedocs.io/) originally authored by R.Dreas Nielsen. The upstream project is no longer actively maintained. This fork is maintained by [Caleb Grant](https://github.com/geocoug) and is distributed on PyPI as `execsql2`. Complete documentation is at [execsql2.readthedocs.io](https://execsql2.readthedocs.io/).
+*execsql* runs SQL scripts against PostgreSQL, MySQL/MariaDB, SQLite, DuckDB, MS-SQL-Server, MS-Access, Firebird, Oracle, or an ODBC DSN. In addition to standard SQL, it supports a set of metacommands (embedded in SQL comments) for importing and exporting data, copying data between databases, conditional execution, looping, substitution variables, and interactive prompts. Because metacommands live in SQL comments, scripts remain valid SQL and are ignored by other tools such as `psql` or `sqlcmd`.
 
-# Overview
+## Example
 
-*execsql* runs SQL scripts against PostgreSQL, MySQL/MariaDB, SQLite, DuckDB, MS-SQL-Server, MS-Access, Firebird, Oracle, or an ODBC DSN. In addition to standard SQL, it supports a set of metacommands (embedded in SQL comments) for importing and exporting data, copying data between databases, conditional execution, looping, substitution variables, and interactive prompts. Because metacommands live in SQL comments, scripts remain valid SQL and are ignored by other tools such as `psql` or `sqlcmd`.
+Lines prefixed with `-- !x!` are metacommands; identifiers wrapped in `!!` are substitution variables:
 
-# Installation
+```sql
+-- ==== Configuration ====
+-- Put the (date-tagged) logfile name in the 'inputfile' substitution variable.
+-- !x! SUB inputfile logs/errors_!!$date_tag!!
+-- Ensure that the export directory will be created if necessary.
+-- !x! CONFIG MAKE_EXPORT_DIRS Yes
 
-```bash
-pip install execsql2
+-- ==== Display Fatal Errors ====
+-- !x! IF(file_exists(!!inputfile!!))
+    -- Import the data to a staging table.
+    -- !x! IMPORT TO REPLACEMENT staging.errorlog FROM !!inputfile!!
+    -- Create a view to display only fatal errors.
+    create temporary view fatals as
+        select user, run_time, process
+        from   staging.errorlog
+        where  severity = 'FATAL';
+    -- !x! IF(HASROWS(fatals))
+        -- Export the fatal errors to a dated report.
+        -- !x! EXPORT fatals TO reports/error_report_!!$date_tag!! AS CSV
+        -- Also display it to the user in a GUI.
+        -- !x! PROMPT MESSAGE "Fatal errors in !!inputfile!!:" DISPLAY fatals
+    -- !x! ELSE
+        -- !x! WRITE "There are no fatal errors."
+    -- !x! ENDIF
+-- !x! ELSE
+    -- !x! WRITE "There is no error log."
+-- !x! ENDIF
+drop table if exists staging.errorlog cascade;
 ```
 
-Optional extras install database drivers and feature bundles:
+The `PROMPT` metacommand produces a GUI display of the data:
+
+![PROMPT display of 'fatals' view](https://execsql2.readthedocs.io/en/latest/images/fatals.png)
+
+## Installation
 
 ```bash
-# Database drivers
-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
-pip install execsql2[firebird]    # Firebird (firebird-driver)
-pip install execsql2[oracle]      # Oracle (oracledb)
-pip install execsql2[odbc]        # ODBC DSN (pyodbc)
-
-# Feature bundles
-pip install execsql2[formats]         # ODS, Excel, Jinja2, Feather, Parquet, HDF5
-pip install execsql2[upsert]          # pg-upsert for PostgreSQL upsert operations
-pip install execsql2[auth]            # OS keyring integration
-pip install execsql2[auth-plaintext]  # Keyring + plaintext file backend (headless Linux)
-pip install execsql2[auth-encrypted]  # Keyring + encrypted file backend (headless Linux)
-pip install execsql2[map]             # tkintermapview for PROMPT MAP
-
-# Convenience
-pip install execsql2[all-db]     # All database drivers
-pip install execsql2[all]        # Everything
+pip install execsql2                # core — SQLite works with no extras
+pip install "execsql2[postgres]"    # add a driver: postgres, mysql, mssql, duckdb, firebird, oracle, odbc
+pip install "execsql2[all]"         # everything: all drivers plus all feature extras
 ```
 
-SQLite connections use Python's standard library and require no additional packages.
+Feature extras cover spreadsheet and Parquet/Feather formats, keyring authentication, PostgreSQL upsert, and more — see the [installation guide](https://execsql2.readthedocs.io/en/latest/getting-started/installation/) for the full list.
 
-# Usage
+## Usage
 
 ```text
 execsql [OPTIONS] SQL_SCRIPT [SERVER DATABASE | DATABASE_FILE]
@@ -214,7 +222,7 @@ execsql -to script.sql myserver myservice   # Oracle
 execsql script.sql                          # read connection from config file
 ```
 
-## Supported Databases
+### Supported Databases
 
 | Flag | Database        |
 | ---- | --------------- |
@@ -228,67 +236,53 @@ execsql script.sql                          # read connection from config file
 | `o`  | Oracle          |
 | `d`  | ODBC DSN        |
 
-## Options
-
-| Flag                                  | Description                                                        |
-| ------------------------------------- | ------------------------------------------------------------------ |
-| `-t {p,m,s,l,k,a,f,o,d}`              | Database type                                                      |
-| `-u USER`                             | Database username                                                  |
-| `-p PORT`                             | Server port                                                        |
-| `-a VALUE`                            | Set substitution variable `$ARG_x`                                 |
-| `-b` / `--boolean-int`                | Treat integers 0 and 1 as boolean values                           |
-| `-c SCRIPT`                           | Execute inline SQL or metacommand string                           |
-| `-d`                                  | Auto-create export directories                                     |
-| `-e ENCODING` / `--database-encoding` | Character encoding used in the database                            |
-| `-f ENCODING`                         | Script file encoding (default: UTF-8)                              |
-| `-g ENCODING` / `--output-encoding`   | Encoding for WRITE and EXPORT output                               |
-| `-i ENCODING` / `--import-encoding`   | Encoding for data files used with IMPORT                           |
-| `-l`                                  | Write run log to `~/execsql.log`                                   |
-| `-m`                                  | List metacommands and exit                                         |
-| `-n`                                  | Create a new SQLite or PostgreSQL database if it does not exist    |
-| `-o` / `--online-help`                | Open the online documentation in the default browser               |
-| `-s N` / `--scan-lines`               | Lines to scan for IMPORT format detection (0 = scan entire file)   |
-| `-v {0,1,2,3}`                        | GUI level (0=none, 1=password, 2=selection, 3=full)                |
-| `-w`                                  | Skip password prompt when a username is supplied                   |
-| `-y` / `--encodings`                  | List available encoding names and exit                             |
-| `-z KB` / `--import-buffer`           | Import buffer size in KB (default: 32)                             |
-| `--dsn URL`                           | Connection string (e.g. `postgresql://user:pass@host/db`)          |
-| `--output-dir DIR`                    | Default base directory for EXPORT output files                     |
-| `--dry-run`                           | Parse the script and report commands without executing             |
-| `--lint`                              | Static analysis: check structure and warn on issues (no DB)        |
-| `--parse-tree`                        | Print the script's AST structure and exit (no DB)                  |
-| `--list-plugins`                      | List discovered plugins and exit                                   |
-| `--ping`                              | Test database connectivity and exit                                |
-| `--profile`                           | Show per-statement timing summary after execution                  |
-| `--profile-limit N`                   | Top N statements to display in `--profile` summary (default: 20)   |
-| `--progress`                          | Show a progress bar for long-running IMPORT operations             |
-| `--config FILE`                       | Load an explicit config file (highest priority after CLI args)     |
-| `--no-system-cmd`                     | Disable the `SYSTEM_CMD` metacommand (safer for CI / shared envs)  |
-| `--no-rm-file`                        | Disable the `RM_FILE` metacommand (no script-driven file deletion) |
-| `--no-serve`                          | Disable the `SERVE` metacommand (no script-driven file streaming)  |
-| `--init-config`                       | Print a default `execsql.conf` template to stdout and exit         |
-| `--debug`                             | Start in step-through debug mode (REPL pauses before each stmt)    |
-| `--dump-keywords`                     | Print metacommand keywords as JSON and exit                        |
-| `--gui-framework {tkinter,textual}`   | GUI framework for interactive prompts                              |
-
-Run `execsql --help` for the full option list, or `execsql -m` to list all metacommands.
-
-# Features
+### Common options
+
+| Flag                                              | Description                                                     |
+| ------------------------------------------------- | --------------------------------------------------------------- |
+| `-t {p,m,s,l,k,a,f,o,d}`                          | Database type                                                   |
+| `-u USER`                                         | Database username                                               |
+| `-p PORT`                                         | Server port                                                     |
+| `--dsn URL`                                       | Connection string (e.g. `postgresql://user:pass@host/db`)       |
+| `-n`                                              | Create a new SQLite or PostgreSQL database if it does not exist |
+| `-c SCRIPT`                                       | Execute inline SQL or metacommand string                        |
+| `-a VALUE`                                        | Set substitution variable `$ARG_x`                              |
+| `-v {0,1,2,3}`                                    | GUI level (0=none, 1=password, 2=selection, 3=full)             |
+| `--config FILE`                                   | Load an explicit config file                                    |
+| `--dry-run`                                       | Parse the script and report commands without executing          |
+| `--lint`                                          | Static analysis: check structure and warn on issues (no DB)     |
+| `--ping`                                          | Test database connectivity and exit                             |
+| `--debug`                                         | Start in step-through debug mode (REPL pauses before each stmt) |
+| `--no-system-cmd` / `--no-rm-file` / `--no-serve` | Disable the `SYSTEM_CMD` / `RM_FILE` / `SERVE` metacommands     |
+
+See the [full options reference](https://execsql2.readthedocs.io/en/latest/getting-started/syntax/#options) or run `execsql --help` for the complete list, and `execsql -m` for all metacommands.
+
+## Features
+
+**Data movement**
 
 - Import data from CSV, TSV, JSON, Excel, OpenDocument, Feather, or Parquet files into a database table.
 - Export query results in 20+ formats including CSV, TSV, JSON, YAML, XML, HTML, Markdown, LaTeX, XLSX, OpenDocument, Feather, Parquet, HDF5, DuckDB, SQLite, plain text, and Jinja2 templates.
 - Copy data between databases, including across different DBMS types.
+
+**Script logic**
+
 - Conditionally execute SQL and metacommands using `IF`/`ELSE`/`ENDIF` based on data values, DBMS type, or user input.
-- Validate data with `ASSERT` — halt the script with a clear error message if a condition is false (ideal for CI pipelines).
-- Loop over blocks of SQL and metacommands using `LOOP`/`ENDLOOP`.
+- Loop over blocks of SQL and metacommands using `LOOP`/`ENDLOOP`; include or chain scripts with `INCLUDE` and `SCRIPT`.
 - Use substitution variables (`SUB`, `$ARG_x`, built-in variables like `$date_tag`) to parameterize scripts.
-- Include or chain scripts with `INCLUDE` and `SCRIPT`.
+- Validate data with `ASSERT` — halt the script with a clear error message if a condition is false (ideal for CI pipelines).
+
+**Interaction & observability**
+
 - Display query results in a GUI dialog; optionally prompt the user to select a row, enter a value, or submit a form.
 - Write status messages or tabular output to the console or a file during execution.
 - Automatically log each run, recording databases used, scripts executed, and user responses.
+
+**Extensibility**
+
 - Extend with custom metacommands, exporters, and importers via the plugin system.
 
-# Library API
+## Library API
 
 execsql can be used as a Python library for programmatic script execution:
 
@@ -331,56 +325,43 @@ if not result.success:
 result.raise_on_error()  # raises ExecSqlError
 ```
 
-Use a pre-existing database connection instead of a DSN:
+Use a pre-existing database connection instead of a DSN — useful for reusing one connection across multiple `run()` calls, or when connection parameters come from your application's configuration rather than a URL:
 
 ```python
-from execsql.db.factory import db_SQLite
-conn = db_SQLite("my.db", new_db=True)
-result = run(sql="SELECT 1;", connection=conn)
-# run() does NOT close this connection — you manage its lifecycle
-```
-
-Each call to `run()` uses an isolated `RuntimeContext`, so multiple calls do not share state.
-
-# An Illustration
+from execsql import run
+from execsql.db.factory import db_Postgres, db_SQLite
+
+# PostgreSQL connection object (psycopg3 under the hood)
+conn = db_Postgres(
+    "db.example.com",              # server
+    "warehouse",                   # database
+    user="etl",
+    port=5432,                     # optional, default 5432
+    password="s3cret",             # omit to use keyring / interactive prompt
+)
 
-The following script demonstrates metacommands and substitution variables. Lines prefixed with `-- !x!` are metacommands; identifiers wrapped in `!!` are substitution variables.
+# Reuse the same connection across multiple calls
+staged = run(script="stage.sql", connection=conn)
+loaded = run(
+    script="load.sql",
+    connection=conn,
+    variables={"RUN_DATE": "2026-07-03"},
+)
 
-```sql
--- ==== Configuration ====
--- Put the (date-tagged) logfile name in the 'inputfile' substitution variable.
--- !x! SUB inputfile logs/errors_!!$date_tag!!
--- Ensure that the export directory will be created if necessary.
--- !x! CONFIG MAKE_EXPORT_DIRS Yes
+# run() does NOT close the connection — you manage its lifecycle
+conn.close()
 
--- ==== Display Fatal Errors ====
--- !x! IF(file_exists(!!inputfile!!))
-    -- Import the data to a staging table.
-    -- !x! IMPORT TO REPLACEMENT staging.errorlog FROM !!inputfile!!
-    -- Create a view to display only fatal errors.
-    create temporary view fatals as
-        select user, run_time, process
-        from   staging.errorlog
-        where  severity = 'FATAL';
-    -- !x! IF(HASROWS(fatals))
-        -- Export the fatal errors to a dated report.
-        -- !x! EXPORT fatals TO reports/error_report_!!$date_tag!! AS CSV
-        -- Also display it to the user in a GUI.
-        -- !x! PROMPT MESSAGE "Fatal errors in !!inputfile!!:" DISPLAY fatals
-    -- !x! ELSE
-        -- !x! WRITE "There are no fatal errors."
-    -- !x! ENDIF
--- !x! ELSE
-    -- !x! WRITE "There is no error log."
--- !x! ENDIF
-drop table if exists staging.errorlog cascade;
+# SQLite works the same way
+conn = db_SQLite("my.db", new_db=True)
+result = run(sql="SELECT 1;", connection=conn)
+conn.close()
 ```
 
-The `PROMPT` metacommand produces a GUI display of the data:
+Factory functions exist for every supported backend (`db_Postgres`, `db_MySQL`, `db_SQLite`, `db_DuckDB`, `db_SqlServer`, `db_Oracle`, `db_Firebird`, `db_Access`, `db_Dsn`) — see [`execsql.db.factory`](https://execsql2.readthedocs.io/en/latest/api/db/).
 
-![PROMPT display of 'fatals' view](https://execsql2.readthedocs.io/en/latest/images/fatals.png)
+Each call to `run()` uses an isolated `RuntimeContext`, so multiple calls do not share state.
 
-# Formatting Scripts
+## Formatting Scripts
 
 The `execsql-format` command normalizes execsql script files: it uppercases metacommand keywords, corrects block indentation, and optionally reformats SQL via `sqlglot`. The metacommand / indent / keyword reformatting is built into `execsql2`; SQL reformatting requires the `[formatter]` extra (or pass `--no-sql` to skip it):
 
@@ -403,14 +384,14 @@ execsql-format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.22.0
+    rev: v2.22.1
     hooks:
       - id: execsql-format
 ```
 
 The hook rewrites `*.sql` files in place by default. See the [formatter documentation](https://execsql2.readthedocs.io/en/latest/guides/formatter/) for `--check`, `--indent`, and other options.
 
-# VS Code Syntax Highlighting
+## VS Code Syntax Highlighting
 
 A VS Code extension for execsql syntax highlighting is included in [`extras/vscode-execsql`](extras/vscode-execsql). It injects a TextMate grammar into `.sql` files, adding highlighting for `-- !x!` metacommand markers, keywords (control flow, block, action, directive), variable substitutions (`!!var!!`, `!{var}!`), built-in functions, export formats, and config options — all layered on top of standard SQL highlighting.
 
@@ -422,7 +403,7 @@ ln -s /path/to/execsql/extras/vscode-execsql ~/.vscode/extensions/execsql-syntax
 
 See the [extension README](extras/vscode-execsql/README.md) for Windows instructions, color customization, and troubleshooting.
 
-# Templates
+## Templates
 
 The `templates/` directory in this repository includes ready-to-use execsql scripts:
 
@@ -432,13 +413,14 @@ The `templates/` directory in this repository includes ready-to-use execsql scri
 - **`script_template.sql`**: A framework for new scripts with sections for configuration, logging, and error reporting.
 - **`execsql.conf`**: An annotated configuration file covering all available settings.
 
-# Documentation
+## Documentation
 
 Full documentation, including a complete metacommand reference and 30+ examples, is at [execsql2.readthedocs.io](https://execsql2.readthedocs.io/).
 
-# Copyright and License
+## Copyright and License
 
 Copyright (c) 2007-2025 R.Dreas Nielsen
+
 Copyright (c) 2026-present Caleb Grant
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the [GNU General Public License](http://www.gnu.org/licenses/) for more details.

{execsql2-2.22.0.dist-info → execsql2-2.22.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 execsql/__init__.py,sha256=ZeVnpEWu8M2bn3qLmVM72NhWRueUGNbsX8UAPTermo0,901
 execsql/__main__.py,sha256=HdbK-SAhyUmfB6xINY5AzxdMSxGzWSGEG_2dv42Jn64,315
-execsql/api.py,sha256=v_M46MkVcuGPkIG6xp5VD4XNfwMg7HG45OKxdAwrAEs,21732
-execsql/config.py,sha256=gxv7SDjiVrpR05rU_rSjCBd_PP3RmwsyhOyPWOqfAGQ,34123
+execsql/api.py,sha256=EOtBwMnm-8fmB_KmvxyjglR6C7CjdYhCPBisJ9CFfJg,22227
+execsql/config.py,sha256=txKziUJLV7UPonj2sGFgkmlinDdSV50aHmR_cuCbEIo,34369
 execsql/exceptions.py,sha256=GlphAiR8iZu4UR4U50WgSqEUMd9_8AeQJ_hhPcJOeQU,9381
 execsql/format.py,sha256=ON8Jy5BSen4UI4SGY5cHKRwsvR0ZoLhH0BdblMwydYE,33670
 execsql/models.py,sha256=-DWTVrPNwM-n1h3e3rXMoBv9-wpWVdZahyy4RB7fRRE,15502
@@ -11,7 +11,7 @@ execsql/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 execsql/state.py,sha256=T6UoXXxAkUP-4KKQpfFAlI3WMzm2xUi3LSplJDuRLY0,21965
 execsql/state.pyi,sha256=ES5xdoId-ALCGnLIQvQIGBZljZRB6aOOEMRLKXjO9hA,3770
 execsql/types.py,sha256=eKMF2kb5LHrEwKsiFpy6z_fEH05yC0Cpsg98Ea4SpVA,32231
-execsql/cli/__init__.py,sha256=aJknKKIGxYCXpny0cyHXfqJsJ95dBtlEXXhPASFG8GQ,23114
+execsql/cli/__init__.py,sha256=WPwEIELz-9XFG3Dpf-037eeYBdjtZStxWkT1bc3tMek,23112
 execsql/cli/dsn.py,sha256=svaZtrUXFRL2W5G6FRRiKtR6kehOp7urrVhIx_642Z8,2820
 execsql/cli/help.py,sha256=ThwdZuMIfLPxLAPpGWwXFY_UfyWvYOCjdlBNK20Vzd8,5718
 execsql/cli/lint.py,sha256=YqKzFNUhyb_Th69hYgKk1ZZVjCsZfJMIiUGqp06JwNs,17236
@@ -86,7 +86,7 @@ execsql/script/__init__.py,sha256=eGJPBDWj42aaId2lX_quSrqoKrvGwGElIrGDNCyoV1Y,35
 execsql/script/ast.py,sha256=TQ4_7Lfw1F8_k6ycdvMZdzwNafrZiljSrthVRWUsuIk,20585
 execsql/script/control.py,sha256=WqLy-HLPqHG3vEzYpKMiIJsD7LpORjyQuUWzFzcGz4w,2327
 execsql/script/engine.py,sha256=KbSB5aXkuDlazh3rRP4vRym_bVTDKmChLQ_OFf3-N8Q,21016
-execsql/script/executor.py,sha256=64dYw8QuNcHgvnJX1PwTK01UvDgOOYcI1IKceBL4PO4,36948
+execsql/script/executor.py,sha256=NEIro9TIIcOvugoqdtk2xs08DQnrzkeQIo1CUwaTbIY,37092
 execsql/script/parser.py,sha256=VhFTJK8kODNRWgIDc3LjYjA3_SMPFATkpjVl82dYnrM,35179
 execsql/script/variables.py,sha256=_hklqCeqPbdOT646Yg3ZcpmPke38_8bukMG3eZMTKZw,16384
 execsql/utils/__init__.py,sha256=0uR6JwVJQRX3vceByNBduCAf5dd5assKjeqJUWvpZoA,278
@@ -94,30 +94,30 @@ execsql/utils/auth.py,sha256=8Wixkx5nayEBG7RT4WTUQpCiElIKS3yOTV_6_-hHTRs,8889
 execsql/utils/crypto.py,sha256=KlT6lPk-v0-qQQfAMfWvT9Q6kRdCD3_5JVaLajNocKM,3051
 execsql/utils/datetime.py,sha256=8BrD24KWeMoouJZiFaXK4HF7plc-O_xrzIw12qOEyp8,3629
 execsql/utils/errors.py,sha256=bDWooUmGdN8xqUt6csq466wPqKPLHHSi7U4hsmrFZxA,8577
-execsql/utils/fileio.py,sha256=q1d1121GRilGSIpEF7Srgft7oF_latVUEghNdkAZbsw,33171
+execsql/utils/fileio.py,sha256=_15UIdcRZxZn2R6YP4xQn-6C9CVK2yxj1oEfxULo2_c,33329
 execsql/utils/gui.py,sha256=T22ThhkedzQz9kBidxZwIArt1umIvrgrSUwsPWAwvug,23548
 execsql/utils/mail.py,sha256=SXpTBDx0WIPl2NSjkjmnoChHYVEMyZhIKU4QiJFFZNY,6011
 execsql/utils/numeric.py,sha256=_7bi5R6pHjMCkOPne_Sh5nUj-B8e9g6WFmjptFHaunA,1573
 execsql/utils/regex.py,sha256=B3mSBhRRx_DpUnX_t9IoYd05KvWAebiLMCZqQAmEwcw,3885
 execsql/utils/strings.py,sha256=UQNjpRCEFa1UO6feU-M-9e24wWAvizs_iu_4fFusLxo,8516
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.22.0.data/data/execsql2_extras/README.md,sha256=vX4NTL095dUoA_hesyRMGYBorEZ_Y_tJ9qrd-MVV09I,5032
-execsql2-2.22.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.22.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
-execsql2-2.22.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.22.0.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
-execsql2-2.22.0.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
-execsql2-2.22.0.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
-execsql2-2.22.0.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
-execsql2-2.22.0.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
-execsql2-2.22.0.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
-execsql2-2.22.0.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
-execsql2-2.22.0.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
-execsql2-2.22.0.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
-execsql2-2.22.0.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
-execsql2-2.22.0.dist-info/METADATA,sha256=aYtTGfrjV6YMqEipLcyiyWymmhwBnx1rF6DGcY87AB8,22623
-execsql2-2.22.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-execsql2-2.22.0.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.22.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.22.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
-execsql2-2.22.0.dist-info/RECORD,,
+execsql2-2.22.1.data/data/execsql2_extras/README.md,sha256=vX4NTL095dUoA_hesyRMGYBorEZ_Y_tJ9qrd-MVV09I,5032
+execsql2-2.22.1.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.22.1.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
+execsql2-2.22.1.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.22.1.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
+execsql2-2.22.1.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
+execsql2-2.22.1.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
+execsql2-2.22.1.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
+execsql2-2.22.1.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
+execsql2-2.22.1.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
+execsql2-2.22.1.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
+execsql2-2.22.1.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
+execsql2-2.22.1.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
+execsql2-2.22.1.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
+execsql2-2.22.1.dist-info/METADATA,sha256=z76Sqoh_SVHX3ygG4-PohP8X4SJL97UlO8LpmIu2tQ8,20382
+execsql2-2.22.1.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+execsql2-2.22.1.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.22.1.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.22.1.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
+execsql2-2.22.1.dist-info/RECORD,,