execsql2 2.16.4__tar.gz → 2.16.6__tar.gz

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

@@ -13,6 +13,23 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.16.6] - 2026-04-30
+
+### Fixed
+
+- `execsql-format` no longer corrupts PL/pgSQL function bodies inside `$$`-delimited blocks. sqlglot does not understand PL/pgSQL and was rewriting `IF NOT EXISTS ... END IF`, `IF ... THEN RETURN ... END IF`, and similar constructs as `COMMIT;`. The formatter now tracks `$$` boundaries and skips sqlglot formatting for any SQL block containing dollar-quoted content.
+- Debug REPL `.vars` now shows `~` local and `#` param variables from the current stack frame, not just global variables. `.vars ~myvar` and `.set ~myvar value` also correctly read/write the stack frame's local scope instead of the global pool.
+
+______________________________________________________________________
+
+## [2.16.5] - 2026-04-30
+
+### Fixed
+
+- Debug REPL `.vars` now shows `~` local and `#` param variables from the current stack frame, not just global variables. `.vars ~myvar` and `.set ~myvar value` also correctly read/write the stack frame's local scope instead of the global pool.
+
+______________________________________________________________________
+
 ## [2.16.4] - 2026-04-30
 
 ### Fixed

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.16.4
+Version: 2.16.6
 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.4 → execsql2-2.16.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.16.4"
+version = "2.16.6"
 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.4"
+current_version = "2.16.6"
 commit = true
 tag = true
 tag_name = "v{new_version}"

{execsql2-2.16.4 → execsql2-2.16.6}/src/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")

{execsql2-2.16.4 → execsql2-2.16.6}/src/execsql/format.py

@@ -242,16 +242,27 @@ def format_file(source: str, indent: int = 4, use_sql: bool = True) -> str:
     sql_acc: list[str] = []
     output: list[str] = []
 
+    in_dollar_quote = False
+
     def flush_sql() -> None:
+        nonlocal in_dollar_quote
         if sql_acc:
-            output.extend(format_sql_block(sql_acc, depth, indent, use_sql))
+            # If any line in the accumulated block is inside a $$-delimited
+            # region, skip sqlglot formatting entirely.  PL/pgSQL function
+            # bodies contain IF/END IF, LOOP, RETURN, etc. that sqlglot does
+            # not understand and will corrupt (e.g., rewriting to COMMIT).
+            safe_for_sqlglot = use_sql and not in_dollar_quote
+            output.extend(format_sql_block(sql_acc, depth, indent, safe_for_sqlglot))
             sql_acc.clear()
 
     for raw_line in source.expandtabs(4).splitlines():
         m = METACOMMAND_RE.match(raw_line)
 
         if not raw_line.strip():
-            flush_sql()
+            if not in_dollar_quote:
+                flush_sql()
+            else:
+                sql_acc.append(raw_line)
             output.append("")
 
         elif m:
@@ -279,6 +290,9 @@ def format_file(source: str, indent: int = 4, use_sql: bool = True) -> str:
                 output.append(format_metacommand(payload, depth, indent))
 
         else:
+            # Track $$ boundaries to prevent sqlglot from mangling PL/pgSQL
+            if "$$" in raw_line and raw_line.count("$$") % 2 == 1:
+                in_dollar_quote = not in_dollar_quote
             sql_acc.append(raw_line)
 
     flush_sql()

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

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