execsql2 2.16.3__py3-none-any.whl → 2.16.5__py3-none-any.whl

execsql/debug/repl.py

@@ -336,7 +336,13 @@ def _print_all_vars(*, include_env: bool = False) -> None:
     if subvars is None:
         _write("  (no substitution variables defined)\n\n")
         return
-    items = subvars.substitutions  # list of (name, value) tuples
+    items = list(subvars.substitutions)  # list of (name, value) tuples
+    # Include ~local and #param variables from the current stack frame.
+    if _state.commandliststack:
+        frame = _state.commandliststack[-1]
+        items.extend(frame.localvars.substitutions)
+        if frame.paramvals is not None:
+            items.extend(frame.paramvals.substitutions)
     if not items:
         _write("  (no substitution variables defined)\n\n")
         return
@@ -389,6 +395,7 @@ def _print_var(varname: str) -> None:
     """Print the value of a single substitution variable.
 
     Tries the name as typed, then with the sigil prefix stripped.
+    Checks both global subvars and the current stack frame's local/param vars.
     """
     subvars = _state.subvars
     if subvars is None:
@@ -400,6 +407,12 @@ def _print_var(varname: str) -> None:
     value = subvars.varvalue(varname)
     if value is None and len(varname) > 1 and varname[0] in "$&@#~":
         value = subvars.varvalue(varname[1:])
+    # Check stack frame for ~local and #param variables.
+    if value is None and _state.commandliststack:
+        frame = _state.commandliststack[-1]
+        value = frame.localvars.varvalue(varname)
+        if value is None and frame.paramvals is not None:
+            value = frame.paramvals.varvalue(varname)
     if value is None:
         _write(f"  {_c(_CYAN, varname)}: {_c(_DIM, '(undefined)')}\n")
     else:
@@ -477,13 +490,20 @@ def _enable_step_mode() -> None:
 def _set_var(varname: str, value: str) -> None:
     """Set or update a substitution variable in the current session.
 
+    Routes ~local variables to the current stack frame's localvars (matching
+    the behavior of ``x_sub`` / ``get_subvarset``).  All other variables go
+    to the global subvars pool.
+
     Args:
-        varname: The variable name (without sigil prefix for user variables).
+        varname: The variable name (with optional sigil prefix).
         value: The value to assign to the variable.
     """
     subvars = _state.subvars
     if subvars is None:
         _write("  Error: substitution variables are not initialised.\n")
         return
-    subvars.add_substitution(varname, value)
+    if varname.startswith("~") and _state.commandliststack:
+        _state.commandliststack[-1].localvars.add_substitution(varname, value)
+    else:
+        subvars.add_substitution(varname, value)
     _write(f"  {_c(_CYAN, varname)} {_c(_DIM, '=')} {value}\n")

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.dist-info → execsql2-2.16.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.16.3
+Version: 2.16.5
 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.dist-info → execsql2-2.16.5.dist-info}/RECORD

@@ -29,7 +29,7 @@ execsql/db/postgres.py,sha256=-GpaA9fi6_vdIDTGyRGxNRaPYAAkEB_aCb-EyLFShsM,21120
 execsql/db/sqlite.py,sha256=or2JDDt_MyBTAtSXBVhNTcojE9jCE4b98tq39sNOyUg,10401
 execsql/db/sqlserver.py,sha256=d8PwfNumt-Spit_0llafqQ900suv3CZMbrRsHLU1iB4,7683
 execsql/debug/__init__.py,sha256=j6EGUR0dHzUhWN1mHHtf1-Lhjq3Sb1V-vmnq2Ztgj1M,178
-execsql/debug/repl.py,sha256=ngUVuQjey7TilSMumMqOouUhzx3Zx7W5rKCqZ5XoLnY,17227
+execsql/debug/repl.py,sha256=rlddBAg7lelHYmeyeXhDqkK8XkKF2t2dVv4nsEMvleU,18247
 execsql/exporters/__init__.py,sha256=-Cnji-OgodJV8ftcDcOyTof0kQMy9J5kKVC8GVFpc3o,670
 execsql/exporters/base.py,sha256=Uhq0PBz8N_pJ7WlIN9225wY-HyxfzWSb9YabHXicBA8,6387
 execsql/exporters/delimited.py,sha256=Po9RV4UwBLOuRZmPFJk5CErpFvTdLCy--nFJJffZgxM,32383
@@ -84,7 +84,7 @@ execsql/script/__init__.py,sha256=3WaBklMVIWjtCsYQ-BVo9UAVEIATOgeGsuyv21YKnxo,39
 execsql/script/ast.py,sha256=yFw9ZvLLDNNSmSgy7cwK2fXLatpp2CKYAAyOneJoKVc,18836
 execsql/script/control.py,sha256=s-1eZdGARM6H1FwZ6VDdO_f50j7bvvRtTHesfUm9tbc,6144
 execsql/script/engine.py,sha256=EhuVBniOrFkzAW4I3NIZLt3INHTZJvlYoF7B99rZBLI,29391
-execsql/script/executor.py,sha256=35RGyua8sGR2rrrnf3WvaC3nAjobKoH9pmVm4FJ5oZY,34213
+execsql/script/executor.py,sha256=YbvoviWeUv9dcT-FWtAY4IsvhC9d6MvtHRtTNXkZL4s,35931
 execsql/script/parser.py,sha256=nAyLaDP-nL6C-chvlaSu0Oqh8ACcCCZjFacv0Fhyp58,24983
 execsql/script/variables.py,sha256=ZSBGQUsoii6w3dLDVY9xxoPIV6wY0sAV_BNIQ6pgQAE,14328
 execsql/utils/__init__.py,sha256=0uR6JwVJQRX3vceByNBduCAf5dd5assKjeqJUWvpZoA,278
@@ -99,24 +99,24 @@ execsql/utils/numeric.py,sha256=xh02ANSRk3nUpQ-rtm66ILoMqoi7HtzCoRMIOT9U8QI,1570
 execsql/utils/regex.py,sha256=diEzTZqU_HHwVMadPAvN1Vgzhl7I03eVaEFGCXyGGL8,3770
 execsql/utils/strings.py,sha256=5Dvzrk-9SIw2lpxXZQkiJbNyo1sy7iXXAtSULlZ0KG8,8488
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.16.3.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.16.3.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.16.3.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.16.3.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
-execsql2-2.16.3.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.16.3.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
-execsql2-2.16.3.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
-execsql2-2.16.3.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
-execsql2-2.16.3.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
-execsql2-2.16.3.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
-execsql2-2.16.3.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
-execsql2-2.16.3.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
-execsql2-2.16.3.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
-execsql2-2.16.3.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
-execsql2-2.16.3.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
-execsql2-2.16.3.dist-info/METADATA,sha256=Bm26q8SvmGFnNxgikNwnsuKdRrdRjUPUEi5WPJ7nKzA,20920
-execsql2-2.16.3.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.16.3.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.16.3.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.16.3.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
-execsql2-2.16.3.dist-info/RECORD,,
+execsql2-2.16.5.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.16.5.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.16.5.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
+execsql2-2.16.5.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
+execsql2-2.16.5.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.16.5.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
+execsql2-2.16.5.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
+execsql2-2.16.5.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
+execsql2-2.16.5.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
+execsql2-2.16.5.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
+execsql2-2.16.5.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
+execsql2-2.16.5.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
+execsql2-2.16.5.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
+execsql2-2.16.5.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
+execsql2-2.16.5.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
+execsql2-2.16.5.dist-info/METADATA,sha256=xobEE16MgxSLPqPT019E5OTTsnADPhaPzNwSt_4rgpE,20920
+execsql2-2.16.5.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+execsql2-2.16.5.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.16.5.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.16.5.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
+execsql2-2.16.5.dist-info/RECORD,,