execsql2 2.16.3__tar.gz → 2.16.4__tar.gz

{execsql2-2.16.3 → execsql2-2.16.4}/CHANGELOG.md

@@ -13,6 +13,14 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.16.4] - 2026-04-30
+
+### Fixed
+
+- Forward references in SCRIPT blocks now work: `EXECUTE SCRIPT foo` can appear before `BEGIN SCRIPT foo` in the same file or INCLUDE'd file. The AST executor now pre-scans for all SCRIPT block definitions before execution begins, matching the legacy engine's two-pass behavior.
+
+______________________________________________________________________
+
 ## [2.16.3] - 2026-04-30
 
 ### Fixed

{execsql2-2.16.3 → execsql2-2.16.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.16.3
+Version: 2.16.4
 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

{execsql2-2.16.3 → execsql2-2.16.4}/docs/about/divergence.md

@@ -314,6 +314,7 @@ These are behavioral changes driven by security or correctness issues in the ups
 | 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()`. |
 | 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.                                                                                                                                                                                 |
 
 ______________________________________________________________________
 

{execsql2-2.16.3 → execsql2-2.16.4}/pyproject.toml

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

{execsql2-2.16.3 → execsql2-2.16.4}/src/execsql/script/executor.py

@@ -448,6 +448,33 @@ def _execute_batch(
             ctx.status.batch.end_batch()
 
 
+def _pre_register_scripts(ctx: RuntimeContext, nodes: list[Node]) -> None:
+    """Pre-scan AST nodes and register all ScriptBlock definitions.
+
+    The legacy engine used a two-pass approach — parse first (registering all
+    BEGIN SCRIPT blocks), then execute.  The AST executor walks the tree in a
+    single pass, so forward references (EXECUTE SCRIPT before BEGIN SCRIPT)
+    would fail.  This pre-scan restores compatibility by registering all script
+    blocks before execution begins.
+
+    Only scans the top level and inside IF/ELSE blocks — SCRIPT blocks inside
+    LOOPs or other SCRIPTs are not pre-registered (matching legacy behavior
+    where nested definitions weren't visible until the enclosing block ran).
+    """
+    for node in nodes:
+        if isinstance(node, ScriptBlock):
+            _register_script_block(ctx, node)
+        elif isinstance(node, IfBlock):
+            # Scripts defined inside IF branches should be registered too,
+            # since the legacy parser registered them unconditionally at
+            # parse time regardless of the IF condition.
+            _pre_register_scripts(ctx, node.body)
+            for clause in node.elseif_clauses:
+                _pre_register_scripts(ctx, clause.body)
+            if node.else_body:
+                _pre_register_scripts(ctx, node.else_body)
+
+
 def _register_script_block(ctx: RuntimeContext, node: ScriptBlock) -> None:
     """Register a named SCRIPT block.
 
@@ -799,6 +826,9 @@ def _execute_include_native(
     encoding = ctx.conf.script_encoding if ctx.conf else "utf-8"
     included_tree = parse_script(target, encoding=encoding)
 
+    # Pre-register SCRIPT blocks in the included file so forward references work.
+    _pre_register_scripts(ctx, included_tree.body)
+
     # Execute with include-chain tracking
     ctx.include_chain.append(resolved)
     try:
@@ -915,6 +945,10 @@ def execute(script: Script, *, ctx: RuntimeContext | None = None) -> None:
             except (OSError, ValueError):
                 ctx.include_chain.append(script.source)
         set_static_system_vars(ctx)
+        # Pre-register all SCRIPT blocks so forward references work.
+        # The legacy engine registered scripts at parse time (two-pass);
+        # the AST executor must do an explicit pre-scan.
+        _pre_register_scripts(ctx, script.body)
         # Push a root frame so commandliststack is never empty during AST
         # execution.  This ensures get_subvarset(), current_script_line(),
         # xf_sub_defined(), the REPL, and all other commandliststack readers

{execsql2-2.16.3 → execsql2-2.16.4}/tests/test_executor.py

@@ -353,6 +353,32 @@ class TestScriptBlocks:
         rows = _query_db(tmp_path, "SELECT x FROM t ORDER BY x")
         assert rows == [(77,), (99,)]
 
+    def test_forward_reference_script(self, tmp_path):
+        """EXECUTE SCRIPT before BEGIN SCRIPT (forward reference) works."""
+        result = _run_ast(
+            "CREATE TABLE t (x INT);\n"
+            "-- !x! EXECUTE SCRIPT make_row\n"
+            "-- !x! BEGIN SCRIPT make_row\n"
+            "INSERT INTO t VALUES (42);\n"
+            "-- !x! END SCRIPT\n",
+            tmp_path,
+        )
+        assert result.returncode == 0, result.stderr
+        assert _query_db(tmp_path, "SELECT x FROM t") == [(42,)]
+
+    def test_forward_reference_in_include(self, tmp_path):
+        """Forward reference works inside INCLUDE'd files."""
+        lib = tmp_path / "lib.sql"
+        lib.write_text(
+            "-- !x! EXECUTE SCRIPT helper\n-- !x! BEGIN SCRIPT helper\nINSERT INTO t VALUES (99);\n-- !x! END SCRIPT\n",
+        )
+        result = _run_ast(
+            "CREATE TABLE t (x INT);\n-- !x! INCLUDE lib.sql",
+            tmp_path,
+        )
+        assert result.returncode == 0, result.stderr
+        assert _query_db(tmp_path, "SELECT x FROM t") == [(99,)]
+
     def test_execute_script_if_exists_missing(self, tmp_path):
         result = _run_ast(
             "CREATE TABLE t (x INT);\nINSERT INTO t VALUES (1);\n-- !x! EXECUTE SCRIPT IF EXISTS nonexistent_proc",

{execsql2-2.16.3 → execsql2-2.16.4}/uv.lock

@@ -648,7 +648,7 @@ wheels = [
 
 [[package]]
 name = "execsql2"
-version = "2.16.3"
+version = "2.16.4"
 source = { editable = "." }
 dependencies = [
     { name = "python-dateutil" },