PyPI - execsql2 - Versions diffs - 2.18.0__py3-none-any.whl → 2.18.1__py3-none-any.whl - Mend

execsql2 2.18.0py3-none-any.whl → 2.18.1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

{execsql2-2.18.0.dist-info → execsql2-2.18.1.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.18.0
+Version: 2.18.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
@@ -228,44 +228,46 @@ execsql script.sql                          # read connection from config file
 ## 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) |
-| `--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                             |
+| 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.
@@ -393,7 +395,7 @@ execsql-format --check scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.11.0
+    rev: v2.18.0
     hooks:
       - id: execsql-format
         args: [--in-place]

{execsql2-2.18.0.dist-info → execsql2-2.18.1.dist-info}/RECORD RENAMED Viewed

@@ -10,11 +10,10 @@ execsql/plugins.py,sha256=2voLwT6eFap6BCBoZYndNNC_bMEJO1f_aP6xQTVXwYI,12815
 execsql/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 execsql/state.py,sha256=T6UoXXxAkUP-4KKQpfFAlI3WMzm2xUi3LSplJDuRLY0,21965
 execsql/types.py,sha256=5K3aTuWQZHftz5slFODwqxlcvvt6lROISUnvUtRUazs,31799
-execsql/cli/__init__.py,sha256=km5f65aRHKZ1vLHRMnbZVXo-31gImxxOr1BvOIQg7B4,23226
+execsql/cli/__init__.py,sha256=aJknKKIGxYCXpny0cyHXfqJsJ95dBtlEXXhPASFG8GQ,23114
 execsql/cli/dsn.py,sha256=svaZtrUXFRL2W5G6FRRiKtR6kehOp7urrVhIx_642Z8,2820
 execsql/cli/help.py,sha256=ThwdZuMIfLPxLAPpGWwXFY_UfyWvYOCjdlBNK20Vzd8,5718
-execsql/cli/lint.py,sha256=xoOvFcoYFJpGjpgFD9CGgPAJmoJ_FPuyecBNBCazfJo,3459
-execsql/cli/lint_ast.py,sha256=c9UEFsZ7PZlFdrK0zJCe-WXfCqvS3WlOUWEycZozqB8,14688
+execsql/cli/lint.py,sha256=YqKzFNUhyb_Th69hYgKk1ZZVjCsZfJMIiUGqp06JwNs,17236
 execsql/cli/run.py,sha256=QoSHVBfg20n2knPrqf7RFJmcfFpC5aq7NkwX5o6qRnA,36326
 execsql/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 execsql/data/execsql.conf.template,sha256=1a2g2Vga7s128wcu3ftIFRkHlKKtuvkuOHSD1XuNT7o,9404
@@ -72,20 +71,20 @@ execsql/metacommands/connect.py,sha256=W24gYGmYDXNQyzBTsqWtl9-qbX2FS0v_c4s_OHj97
 execsql/metacommands/control.py,sha256=btF9hP_jzTuTIODPK72CYF0v_oKYpwXpKLATt-Ti2kc,7988
 execsql/metacommands/data.py,sha256=u9D6F3ambIqXhEHVmFOI6RDrbmdXQ-FUiqw7aMGo5bQ,12135
 execsql/metacommands/debug.py,sha256=MeVXAob8ItEg2QzuSUkKDaQCEABnH6u0XcAwJzw36CE,13015
-execsql/metacommands/dispatch.py,sha256=DvpgpkX1yMWnJrVW8ir_o1xKgfZgXzlTt6IwP0Lwoek,87441
+execsql/metacommands/dispatch.py,sha256=t7x0xWHJA0PeCrYf7jYeSMJgf0yxcZ_xh-_YAtBPHLw,87192
 execsql/metacommands/io.py,sha256=vlGBje5sgnqeilooMdhJDgSRIhysHy5_7LrKtik9Xjs,3011
 execsql/metacommands/io_export.py,sha256=-7VDtUUQegwGRantw-NpdkI_9hwIKU-36ZvReIYC2QA,14285
 execsql/metacommands/io_fileops.py,sha256=6yED22UlVNXcRHNxZTgna8HmwFcR8s4nt6epMGLMtHY,10139
 execsql/metacommands/io_import.py,sha256=kUHIiI16WMuxXpqDMIRBc06KvI-_sYuYfJVNMTKOoAo,15706
 execsql/metacommands/io_write.py,sha256=RqOklmeGifu3lQgi_0glOoBWTY9FFIDlWIpOpb_hc3o,12789
 execsql/metacommands/prompt.py,sha256=LUl7doqKx8fLR0qt2lXbhdgNpdF1s6KZ6Ruitt10YnM,37483
-execsql/metacommands/script_ext.py,sha256=NShl29U9eI75_aL9WTSx8m4GjhCvMgJehzlES5M36cY,3693
+execsql/metacommands/script_ext.py,sha256=CsUbyq8QFPnnvfX_k7fPlYNvvRw1xLmAWER4Exo5pwc,3658
 execsql/metacommands/system.py,sha256=5ETiWbkVDGsdwTldDaMM4rwY_Smd02wCWUROtf6XH_M,7385
 execsql/metacommands/upsert.py,sha256=wzoMpM8g49pEvU9GkHZ62fPvqV3w1UIUfxVA7HAsS_o,20317
 execsql/script/__init__.py,sha256=eGJPBDWj42aaId2lX_quSrqoKrvGwGElIrGDNCyoV1Y,3547
 execsql/script/ast.py,sha256=TQ4_7Lfw1F8_k6ycdvMZdzwNafrZiljSrthVRWUsuIk,20585
 execsql/script/control.py,sha256=WqLy-HLPqHG3vEzYpKMiIJsD7LpORjyQuUWzFzcGz4w,2327
-execsql/script/engine.py,sha256=woSTkoLOKaOpVqKzpAjPa0j7hs6ZpCFm172o6zJ_J3g,21363
+execsql/script/engine.py,sha256=52RmtQJGk4KWqXpZY7jfKeiPojAoULHWaigOcm1azm4,20979
 execsql/script/executor.py,sha256=UTQ4k8EjxH5CdKYZ0E_l-0WyQ-i769mUJw6cJmMvSxI,36018
 execsql/script/parser.py,sha256=K-mgwuQ729KdmimOpEmb0OBzMyOvX3gxhBKLgr5P4VA,33697
 execsql/script/variables.py,sha256=t0BwrRuA8m1LYHGLkDPNbqW6QmudXroOFYsO0fwK2N0,16302
@@ -101,24 +100,24 @@ execsql/utils/numeric.py,sha256=xh02ANSRk3nUpQ-rtm66ILoMqoi7HtzCoRMIOT9U8QI,1570
 execsql/utils/regex.py,sha256=diEzTZqU_HHwVMadPAvN1Vgzhl7I03eVaEFGCXyGGL8,3770
 execsql/utils/strings.py,sha256=UQNjpRCEFa1UO6feU-M-9e24wWAvizs_iu_4fFusLxo,8516
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.18.0.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.18.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.18.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.18.0.data/data/execsql2_extras/execsql.conf,sha256=1a2g2Vga7s128wcu3ftIFRkHlKKtuvkuOHSD1XuNT7o,9404
-execsql2-2.18.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.18.0.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
-execsql2-2.18.0.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
-execsql2-2.18.0.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
-execsql2-2.18.0.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
-execsql2-2.18.0.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
-execsql2-2.18.0.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
-execsql2-2.18.0.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
-execsql2-2.18.0.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
-execsql2-2.18.0.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
-execsql2-2.18.0.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
-execsql2-2.18.0.dist-info/METADATA,sha256=4ww8XW7Ujq-834kd1N2PMyF8YRmlNsz6Bb5TC_c2SEw,21651
-execsql2-2.18.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.18.0.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.18.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.18.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
-execsql2-2.18.0.dist-info/RECORD,,
+execsql2-2.18.1.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.18.1.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.18.1.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
+execsql2-2.18.1.data/data/execsql2_extras/execsql.conf,sha256=1a2g2Vga7s128wcu3ftIFRkHlKKtuvkuOHSD1XuNT7o,9404
+execsql2-2.18.1.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.18.1.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
+execsql2-2.18.1.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
+execsql2-2.18.1.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
+execsql2-2.18.1.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
+execsql2-2.18.1.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
+execsql2-2.18.1.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
+execsql2-2.18.1.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
+execsql2-2.18.1.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
+execsql2-2.18.1.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
+execsql2-2.18.1.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
+execsql2-2.18.1.dist-info/METADATA,sha256=czc8snw8MBbrf19X5tlYXFe5cCcpSFQmE6_pi0ezAYk,21911
+execsql2-2.18.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+execsql2-2.18.1.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.18.1.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.18.1.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
+execsql2-2.18.1.dist-info/RECORD,,

execsql/cli/lint_ast.py DELETED Viewed

@@ -1,439 +0,0 @@
-"""AST-based static analysis (lint) for execsql scripts.
-Performs the same checks as :mod:`execsql.cli.lint` but operates on the
-:class:`~execsql.script.ast.Script` tree instead of a flat
-:class:`~execsql.script.engine.CommandList`.
-Advantages over the flat linter:
-- **No runtime state required** — works with the AST parser alone, so it
-  can run as an early exit in the CLI without initialising ``_state``.
-- **Structural validation is free** — the AST parser already rejects
-  unmatched IF/LOOP/BATCH/SCRIPT blocks at parse time with precise source
-  spans.  This linter only needs to report variable and INCLUDE issues.
-- **Script blocks are in the tree** — ``EXECUTE SCRIPT`` targets are
-  resolved by finding :class:`ScriptBlock` nodes, not by looking up
-  ``_state.savedscripts``.
-Checks performed
-----------------
-1. **Parse errors** — the AST parser rejects unmatched blocks, so any
-   parse failure is reported as an error with the parser's message.
-2. **Potentially undefined variables** — same heuristic as the flat linter.
-3. **EXECUTE SCRIPT target resolution** — warns when a target name does
-   not correspond to a :class:`ScriptBlock` in the same file.
-4. **Missing INCLUDE files** — warns when the file does not exist on disk.
-5. **Empty script** — warns when no nodes were parsed.
-"""
-from __future__ import annotations
-import re
-from pathlib import Path
-from execsql.script.ast import (
-    BatchBlock,
-    IfBlock,
-    IncludeDirective,
-    LoopBlock,
-    MetaCommandStatement,
-    Node,
-    Script,
-    ScriptBlock,
-    SqlBlock,
-    SqlStatement,
-)
-__all__ = ["lint_ast"]
-# ---------------------------------------------------------------------------
-# Variable-related patterns (shared with the flat linter)
-# ---------------------------------------------------------------------------
-_RX_SUB = re.compile(r"^\s*SUB\s+(?P<name>[+~]?\w+)\s+", re.I)
-_RX_SUB_EMPTY = re.compile(r"^\s*SUB_EMPTY\s+(?P<name>[+~]?\w+)\s*$", re.I)
-_RX_SUB_ADD = re.compile(r"^\s*SUB_ADD\s+(?P<name>[+~]?\w+)\s+", re.I)
-_RX_SUB_APPEND = re.compile(r"^\s*SUB_APPEND\s+(?P<name>[+~]?\w+)\s", re.I)
-_RX_SUBDATA = re.compile(r"^\s*SUBDATA\s+(?P<name>[+~]?\w+)\s+", re.I)
-_RX_SUB_INI = re.compile(
-    r'^\s*SUB_INI\s+(?:FILE\s+)?(?:"(?P<qfile>[^"]+)"|(?P<file>\S+))'
-    r"(?:\s+SECTION)?\s+(?P<section>\w+)\s*$",
-    re.I,
-)
-_RX_SELECTSUB = re.compile(r"^\s*(?:SELECT_?SUB|PROMPT\s+SELECT_?SUB)\s+", re.I)
-_RX_SUB_LOCAL = re.compile(r"^\s*SUB_LOCAL\s+(?P<name>\w+)\s+", re.I)
-_RX_SUB_TEMPFILE = re.compile(r"^\s*SUB_TEMPFILE\s+(?P<name>\w+)\s", re.I)
-_RX_SUB_DECRYPT = re.compile(r"^\s*SUB_DECRYPT\s+(?P<name>\w+)\s+", re.I)
-_RX_SUB_ENCRYPT = re.compile(r"^\s*SUB_ENCRYPT\s+(?P<name>\w+)\s+", re.I)
-_RX_SUB_QUERYSTRING = re.compile(r"^\s*SUB_QUERYSTRING\s+(?P<name>\w+)\s+", re.I)
-_RX_VAR_REF = re.compile(r"!!([$@&~#+]?\w+)!!", re.I)
-# ---------------------------------------------------------------------------
-# Issue tuple helpers
-# ---------------------------------------------------------------------------
-_Issue = tuple[str, str, int, str]  # (severity, source, line_no, message)
-def _error(source: str, line_no: int, message: str) -> _Issue:
-    return ("error", source, line_no, message)
-def _warning(source: str, line_no: int, message: str) -> _Issue:
-    return ("warning", source, line_no, message)
-# ---------------------------------------------------------------------------
-# Built-in variable discovery (reuse from flat linter)
-# ---------------------------------------------------------------------------
-def _discover_builtin_vars() -> frozenset[str]:
-    """Scan the execsql package source for ``$VARNAME`` system variables."""
-    import importlib.util
-    _rx_add_sub = re.compile(r'(?:(?<!\w)add_substitution|(?<!\w)sv)\s*\(\s*["\'](\$\w+)["\']')
-    _rx_lazy = re.compile(r'register_lazy\s*\(\s*["\'](\$\w+)["\']')
-    names: set[str] = set()
-    spec = importlib.util.find_spec("execsql")
-    if spec is None or spec.submodule_search_locations is None:
-        return frozenset(names)
-    pkg_dir = Path(spec.submodule_search_locations[0])
-    for src_file in pkg_dir.rglob("*.py"):
-        try:
-            text = src_file.read_text(encoding="utf-8")
-        except OSError:
-            continue
-        for m in _rx_add_sub.finditer(text):
-            names.add(m.group(1).lstrip("$").upper())
-        for m in _rx_lazy.finditer(text):
-            names.add(m.group(1).lstrip("$").upper())
-    return frozenset(names)
-_BUILTIN_VARS: frozenset[str] | None = None
-def _get_builtin_vars() -> frozenset[str]:
-    """Return the cached set of built-in variable names, discovering on first call."""
-    global _BUILTIN_VARS
-    if _BUILTIN_VARS is None:
-        _BUILTIN_VARS = _discover_builtin_vars()
-    return _BUILTIN_VARS
-# ---------------------------------------------------------------------------
-# AST walker helpers
-# ---------------------------------------------------------------------------
-def _collect_script_blocks(script: Script) -> dict[str, ScriptBlock]:
-    """Build a name → ScriptBlock lookup from all ScriptBlock nodes in the tree."""
-    blocks: dict[str, ScriptBlock] = {}
-    for node in script.walk():
-        if isinstance(node, ScriptBlock):
-            blocks[node.name] = node
-    return blocks
-def _collect_defined_vars_from_nodes(
-    nodes: list[Node],
-    script_blocks: dict[str, ScriptBlock],
-    script_dir: Path | None,
-    defined: set[str],
-    visited: set[str] | None = None,
-) -> None:
-    """Walk nodes and collect variable definitions into *defined*."""
-    if visited is None:
-        visited = set()
-    for node in nodes:
-        if isinstance(node, MetaCommandStatement):
-            _extract_var_definition(node.command, script_dir, defined)
-        elif isinstance(node, IncludeDirective) and node.is_execute_script:
-            target = node.target.lower()
-            if target in script_blocks and target not in visited:
-                visited.add(target)
-                _collect_defined_vars_from_nodes(
-                    script_blocks[target].body,
-                    script_blocks,
-                    script_dir,
-                    defined,
-                    visited,
-                )
-        # Recurse into block children
-        if isinstance(node, (IfBlock, LoopBlock, BatchBlock, ScriptBlock, SqlBlock)):
-            _collect_defined_vars_from_nodes(
-                list(node.children()),
-                script_blocks,
-                script_dir,
-                defined,
-                visited,
-            )
-def _extract_var_definition(
-    command: str,
-    script_dir: Path | None,
-    defined: set[str],
-) -> None:
-    """Extract variable name from a SUB-family metacommand into *defined*."""
-    for rx in (
-        _RX_SUB,
-        _RX_SUB_EMPTY,
-        _RX_SUB_ADD,
-        _RX_SUB_APPEND,
-        _RX_SUBDATA,
-        _RX_SUB_LOCAL,
-        _RX_SUB_TEMPFILE,
-        _RX_SUB_DECRYPT,
-        _RX_SUB_ENCRYPT,
-        _RX_SUB_QUERYSTRING,
-    ):
-        m = rx.match(command)
-        if m:
-            defined.add(m.group("name").lstrip("+~").upper())
-            return
-    # SUB_INI bulk-defines from INI file — read keys at lint time
-    ini_m = _RX_SUB_INI.match(command)
-    if ini_m:
-        ini_file = ini_m.group("qfile") or ini_m.group("file")
-        ini_section = ini_m.group("section")
-        if ini_file and not _RX_VAR_REF.search(ini_file):
-            _read_ini_vars(ini_file, ini_section, script_dir, defined)
-def _read_ini_vars(
-    ini_file: str,
-    section: str,
-    script_dir: Path | None,
-    defined_vars: set[str],
-) -> None:
-    """Read an INI file and register its section keys as defined variables."""
-    from configparser import ConfigParser
-    p = Path(ini_file)
-    if not p.is_absolute() and script_dir is not None:
-        p = script_dir / p
-    if not p.exists():
-        return
-    cp = ConfigParser()
-    cp.read(p)
-    if cp.has_section(section):
-        for key, _value in cp.items(section):
-            defined_vars.add(key.upper())
-def _check_var_ref(
-    raw_name: str,
-    source: str,
-    line_no: int,
-    defined_vars: set[str],
-    issues: list[_Issue],
-) -> None:
-    """Emit a warning if *raw_name* looks like an undefined user variable."""
-    if not raw_name:
-        return
-    sigil = raw_name[0] if raw_name[0] in ("$", "@", "&", "~", "#", "+") else ""
-    name = raw_name[len(sigil) :]
-    # Skip non-$ sigil prefixes — resolved at runtime
-    if sigil in ("@", "&", "~", "#", "+"):
-        return
-    # $ARG_N is set via -a/--assign-arg at invocation time
-    if re.match(r"^ARG_\d+$", name, re.I):
-        return
-    # $COUNTER_N is managed by CounterVars
-    if re.match(r"^COUNTER_\d+$", name, re.I):
-        return
-    # Built-in system variables
-    if name.upper() in _get_builtin_vars():
-        return
-    # User-defined via SUB
-    if name.upper() in defined_vars:
-        return
-    issues.append(
-        _warning(
-            source,
-            line_no,
-            f"Potentially undefined variable: !!{raw_name}!! "
-            "(not defined by a preceding SUB; may be set by a config file or -a arg)",
-        ),
-    )
-def _check_include_path(
-    raw_path: str,
-    script_dir: Path | None,
-    source: str,
-    line_no: int,
-    issues: list[_Issue],
-) -> None:
-    """Warn if the INCLUDE target does not exist on disk."""
-    p = Path(raw_path)
-    if not p.is_absolute() and script_dir is not None:
-        p = script_dir / p
-    if not p.exists():
-        issues.append(
-            _warning(source, line_no, f"INCLUDE target does not exist: {raw_path!r}"),
-        )
-# ---------------------------------------------------------------------------
-# Core lint walk
-# ---------------------------------------------------------------------------
-def _lint_nodes(
-    nodes: list[Node],
-    script_dir: Path | None,
-    defined_vars: set[str],
-    script_blocks: dict[str, ScriptBlock],
-    issues: list[_Issue],
-    *,
-    visited_scripts: set[str] | None = None,
-) -> None:
-    """Walk a list of AST nodes and collect lint issues."""
-    if visited_scripts is None:
-        visited_scripts = set()
-    for node in nodes:
-        src = node.span.file
-        lno = node.span.start_line
-        # -- Variable references in SQL --
-        if isinstance(node, SqlStatement):
-            for m in _RX_VAR_REF.finditer(node.text):
-                _check_var_ref(m.group(1), src, lno, defined_vars, issues)
-        # -- Metacommand checks --
-        elif isinstance(node, MetaCommandStatement):
-            for m in _RX_VAR_REF.finditer(node.command):
-                _check_var_ref(m.group(1), src, lno, defined_vars, issues)
-        # -- IncludeDirective checks --
-        elif isinstance(node, IncludeDirective):
-            if node.is_execute_script:
-                target = node.target.lower()
-                if target not in script_blocks:
-                    if not node.if_exists:
-                        issues.append(
-                            _warning(src, lno, f"EXECUTE SCRIPT target not found: '{target}'"),
-                        )
-                elif target not in visited_scripts:
-                    visited_scripts.add(target)
-                    _lint_nodes(
-                        script_blocks[target].body,
-                        script_dir,
-                        defined_vars,
-                        script_blocks,
-                        issues,
-                        visited_scripts=visited_scripts,
-                    )
-            else:
-                # INCLUDE file existence check
-                if not node.if_exists:
-                    raw_path = node.target.strip().strip("\"'")
-                    if not _RX_VAR_REF.search(raw_path):
-                        _check_include_path(raw_path, script_dir, src, lno, issues)
-        # -- Recurse into block children --
-        if isinstance(node, IfBlock):
-            _lint_nodes(node.body, script_dir, defined_vars, script_blocks, issues, visited_scripts=visited_scripts)
-            for clause in node.elseif_clauses:
-                _lint_nodes(
-                    clause.body,
-                    script_dir,
-                    defined_vars,
-                    script_blocks,
-                    issues,
-                    visited_scripts=visited_scripts,
-                )
-            _lint_nodes(
-                node.else_body,
-                script_dir,
-                defined_vars,
-                script_blocks,
-                issues,
-                visited_scripts=visited_scripts,
-            )
-        elif isinstance(node, (LoopBlock, BatchBlock, SqlBlock)):
-            _lint_nodes(node.body, script_dir, defined_vars, script_blocks, issues, visited_scripts=visited_scripts)
-        elif isinstance(node, ScriptBlock):
-            # Lint script block body (structural errors already caught by parser)
-            if node.name not in visited_scripts:
-                visited_scripts.add(node.name)
-                sub_issues: list[_Issue] = []
-                _lint_nodes(
-                    node.body,
-                    script_dir,
-                    defined_vars,
-                    script_blocks,
-                    sub_issues,
-                    visited_scripts=visited_scripts,
-                )
-                for sev, ssrc, slno, msg in sub_issues:
-                    issues.append((sev, ssrc, slno, f"[script '{node.name}'] {msg}"))
-# ---------------------------------------------------------------------------
-# Public API
-# ---------------------------------------------------------------------------
-def lint_ast(
-    script: Script,
-    script_path: str | None = None,
-) -> list[_Issue]:
-    """Perform static analysis on an AST-parsed script.
-    Args:
-        script: The parsed :class:`Script` tree.
-        script_path: Path to the source file (for resolving relative
-            INCLUDE paths).  ``None`` for inline scripts.
-    Returns:
-        List of ``(severity, source, line_no, message)`` issue tuples.
-    """
-    issues: list[_Issue] = []
-    if not script.body:
-        issues.append(_warning("<script>", 0, "Script is empty — no commands found"))
-        return issues
-    script_dir = Path(script_path).resolve().parent if script_path else None
-    script_blocks = _collect_script_blocks(script)
-    # Pass 1: collect all variable definitions
-    all_defined: set[str] = set()
-    _collect_defined_vars_from_nodes(script.body, script_blocks, script_dir, all_defined)
-    # Pass 2: lint for variable and include issues
-    _lint_nodes(
-        script.body,
-        script_dir,
-        all_defined,
-        script_blocks,
-        issues,
-    )
-    return issues