execsql2 2.16.6__tar.gz → 2.16.8__tar.gz

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

@@ -13,6 +13,23 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.16.8] - 2026-04-30
+
+### Fixed
+
+- SQL comments (`--` and `/* */`) inside multi-line SQL statements no longer split the statement. Previously, a comment like `-- col2,` between SELECT columns would cause the parser to flush the accumulated SQL at the comment line, sending an incomplete statement to the database. Comments inside SQL are now preserved as part of the statement text.
+
+______________________________________________________________________
+
+## [2.16.7] - 2026-04-30
+
+### Fixed
+
+- ANDIF/ORIF conditions now short-circuit: `IF (sub_defined(x)) ANDIF (not sub_empty(x))` no longer evaluates `sub_empty` when `sub_defined` returns false. Previously all modifiers were evaluated unconditionally, causing `sub_empty` to throw "Unrecognized substitution variable" on undefined variables.
+- Error reports for IF, LOOP, and INCLUDE nodes now show the correct source line and metacommand text instead of the previous command's location.
+
+______________________________________________________________________
+
 ## [2.16.6] - 2026-04-30
 
 ### Fixed

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

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

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

{execsql2-2.16.6 → execsql2-2.16.8}/src/execsql/script/executor.py

@@ -139,13 +139,24 @@ def _eval_condition(
     condition: str,
     modifiers: list[ConditionModifier] | None = None,
 ) -> bool:
-    """Evaluate a condition string with optional ANDIF/ORIF modifiers."""
+    """Evaluate a condition string with optional ANDIF/ORIF modifiers.
+
+    Short-circuits ANDIF (stops on first False) and ORIF (stops on first True)
+    so that patterns like ``IF (sub_defined(x)) ANDIF (not sub_empty(x))``
+    don't evaluate ``sub_empty`` when ``x`` is undefined.
+    """
     effective_locals = _stack_localvars(ctx)
     expanded = substitute_vars(condition, effective_locals, ctx=ctx)
     result = xcmd_test(expanded)
 
     if modifiers:
         for mod in modifiers:
+            # Short-circuit: AND with False can't become True,
+            # OR with True can't become False.
+            if mod.kind == "AND" and not result:
+                continue
+            if mod.kind == "OR" and result:
+                continue
             mod_expanded = substitute_vars(mod.condition, effective_locals, ctx=ctx)
             mod_result = xcmd_test(mod_expanded)
             if mod.kind == "AND":
@@ -353,9 +364,11 @@ def _execute_node(
         _exec_metacommand(ctx, command, node.span.file, node.span.start_line, localvars)
 
     elif isinstance(node, IfBlock):
+        ctx.last_command = _FakeScriptCmd(node)
         _execute_if(ctx, node, localvars, in_loop=in_loop)
 
     elif isinstance(node, LoopBlock):
+        ctx.last_command = _FakeScriptCmd(node)
         _execute_loop(ctx, node, localvars)
 
     elif isinstance(node, BatchBlock):
@@ -368,6 +381,7 @@ def _execute_node(
         _execute_sql_block(ctx, node, localvars, in_loop=in_loop)
 
     elif isinstance(node, IncludeDirective):
+        ctx.last_command = _FakeScriptCmd(node)
         _execute_include(ctx, node, localvars)
 
 

{execsql2-2.16.6 → execsql2-2.16.8}/src/execsql/script/parser.py

@@ -163,6 +163,7 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
     in_sql_block = False  # inside BEGIN SQL ... END SQL
     sql_accum = ""  # multi-line SQL accumulator
     sql_start_line = 0
+    sql_accum_at_block_comment = False  # was sql_accum non-empty when /* started?
 
     def _current_body() -> list[Node]:
         """Return the body list that new nodes should be appended to."""
@@ -217,14 +218,21 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
             block_comment_lines.append(line)
             if len(line) > 1 and line.rstrip().endswith("*/"):
                 in_block_comment = False
-                _flush_sql(file_lineno)
-                _current_body().append(
-                    Comment(
-                        span=SourceSpan(source_name, block_comment_start, file_lineno),
-                        text="\n".join(block_comment_lines),
-                    ),
-                )
+                comment_text = "\n".join(block_comment_lines)
+                if sql_accum_at_block_comment:
+                    # Block comment started inside a SQL statement — fold it
+                    # back into sql_accum so the statement isn't split.
+                    sql_accum += "\n" + comment_text
+                else:
+                    _flush_sql(file_lineno)
+                    _current_body().append(
+                        Comment(
+                            span=SourceSpan(source_name, block_comment_start, file_lineno),
+                            text=comment_text,
+                        ),
+                    )
                 block_comment_lines = []
+                sql_accum_at_block_comment = False
             continue
 
         # --- Single-line comment classification ---
@@ -232,12 +240,17 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
         comment_match = _COMMENT_LINE_RX.match(line)
 
         if comment_match and not metacommand_match and not in_sql_block:
-            # Accumulate consecutive -- comment lines into a single Comment node.
-            # Inside a BEGIN SQL block, comments are part of the SQL text (not emitted separately).
-            _flush_sql(file_lineno)
-            if not line_comment_lines:
-                line_comment_start = file_lineno
-            line_comment_lines.append(line.rstrip())
+            if sql_accum:
+                # Inside a multi-line SQL statement — keep the comment as part
+                # of the SQL text so that commented-out columns, WHERE clauses,
+                # etc. don't split the statement.
+                sql_accum += "\n" + line.rstrip()
+            else:
+                # Standalone comment (not inside a SQL statement) — accumulate
+                # consecutive -- lines into a single Comment node.
+                if not line_comment_lines:
+                    line_comment_start = file_lineno
+                line_comment_lines.append(line.rstrip())
             continue
 
         # Non-comment line — flush any accumulated -- comment group before proceeding.
@@ -248,17 +261,24 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
         if len(stripped) > 1 and stripped.startswith("/*"):
             block_comment_start = file_lineno
             block_comment_lines = [line]
+            # Remember whether we were inside a SQL statement when the block
+            # comment started, so we can fold it back on close.
+            sql_accum_at_block_comment = bool(sql_accum)
             in_block_comment = True
             if stripped.endswith("*/"):
                 in_block_comment = False
-                _flush_sql(file_lineno)
-                _current_body().append(
-                    Comment(
-                        span=SourceSpan(source_name, file_lineno),
-                        text=line,
-                    ),
-                )
+                if sql_accum_at_block_comment:
+                    sql_accum += "\n" + line.rstrip()
+                else:
+                    _flush_sql(file_lineno)
+                    _current_body().append(
+                        Comment(
+                            span=SourceSpan(source_name, file_lineno),
+                            text=line,
+                        ),
+                    )
                 block_comment_lines = []
+                sql_accum_at_block_comment = False
             continue
 
         # --- Metacommand handling ---

{execsql2-2.16.6 → execsql2-2.16.8}/tests/test_executor.py

@@ -434,6 +434,41 @@ class TestAssert:
         assert result.returncode != 0
 
 
+# ---------------------------------------------------------------------------
+# Short-circuit ANDIF/ORIF
+# ---------------------------------------------------------------------------
+
+
+class TestShortCircuit:
+    def test_andif_short_circuits(self, tmp_path):
+        """ANDIF does not evaluate sub_empty when sub_defined is false."""
+        script = (
+            "CREATE TABLE t (x INT);\n"
+            "-- !x! IF (sub_defined(undefined_var))\n"
+            "-- !x! ANDIF (not sub_empty(undefined_var))\n"
+            "INSERT INTO t VALUES (1);\n"
+            "-- !x! ELSE\n"
+            "INSERT INTO t VALUES (2);\n"
+            "-- !x! ENDIF\n"
+        )
+        result = _run_ast(script, tmp_path)
+        assert result.returncode == 0, result.stderr
+        assert _query_db(tmp_path, "SELECT x FROM t") == [(2,)]
+
+    def test_orif_short_circuits(self, tmp_path):
+        """ORIF does not evaluate when first condition is already true."""
+        script = (
+            "CREATE TABLE t (x INT);\n"
+            "-- !x! IF (TRUE)\n"
+            "-- !x! ORIF (not sub_empty(undefined_var))\n"
+            "INSERT INTO t VALUES (1);\n"
+            "-- !x! ENDIF\n"
+        )
+        result = _run_ast(script, tmp_path)
+        assert result.returncode == 0, result.stderr
+        assert _query_db(tmp_path, "SELECT x FROM t") == [(1,)]
+
+
 # ---------------------------------------------------------------------------
 # Profiling
 # ---------------------------------------------------------------------------

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

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