execsql2 2.16.13__tar.gz → 2.16.15__tar.gz

{execsql2-2.16.13 → execsql2-2.16.15}/CHANGELOG.md

@@ -13,6 +13,24 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.16.15] - 2026-05-02
+
+### Changed
+
+- Merged `SHOW SCRIPTS` and `SHOW SCRIPT <name>` into a single `SHOW SCRIPTS [<name>]` metacommand. Without a name, lists all registered scripts; with a name, shows detail for that script.
+
+______________________________________________________________________
+
+## [2.16.14] - 2026-05-01
+
+### Fixed
+
+- ELSEIF conditions now support ANDIF/ORIF modifiers. Previously, ANDIF/ORIF after an ELSEIF were silently attached to the parent IF condition instead of the ELSEIF clause, meaning the compound condition was never evaluated correctly. ELSEIF + ANDIF/ORIF now works the same way as IF + ANDIF/ORIF.
+- Unknown AST node types now raise an error instead of being silently ignored during execution.
+- Cursor leak in `select_rowsource()` and `select_rowdict()`: cursor is now closed on query execution failure. High-traffic callers (EXPORT, COPY) now explicitly close the row generator on error instead of relying on garbage collection.
+
+______________________________________________________________________
+
 ## [2.16.13] - 2026-05-01
 
 ### Added

{execsql2-2.16.13 → execsql2-2.16.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.16.13
+Version: 2.16.15
 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.13 → execsql2-2.16.15}/docs/about/divergence.md

@@ -44,23 +44,22 @@ ______________________________________________________________________
 
 ### Metacommands
 
-| Metacommand            | Description                                                                                                                                                                                                                                                                                                                                                                                                              |
-| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `ASSERT`               | Evaluate a condition and raise an error (halting the script) if it is false. Supports all IF conditions. Optional quoted failure message. Skipped in false IF blocks.                                                                                                                                                                                                                                                    |
-| `BREAKPOINT`           | Pause script execution and drop into an interactive debug REPL. See [Debugging](#debugging) below for full details.                                                                                                                                                                                                                                                                                                      |
-| `CONFIG SHOW_PROGRESS` | Enable the Rich progress bar for IMPORT operations at runtime.                                                                                                                                                                                                                                                                                                                                                           |
-| `CONFIG LOG_SQL`       | Enable SQL query audit logging — writes executed SQL to the log file.                                                                                                                                                                                                                                                                                                                                                    |
-| `PG_UPSERT`            | QA-checked, FK-dependency-ordered upserts from staging to base schema on PostgreSQL. Integrates [pg-upsert](https://pg-upsert.readthedocs.io/) as an optional dependency. Three modes: full pipeline, QA-only, and schema check. Supports `EXPORT_FAILURES`, `EXPORT_FORMAT`, `EXPORT_MAX_ROWS`, and `STRICT_COLUMNS` keywords. `STRICT_COLUMNS` forces all missing columns to be errors (requires `pg-upsert>=1.22.0`). |
-| `IMPORT … FROM JSON`   | Import a JSON file (array of objects or NDJSON) into a database table. Nested objects are flattened with dot-separated column names; arrays are stored as JSON strings.                                                                                                                                                                                                                                                  |
-| `SHOW SCRIPTS`         | List all registered SCRIPT definitions with parameter signatures and source locations. Includes scripts from INCLUDEEd files.                                                                                                                                                                                                                                                                                            |
-| `SHOW SCRIPT <name>`   | Show detail for a single registered SCRIPT: name, parameters (with defaults), source file/line range, and docstring.                                                                                                                                                                                                                                                                                                     |
+| Metacommand             | Description                                                                                                                                                                                                                                                                                                                                                                                                              |
+| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `ASSERT`                | Evaluate a condition and raise an error (halting the script) if it is false. Supports all IF conditions. Optional quoted failure message. Skipped in false IF blocks.                                                                                                                                                                                                                                                    |
+| `BREAKPOINT`            | Pause script execution and drop into an interactive debug REPL. See [Debugging](#debugging) below for full details.                                                                                                                                                                                                                                                                                                      |
+| `CONFIG SHOW_PROGRESS`  | Enable the Rich progress bar for IMPORT operations at runtime.                                                                                                                                                                                                                                                                                                                                                           |
+| `CONFIG LOG_SQL`        | Enable SQL query audit logging — writes executed SQL to the log file.                                                                                                                                                                                                                                                                                                                                                    |
+| `PG_UPSERT`             | QA-checked, FK-dependency-ordered upserts from staging to base schema on PostgreSQL. Integrates [pg-upsert](https://pg-upsert.readthedocs.io/) as an optional dependency. Three modes: full pipeline, QA-only, and schema check. Supports `EXPORT_FAILURES`, `EXPORT_FORMAT`, `EXPORT_MAX_ROWS`, and `STRICT_COLUMNS` keywords. `STRICT_COLUMNS` forces all missing columns to be errors (requires `pg-upsert>=1.22.0`). |
+| `IMPORT … FROM JSON`    | Import a JSON file (array of objects or NDJSON) into a database table. Nested objects are flattened with dot-separated column names; arrays are stored as JSON strings.                                                                                                                                                                                                                                                  |
+| `SHOW SCRIPTS [<name>]` | Without a name, lists all registered SCRIPT definitions with parameter signatures and source locations. With a name, shows detail including parameters (with defaults), source file/line range, and docstring.                                                                                                                                                                                                           |
 
 ### SCRIPT Enhancements
 
-| Feature            | Description                                                                                                                                                                                                    |
-| ------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Default parameters | `BEGIN SCRIPT load(schema, table, batch=1000)` — parameters with defaults can be omitted at call site. Required parameters must precede optional parameters.                                                   |
-| Docstrings         | Comments (`--` or `/* */`) immediately following `BEGIN SCRIPT` are captured as documentation. A blank line terminates the docstring. Displayed by `SHOW SCRIPT`, `SHOW SCRIPTS`, and `.scripts` REPL command. |
+| Feature            | Description                                                                                                                                                                                                  |
+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Default parameters | `BEGIN SCRIPT load(schema, table, batch=1000)` — parameters with defaults can be omitted at call site. Required parameters must precede optional parameters.                                                 |
+| Docstrings         | Comments (`--` or `/* */`) immediately following `BEGIN SCRIPT` are captured as documentation. A blank line terminates the docstring. Displayed by `SHOW SCRIPTS <name>` and `.scripts <name>` REPL command. |
 
 ### Bug Fixes
 
@@ -310,6 +309,8 @@ These are behavioral changes driven by security or correctness issues in the ups
 | Empty script name in error msg                      | `_execute_script_direct()` and `_execute_script_textual_console()` no longer append "in script , line 0" to uncaught-exception messages when `current_script_line()` returns an empty string.                                                                                                                                                                                                                                                                                                                                                              |
 | `PROMPT COMPARE` diff comparison                    | Diff engine uses native Python equality instead of string comparison — numeric types, Decimals, and booleans compare correctly. `None` is distinguished from empty string. Columns are matched by name (not position), key columns are excluded from comparison, and duplicate PKs keep the first row.                                                                                                                                                                                                                                                     |
 | `win_config_file` broken                            | Checked `os.name == "windows"` which Python never returns (correct value is `"nt"`). Fixed to `os.name == "nt"`. Inherited from upstream.                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| ELSEIF + ANDIF/ORIF                                 | ANDIF/ORIF after an ELSEIF were silently attached to the parent IF condition instead of the ELSEIF clause. The compound condition was never evaluated for the ELSEIF branch. Fixed in the AST parser and executor.                                                                                                                                                                                                                                                                                                                                         |
+| Cursor leak in `select_rowsource()`                 | Cursor was not closed on query execution failure. Row generators in EXPORT and COPY paths were not explicitly closed on error, relying on garbage collection for cleanup.                                                                                                                                                                                                                                                                                                                                                                                  |
 | `NumericParser` right-associative                   | Arithmetic operators were parsed right-to-left. `10 - 3 - 2` evaluated as `9` instead of `5`. Fixed to left-associative parsing. Inherited from upstream.                                                                                                                                                                                                                                                                                                                                                                                                  |
 | Empty-column check precedence                       | `DataTable` and `Database.populate_table()` had an operator precedence bug in the extra-column emptiness check — a redundant `and conf.del_empty_cols` caused incorrect short-circuit evaluation. Inherited from upstream.                                                                                                                                                                                                                                                                                                                                 |
 | SQLite import string processing                     | `SQLiteDatabase.populate_table()` applied `trim_strings`, `replace_newlines`, and `empty_strings` after copying row data, so processing never reached the INSERT. Fixed to process before extraction. Inherited from upstream.                                                                                                                                                                                                                                                                                                                             |

{execsql2-2.16.13 → execsql2-2.16.15}/docs/reference/metacommands.md

@@ -1372,7 +1372,7 @@ ENDIF
 
 Multiple ELSEIF clauses can be used within a single multi-line IF metacommand. An ELSE clause can be used in combination with ELSEIF clauses, but this is not recommended because the results are not likely to be what you expect---the ELSE keyword only inverts the current truth state, it does not provide an alternative to all preceding ELSEIF clauses. To achieve the effect of a case or switch statement, use only ELSEIF clauses without a final ELSE clause.
 
-The ANDIF metacommand allows you to test for the conjunction of two conditional expressions using two separate metacommands instead of one. This may be beneficial for clarity. The simplest form of usage of the ANDIF clause is:
+The ANDIF metacommand allows you to test for the conjunction of two conditional expressions using two separate metacommands instead of one. This may be beneficial for clarity. ANDIF and ORIF can follow either an IF or an ELSEIF metacommand. The simplest form of usage of the ANDIF clause is:
 
 ```
 IF(<conditional expression>)
@@ -1381,7 +1381,7 @@ ANDIF(<conditional expression>)
 ENDIF
 ```
 
-The ANDIF metacommand does not have to immediately follow the IF metacommand. It could instead follow an ELSE statement, or appear anywhere at all within a multi-line IF metacommand. Usage patterns other than that illustrated above may be difficult to interpret, however, and nested IF metacommands may be preferable to complex uses of the ANDIF clause.
+The ANDIF metacommand does not have to immediately follow the IF metacommand. It could instead follow an ELSEIF statement. Usage patterns other than those illustrated here may be difficult to interpret, however, and nested IF metacommands may be preferable to complex uses of the ANDIF clause.
 
 The ORIF metacommand is similar to the ANDIF clause, but allows you to test for the disjunction of two conditional expressions using two different metacommands. The simplest form of usage of the ORIF clause is:
 
@@ -1392,6 +1392,17 @@ ORIF(<conditional expression>)
 ENDIF
 ```
 
+ANDIF and ORIF can also compound an ELSEIF condition:
+
+```
+IF(<conditional expression>)
+    <SQL statements and metacommands>
+ELSEIF(<conditional expression>)
+ANDIF(<conditional expression>)
+    <SQL statements and metacommands>
+ENDIF
+```
+
 The IF metacommands can be used not only to control a single stream of script commands, but also to loop over sets of SQL statements and metacommands, as shown in [Example 6](../guides/examples.md#example6).
 
 The IF metacommands cannot be used within a SQL statement (nor can any other metacommands). This restriction prohibits constructions such as:
@@ -2756,12 +2767,18 @@ The numeric expression may consist of the simple algebraic operations of additio
 ## SHOW SCRIPTS { #show_scripts }
 
 ```
-SHOW SCRIPTS
+SHOW SCRIPTS [<name>]
 ```
 
-Lists all registered SCRIPT definitions with their parameter signatures and source locations. This is useful for discovering what scripts are available at runtime, especially when scripts are loaded from INCLUDEEd files whose paths are determined dynamically.
+Without a name, lists all registered SCRIPT definitions with their parameter signatures and source locations. With a name, shows detail for that script including parameters, source file/line range, and docstring.
+
+This is useful for discovering what scripts are available at runtime, especially when scripts are loaded from INCLUDEEd files whose paths are determined dynamically.
 
-**Example output:**
+**List all scripts:**
+
+```sql
+-- !x! SHOW SCRIPTS
+```
 
 ```
 Registered scripts (3):
@@ -2771,26 +2788,12 @@ Registered scripts (3):
   validate(schema, table)                      pipeline.sql:62-80
 ```
 
-Default parameter values are shown in the signature. Use `SHOW SCRIPT <name>` for full detail including docstrings.
-
-If no scripts are registered, prints `No scripts registered.`
-
-## SHOW SCRIPT { #show_script }
-
-```
-SHOW SCRIPT <name>
-```
-
-Shows detail for a single registered SCRIPT definition, including its parameter list (with required/optional status and defaults), source file/line range, and docstring.
-
-**Example:**
+**Show detail for one script:**
 
 ```sql
--- !x! SHOW SCRIPT load_data
+-- !x! SHOW SCRIPTS load_data
 ```
 
-**Example output:**
-
 ```
 Script: load_data(schema, table, batch_size=1000)
 Source: pipeline.sql:15-42
@@ -2802,7 +2805,7 @@ Parameters:
 Load data from staging into the target table.
 ```
 
-If the script is not found, prints `No script named '<name>' is registered.`
+If no scripts are registered, prints `No scripts registered.` If the named script is not found, prints `No script named '<name>' is registered.`
 
 !!! tip
     In the debug REPL, use `.scripts` to list all scripts or `.scripts <name>` to show detail for one script.

{execsql2-2.16.13 → execsql2-2.16.15}/extras/vscode-execsql/syntaxes/execsql.tmLanguage.json

@@ -93,7 +93,7 @@
     },
     "action-keywords": {
       "comment": "sub, write, execute script, export, etc.",
-      "match": "(?i)\\b(reset\\s+dialog_canceled|write\\s+create_table|export_metadata|pg_upsert\\s+check|sub_querystring|execute\\s+script|append\\s+script|extend\\s+script|reset\\s+counter|export\\s+query|pg_upsert\\s+qa|show\\s+scripts|sub_tempfile|write\\s+script|import_file|set\\s+counter|show\\s+script|sub_decrypt|sub_encrypt|autocommit|breakpoint|copy\\s+query|disconnect|select_sub|sub_append|system_cmd|pg_upsert|pg_vacuum|sub_empty|sub_local|connect|include|max_int|rm_file|subdata|sub_add|sub_ini|assert|export|import|rm_sub|debug|email|serve|write|copy|log|run|sub|use|zip|cd)\\b",
+      "match": "(?i)\\b(reset\\s+dialog_canceled|write\\s+create_table|export_metadata|pg_upsert\\s+check|sub_querystring|execute\\s+script|append\\s+script|extend\\s+script|reset\\s+counter|export\\s+query|pg_upsert\\s+qa|show\\s+scripts|sub_tempfile|write\\s+script|import_file|set\\s+counter|sub_decrypt|sub_encrypt|autocommit|breakpoint|copy\\s+query|disconnect|select_sub|sub_append|system_cmd|pg_upsert|pg_vacuum|sub_empty|sub_local|connect|include|max_int|rm_file|subdata|sub_add|sub_ini|assert|export|import|rm_sub|debug|email|serve|write|copy|log|run|sub|use|zip|cd)\\b",
       "name": "keyword.other.execsql"
     },
     "config-event-keywords": {

{execsql2-2.16.13 → execsql2-2.16.15}/pyproject.toml

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

{execsql2-2.16.13 → execsql2-2.16.15}/src/execsql/db/base.py

@@ -226,6 +226,7 @@ class Database(ABC):
         try:
             curs.execute(sql)
         except Exception:
+            curs.close()
             self.rollback()
             raise
         try:
@@ -264,6 +265,7 @@ class Database(ABC):
         try:
             curs.execute(sql)
         except Exception:
+            curs.close()
             self.rollback()
             raise
         try:

{execsql2-2.16.13 → execsql2-2.16.15}/src/execsql/format.py

@@ -74,7 +74,6 @@ MULTIWORD_KEYWORDS = [
     "WITH TEMPLATE",
     "IN ZIPFILE",
     "SHOW SCRIPTS",
-    "SHOW SCRIPT",
 ]
 
 # Depth-tracking sets

{execsql2-2.16.13 → execsql2-2.16.15}/src/execsql/metacommands/debug.py

@@ -7,8 +7,8 @@ Provides ``x_debug_write_metacommands``, which implements the
 ``WRITE METACOMMANDS`` debug metacommand that prints the full registered
 metacommand list to the log/console for troubleshooting.
 
-Also provides ``x_show_scripts`` and ``x_show_script`` for runtime
-introspection of registered SCRIPT blocks.
+Also provides ``x_show_scripts`` for runtime introspection of registered
+SCRIPT blocks.
 """
 
 from pathlib import Path
@@ -214,50 +214,54 @@ def _format_script_source(span: Any) -> str:
 
 
 # ---------------------------------------------------------------------------
-# SHOW SCRIPTS / SHOW SCRIPT metacommand handlers
+# SHOW SCRIPTS metacommand handler
 # ---------------------------------------------------------------------------
 
 
 def x_show_scripts(**kwargs: Any) -> None:
-    """List all registered SCRIPT definitions with parameters and source location."""
-    scripts = _state.ast_scripts
-    if not scripts:
-        _state.output.write("No scripts registered.\n")
-        return
-    _state.output.write(f"Registered scripts ({len(scripts)}):\n\n")
-    # Compute column width for alignment
-    sigs = {name: _format_script_signature(name, block.param_defs) for name, block in scripts.items()}
-    max_sig = max(len(s) for s in sigs.values())
-    for name, block in scripts.items():
-        sig = sigs[name]
-        src = _format_script_source(block.span)
-        _state.output.write(f"  {sig:<{max_sig}}  {src}\n")
-    _state.output.write("\n")
+    """List all registered scripts, or show detail for one script.
 
-
-def x_show_script(**kwargs: Any) -> None:
-    """Show detail for a single registered SCRIPT definition."""
-    script_name = kwargs.get("script_id", "").lower()
+    Without a name argument, lists all registered SCRIPT definitions with
+    their parameter signatures and source locations.  With a name, shows
+    detail for that script including parameters, source, and docstring.
+    """
+    script_name = (kwargs.get("script_id") or "").strip().lower()
     scripts = _state.ast_scripts
-    if script_name not in scripts:
-        _state.output.write(f"No script named '{script_name}' is registered.\n")
-        return
-    block = scripts[script_name]
-    sig = _format_script_signature(block.name, block.param_defs)
-    src = _format_script_source(block.span)
-    _state.output.write(f"Script: {sig}\n")
-    _state.output.write(f"Source: {src}\n")
-    if block.param_defs:
-        _state.output.write("Parameters:\n")
-        max_name = max(len(p.name) for p in block.param_defs)
-        for p in block.param_defs:
-            if p.default is not None:
-                _state.output.write(f"  {p.name:<{max_name}}  (optional, default: {p.default})\n")
-            else:
-                _state.output.write(f"  {p.name:<{max_name}}  (required)\n")
+
+    if script_name:
+        # ---------- detail for one script ----------
+        if script_name not in scripts:
+            _state.output.write(f"No script named '{script_name}' is registered.\n")
+            return
+        block = scripts[script_name]
+        sig = _format_script_signature(block.name, block.param_defs)
+        src = _format_script_source(block.span)
+        _state.output.write(f"Script: {sig}\n")
+        _state.output.write(f"Source: {src}\n")
+        if block.param_defs:
+            _state.output.write("Parameters:\n")
+            max_name = max(len(p.name) for p in block.param_defs)
+            for p in block.param_defs:
+                if p.default is not None:
+                    _state.output.write(f"  {p.name:<{max_name}}  (optional, default: {p.default})\n")
+                else:
+                    _state.output.write(f"  {p.name:<{max_name}}  (required)\n")
+        else:
+            _state.output.write("Parameters: (none)\n")
+        if block.doc:
+            _state.output.write("\n")
+            for doc_line in block.doc.split("\n"):
+                _state.output.write(f"  {doc_line}\n")
     else:
-        _state.output.write("Parameters: (none)\n")
-    if block.doc:
+        # ---------- list all scripts ----------
+        if not scripts:
+            _state.output.write("No scripts registered.\n")
+            return
+        _state.output.write(f"Registered scripts ({len(scripts)}):\n\n")
+        sigs = {name: _format_script_signature(name, block.param_defs) for name, block in scripts.items()}
+        max_sig = max(len(s) for s in sigs.values())
+        for name, block in scripts.items():
+            sig = sigs[name]
+            src = _format_script_source(block.span)
+            _state.output.write(f"  {sig:<{max_sig}}  {src}\n")
         _state.output.write("\n")
-        for doc_line in block.doc.split("\n"):
-            _state.output.write(f"  {doc_line}\n")

{execsql2-2.16.13 → execsql2-2.16.15}/src/execsql/metacommands/dispatch.py

@@ -99,7 +99,6 @@ from execsql.metacommands.debug import (
     x_debug_write_metacommands,
     x_debug_write_odbc_drivers,
     x_debug_write_subvars,
-    x_show_script,
     x_show_scripts,
 )
 from execsql.debug.repl import x_breakpoint
@@ -1750,20 +1749,14 @@ def build_dispatch_table() -> MetaCommandList:
     )
 
     # ------------------------------------------------------------------
-    # SHOW SCRIPTS / SHOW SCRIPT
+    # SHOW SCRIPTS [<name>]
     # ------------------------------------------------------------------
     mcl.add(
-        r"^\s*SHOW\s+SCRIPTS\s*$",
+        r"^\s*SHOW\s+SCRIPTS\s*(?P<script_id>\w+)?\s*$",
         x_show_scripts,
         description="SHOW SCRIPTS",
         category="action",
     )
-    mcl.add(
-        r"^\s*SHOW\s+SCRIPT\s+(?P<script_id>\w+)\s*$",
-        x_show_script,
-        description="SHOW SCRIPT",
-        category="action",
-    )
 
     # ------------------------------------------------------------------
     # IF / ORIF / ANDIF / ELSEIF / ELSE / ENDIF

{execsql2-2.16.13 → execsql2-2.16.15}/src/execsql/metacommands/io_export.py

@@ -136,16 +136,20 @@ def _dispatch_format(
             raise
         except Exception as e:
             raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
-        if filefmt == "raw":
-            write_query_raw(outfile, rows, db.encoding, append, zipfile=zipfilename)
-        elif filefmt == "b64":
-            write_query_b64(outfile, rows, append, zipfile=zipfilename)
-        elif filefmt == "feather":
-            write_query_to_feather(outfile, hdrs, rows)
-        elif filefmt == "parquet":
-            write_query_to_parquet(outfile, hdrs, rows)
-        else:
-            write_delimited_file(outfile, filefmt, hdrs, rows, _state.conf.output_encoding, append, zipfilename)
+        try:
+            if filefmt == "raw":
+                write_query_raw(outfile, rows, db.encoding, append, zipfile=zipfilename)
+            elif filefmt == "b64":
+                write_query_b64(outfile, rows, append, zipfile=zipfilename)
+            elif filefmt == "feather":
+                write_query_to_feather(outfile, hdrs, rows)
+            elif filefmt == "parquet":
+                write_query_to_parquet(outfile, hdrs, rows)
+            else:
+                write_delimited_file(outfile, filefmt, hdrs, rows, _state.conf.output_encoding, append, zipfilename)
+        except BaseException:
+            rows.close()
+            raise
 
 
 # ---------------------------------------------------------------------------

{execsql2-2.16.13 → execsql2-2.16.15}/src/execsql/metacommands/io_fileops.py

@@ -106,10 +106,9 @@ def x_copy(**kwargs: Any) -> None:
     try:
         db2.populate_table(schema2, table2, rows, hdrs, get_ts)
         db2.commit()
-    except ErrInfo:
+    except BaseException:
+        rows.close()
         raise
-    except Exception as e:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
 
 
 def x_copy_query(**kwargs: Any) -> None:
@@ -181,10 +180,9 @@ def x_copy_query(**kwargs: Any) -> None:
     try:
         db2.populate_table(schema2, table2, rows, hdrs, get_ts)
         db2.commit()
-    except ErrInfo:
+    except BaseException:
+        rows.close()
         raise
-    except Exception as e:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
 
 
 def x_zip(**kwargs: Any) -> None:

{execsql2-2.16.13 → execsql2-2.16.15}/src/execsql/script/ast.py

@@ -209,11 +209,14 @@ class ElseIfClause:
     Attributes:
         condition: The condition expression text (e.g. ``"HAS_ROWS"``).
         span: Source location of the ELSEIF line itself.
+        condition_modifiers: ANDIF/ORIF modifiers that compound the ELSEIF
+            condition, evaluated left-to-right at runtime.
         body: Nodes executed when this condition is true.
     """
 
     condition: str
     span: SourceSpan
+    condition_modifiers: list[ConditionModifier] = field(default_factory=list)
     body: list[Node] = field(default_factory=list)
 
 

{execsql2-2.16.13 → execsql2-2.16.15}/src/execsql/script/executor.py

@@ -384,6 +384,12 @@ def _execute_node(
         ctx.last_command = _FakeScriptCmd(node)
         _execute_include(ctx, node, localvars)
 
+    else:
+        raise ErrInfo(
+            type="error",
+            other_msg=f"Unhandled AST node type: {type(node).__name__} at {node.span}",
+        )
+
 
 # ---------------------------------------------------------------------------
 # Block executors
@@ -404,9 +410,7 @@ def _execute_if(
 
     # Try ELSEIF clauses
     for clause in node.elseif_clauses:
-        effective_locals = _stack_localvars(ctx)
-        expanded = substitute_vars(clause.condition, effective_locals, ctx=ctx)
-        if xcmd_test(expanded):
+        if _eval_condition(ctx, clause.condition, clause.condition_modifiers):
             _execute_nodes(ctx, clause.body, node.span.file, localvars, in_loop=in_loop)
             return
 

{execsql2-2.16.13 → execsql2-2.16.15}/src/execsql/script/parser.py

@@ -580,14 +580,17 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                         command_text=line,
                         other_msg=f"ANDIF without matching IF on line {file_lineno} of {source_name}.",
                     )
-                if_node = block_stack[-1].node
-                if_node.condition_modifiers.append(  # type: ignore[union-attr]
-                    ConditionModifier(
-                        kind="AND",
-                        condition=m.group("cond").strip(),
-                        span=SourceSpan(source_name, file_lineno),
-                    ),
+                modifier = ConditionModifier(
+                    kind="AND",
+                    condition=m.group("cond").strip(),
+                    span=SourceSpan(source_name, file_lineno),
                 )
+                frame = block_stack[-1]
+                if_node = frame.node
+                if frame._in_elseif and if_node.elseif_clauses:  # type: ignore[union-attr]
+                    if_node.elseif_clauses[-1].condition_modifiers.append(modifier)  # type: ignore[union-attr]
+                else:
+                    if_node.condition_modifiers.append(modifier)  # type: ignore[union-attr]
                 continue
 
             # -- ORIF --
@@ -599,14 +602,17 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                         command_text=line,
                         other_msg=f"ORIF without matching IF on line {file_lineno} of {source_name}.",
                     )
-                if_node = block_stack[-1].node
-                if_node.condition_modifiers.append(  # type: ignore[union-attr]
-                    ConditionModifier(
-                        kind="OR",
-                        condition=m.group("cond").strip(),
-                        span=SourceSpan(source_name, file_lineno),
-                    ),
+                modifier = ConditionModifier(
+                    kind="OR",
+                    condition=m.group("cond").strip(),
+                    span=SourceSpan(source_name, file_lineno),
                 )
+                frame = block_stack[-1]
+                if_node = frame.node
+                if frame._in_elseif and if_node.elseif_clauses:  # type: ignore[union-attr]
+                    if_node.elseif_clauses[-1].condition_modifiers.append(modifier)  # type: ignore[union-attr]
+                else:
+                    if_node.condition_modifiers.append(modifier)  # type: ignore[union-attr]
                 continue
 
             # -- ELSE --

{execsql2-2.16.13 → execsql2-2.16.15}/tests/metacommands/test_show_scripts.py

@@ -1,4 +1,4 @@
-"""Unit tests for SHOW SCRIPTS / SHOW SCRIPT metacommand handlers and helpers."""
+"""Unit tests for SHOW SCRIPTS metacommand handler and helpers."""
 
 from __future__ import annotations
 
@@ -10,7 +10,6 @@ import pytest
 from execsql.metacommands.debug import (
     _format_script_signature,
     _format_script_source,
-    x_show_script,
     x_show_scripts,
 )
 from execsql.script.ast import ParamDef, ScriptBlock, SourceSpan
@@ -93,7 +92,9 @@ def mock_state(monkeypatch):
     return state
 
 
-class TestShowScriptsHandler:
+class TestShowScriptsListAll:
+    """SHOW SCRIPTS with no name argument lists all scripts."""
+
     def test_empty(self, mock_state):
         x_show_scripts(metacommandline="SHOW SCRIPTS")
         assert "No scripts registered" in mock_state.output.getvalue()
@@ -117,14 +118,16 @@ class TestShowScriptsHandler:
         assert "load(schema, batch=1000)" in mock_state.output.getvalue()
 
 
-class TestShowScriptHandler:
+class TestShowScriptsDetail:
+    """SHOW SCRIPTS <name> shows detail for one script."""
+
     def test_not_found(self, mock_state):
-        x_show_script(script_id="nonexistent", metacommandline="SHOW SCRIPT nonexistent")
+        x_show_scripts(script_id="nonexistent", metacommandline="SHOW SCRIPTS nonexistent")
         assert "No script named" in mock_state.output.getvalue()
 
     def test_detail_no_params(self, mock_state):
         mock_state.ast_scripts = {"proc": _make_script("proc")}
-        x_show_script(script_id="proc", metacommandline="SHOW SCRIPT proc")
+        x_show_scripts(script_id="proc", metacommandline="SHOW SCRIPTS proc")
         output = mock_state.output.getvalue()
         assert "proc()" in output
         assert "Parameters: (none)" in output
@@ -133,7 +136,7 @@ class TestShowScriptHandler:
         mock_state.ast_scripts = {
             "load": _make_script("load", [ParamDef("schema"), ParamDef("batch", "1000")]),
         }
-        x_show_script(script_id="load", metacommandline="SHOW SCRIPT load")
+        x_show_scripts(script_id="load", metacommandline="SHOW SCRIPTS load")
         output = mock_state.output.getvalue()
         assert "load(schema, batch=1000)" in output
         assert "(required)" in output
@@ -143,12 +146,19 @@ class TestShowScriptHandler:
         mock_state.ast_scripts = {
             "proc": _make_script("proc", doc="This is the docstring.\nSecond line."),
         }
-        x_show_script(script_id="proc", metacommandline="SHOW SCRIPT proc")
+        x_show_scripts(script_id="proc", metacommandline="SHOW SCRIPTS proc")
         output = mock_state.output.getvalue()
         assert "This is the docstring." in output
         assert "Second line." in output
 
     def test_case_insensitive_lookup(self, mock_state):
         mock_state.ast_scripts = {"myproc": _make_script("myproc")}
-        x_show_script(script_id="MYPROC", metacommandline="SHOW SCRIPT MYPROC")
+        x_show_scripts(script_id="MYPROC", metacommandline="SHOW SCRIPTS MYPROC")
         assert "myproc()" in mock_state.output.getvalue()
+
+    def test_no_script_id_kwarg_lists_all(self, mock_state):
+        """When script_id is not provided at all, list all scripts."""
+        mock_state.ast_scripts = {"proc": _make_script("proc")}
+        x_show_scripts(metacommandline="SHOW SCRIPTS")
+        output = mock_state.output.getvalue()
+        assert "Registered scripts (1)" in output