execsql2 2.15.5__tar.gz → 2.15.6__tar.gz

{execsql2-2.15.5 → execsql2-2.15.6}/CHANGELOG.md

@@ -13,6 +13,14 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.15.6] - 2026-04-16
+
+### Fixed
+
+- Nested substitution variable names (e.g., `!!N_!!CHECK_GROUP!!_CHECKS!!`) now resolve correctly, matching original execsql behavior. The single-pass token regex introduced in 2.15.0 could not find inner `!!var!!` tokens embedded within an outer variable name; a per-variable substring fallback now handles this edge case.
+
+______________________________________________________________________
+
 ## [2.15.5] - 2026-04-15
 
 ### Fixed

{execsql2-2.15.5 → execsql2-2.15.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.15.5
+Version: 2.15.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.15.5 → execsql2-2.15.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.15.5"
+version = "2.15.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" }
@@ -164,7 +164,7 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.bumpversion]
-current_version = "2.15.5"
+current_version = "2.15.6"
 commit = true
 commit_args = "--no-verify"
 tag = true

{execsql2-2.15.5 → execsql2-2.15.6}/src/execsql/script/variables.py

@@ -224,6 +224,11 @@ class SubVarSet:
         dict.  This is O(1) per call instead of O(V) where V is the number of
         defined variables.
 
+        Falls back to a per-variable substring scan when ``_TOKEN_RX`` finds no
+        match — this handles nested variable names like
+        ``!!N_!!CHECK_GROUP!!_CHECKS!!`` where the inner ``!!CHECK_GROUP!!``
+        must be resolved first.
+
         Returns ``(modified_string, True)`` if a substitution was made, or
         ``(original_string, False)`` if no variable pattern matched.
         """
@@ -249,6 +254,37 @@ class SubVarSet:
                 return command_str[: m.start()] + sub + command_str[m.end() :], True
             # Token found but variable not defined — skip it and keep searching.
             m = self._TOKEN_RX.search(command_str, m.end())
+        # Fallback: per-variable substring scan for nested tokens like
+        # !!N_!!CHECK_GROUP!!_CHECKS!! where _TOKEN_RX cannot find the inner
+        # variable.  Matches original monolith behavior.
+        return self._substitute_nested(command_str)
+
+    def _substitute_nested(self, command_str: str) -> tuple:
+        """Scan for any defined variable as a substring — handles nested tokens."""
+        for varname, sub in self._subs_dict.items():
+            if sub is None:
+                sub = ""
+            sub = str(sub)
+            if os.name != "posix":
+                sub = sub.replace("\\", "\\\\")
+            pat = re.compile(re.escape(f"!!{varname}!!"), re.I)
+            m = pat.search(command_str)
+            if m:
+                return command_str[: m.start()] + sub + command_str[m.end() :], True
+            patq = re.compile(re.escape(f"!'!{varname}!'!"), re.I)
+            mq = patq.search(command_str)
+            if mq:
+                return (
+                    command_str[: mq.start()] + sub.replace("'", "''") + command_str[mq.end() :],
+                    True,
+                )
+            patdq = re.compile(re.escape(f'!"!{varname}!"!'), re.I)
+            mdq = patdq.search(command_str)
+            if mdq:
+                return (
+                    command_str[: mdq.start()] + '"' + sub + '"' + command_str[mdq.end() :],
+                    True,
+                )
         return command_str, False
 
     def substitute_all(self, any_text: str) -> tuple:

{execsql2-2.15.5 → execsql2-2.15.6}/tests/test_script.py

@@ -666,6 +666,97 @@ class TestSubVarSetTokenOptimization:
         assert changed is True
         assert result == "resolved"
 
+    def test_nested_variable_name_basic(self):
+        """Inner !!VAR!! inside an outer token name resolves correctly."""
+        sv = SubVarSet()
+        sv.add_substitution("check_group", "Initial")
+        sv.add_substitution("n_initial_checks", "12")
+        result, changed = sv.substitute_all("!!N_!!CHECK_GROUP!!_CHECKS!!")
+        assert changed is True
+        assert result == "12"
+
+    def test_nested_variable_name_dollar_prefix(self):
+        """Nested name with $-prefixed variables."""
+        sv = SubVarSet()
+        sv.add_substitution("$prefix", "Initial")
+        sv.add_substitution("$n_initial_checks", "42")
+        result, changed = sv.substitute_all("!!$N_!!$PREFIX!!_CHECKS!!")
+        assert changed is True
+        assert result == "42"
+
+    def test_nested_variable_name_at_prefix(self):
+        """Nested name with @-prefixed variables."""
+        sv = SubVarSet()
+        sv.add_substitution("@group", "east")
+        sv.add_substitution("@region_east_id", "99")
+        result, changed = sv.substitute_all("!!@REGION_!!@GROUP!!_ID!!")
+        assert changed is True
+        assert result == "99"
+
+    def test_nested_variable_name_no_prefix(self):
+        """Nested name with unprefixed variables."""
+        sv = SubVarSet()
+        sv.add_substitution("part", "mid")
+        sv.add_substitution("sec_mid_val", "xyz")
+        result, changed = sv.substitute_all("!!SEC_!!PART!!_VAL!!")
+        assert changed is True
+        assert result == "xyz"
+
+    def test_nested_variable_name_mixed_context(self):
+        """Nested name alongside a normal variable in the same string."""
+        sv = SubVarSet()
+        sv.add_substitution("idx", "3")
+        sv.add_substitution("col_3_name", "addr")
+        sv.add_substitution("table", "users")
+        result, changed = sv.substitute_all("SELECT !!COL_!!IDX!!_NAME!! FROM !!TABLE!!")
+        assert changed is True
+        assert result == "SELECT addr FROM users"
+
+    def test_nested_variable_name_ampersand_prefix(self):
+        """Nested name with &-prefixed variables."""
+        sv = SubVarSet()
+        sv.add_substitution("&slot", "A")
+        sv.add_substitution("&val_a_out", "done")
+        result, changed = sv.substitute_all("!!&VAL_!!&SLOT!!_OUT!!")
+        assert changed is True
+        assert result == "done"
+
+    def test_nested_variable_name_single_quote_form(self):
+        """Nested name inside single-quoted form applies apostrophe escaping."""
+        sv = SubVarSet()
+        sv.add_substitution("group", "east")
+        sv.add_substitution("n_east_val", "it's done")
+        result, changed = sv.substitute_all("!'!N_!!GROUP!!_VAL!'!")
+        assert changed is True
+        assert result == "it''s done"
+
+    def test_nested_variable_name_double_quote_form(self):
+        """Nested name inside double-quoted form wraps value in quotes."""
+        sv = SubVarSet()
+        sv.add_substitution("group", "east")
+        sv.add_substitution("n_east_val", "hello")
+        result, changed = sv.substitute_all('!"!N_!!GROUP!!_VAL!"!')
+        assert changed is True
+        assert result == '"hello"'
+
+    def test_nested_variable_name_undefined_inner(self):
+        """Nested name with undefined inner variable stays unchanged."""
+        sv = SubVarSet()
+        sv.add_substitution("n_something_x", "12")
+        result, changed = sv.substitute_all("!!N_!!UNDEFINED!!_X!!")
+        assert changed is False
+        assert result == "!!N_!!UNDEFINED!!_X!!"
+
+    def test_nested_variable_name_triple(self):
+        """Triple nesting resolves inside-out."""
+        sv = SubVarSet()
+        sv.add_substitution("c", "X")
+        sv.add_substitution("b_x_d", "Y")
+        sv.add_substitution("a_y_e", "final")
+        result, changed = sv.substitute_all("!!A_!!B_!!C!!_D!!_E!!")
+        assert changed is True
+        assert result == "final"
+
     def test_non_string_input_returns_unchanged(self):
         sv = SubVarSet()
         sv.add_substitution("$x", "val")

{execsql2-2.15.5 → execsql2-2.15.6}/uv.lock

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