execsql2 2.10.1__tar.gz → 2.11.1__tar.gz

{execsql2-2.10.1 → execsql2-2.11.1}/.claude/project_context.md

@@ -189,10 +189,10 @@ Triggered on: push to `main`, any tag `v*.*.*`, pull requests.
 
 ## Versioning
 
-`bump-my-version` manages versions. Current: `2.5.0`. Bump commands:
+`bump-my-version` manages versions. Current: `2.11.0`. Bump commands:
 
-- `just bump-patch` → 2.5.0 → 2.5.1
-- `just bump-minor` → 2.5.0 → 2.6.0
+- `just bump-patch` → 2.11.0 → 2.11.1
+- `just bump-minor` → 2.11.0 → 2.12.0
   Bumps commit + tag. Pre-commit hook runs `uv lock` + stages `uv.lock`.
 
 ## Ruff Config
@@ -254,16 +254,32 @@ the foreseeable future.
 | Dispatch optimization already in place (verified) | 2.5.0          | 2026-04 |
 | PostgreSQL integration tests (9 tests, CI Docker) | 2.5.0          | 2026-04 |
 | MySQL integration tests (9 tests, CI Docker)      | 2.5.0          | 2026-04 |
+| `RuntimeContext` refactor + module proxy           | 2.6.0          | 2026-04 |
+| `noqa` cleanup (180 suppressions removed)          | 2.6.0          | 2026-04 |
+| Coverage raised to 86% (3010 tests)                | 2.6.0          | 2026-04 |
+| Markdown, YAML, XLSX export formats                | 2.7.0          | 2026-04 |
+| `ASSERT` metacommand                               | 2.8.0          | 2026-04 |
+| `--dry-run` variable expansion                     | 2.8.0          | 2026-04 |
+| `--profile` per-statement timing                   | 2.8.0          | 2026-04 |
+| `--ping` connectivity test                         | 2.9.0          | 2026-04 |
+| `--lint` static script analysis                    | 2.9.0          | 2026-04 |
+| Configuration docs audit (6 fixes)                 | 2.9.0          | 2026-04 |
+| `ROW_COUNT_GT/GTE/EQ/LT` conditionals             | 2.10.0         | 2026-04 |
+| `BREAKPOINT` debug REPL with step mode             | 2.10.0         | 2026-04 |
+| Error messages restored (script location, command) | 2.11.0         | 2026-04 |
+| 16-item codebase analysis fix sweep                | 2.11.x         | 2026-04 |
 
 ______________________________________________________________________
 
-### v2.6 — Architecture & Internal Quality
+### Completed milestone detail (v2.6–v2.11)
 
-- [x] **`state.py` → `RuntimeContext` refactor** — 33 mutable globals consolidated into a slotted `RuntimeContext` class with transparent module proxy. `get_context()`/`set_context()` API added. Zero external call-site changes.
-- [x] **`noqa` cleanup in `metacommands/__init__.py`** — removed all 180 redundant `# noqa` comments; `__all__` already satisfies ruff F401.
-- [x] **Coverage push to 86%** — 403 new tests (3010 total) covering `db/base.py` (55→99%), `metacommands/connect.py` (36→100%), `script/engine.py` (77→95%), `exporters/delimited.py` (76→95%). Remaining gap to 90% is in GUI, ODS, and import handlers.
+#### v2.6 — Architecture & Internal Quality
 
-### v2.7 — New Export/Import Formats
+- [x] `state.py` → `RuntimeContext` refactor
+- [x] `noqa` cleanup in `metacommands/__init__.py`
+- [x] Coverage push to 86%
+
+#### v2.7 — New Export/Import Formats
 
 - [x] **Parquet import** — already existed as `IMPORT TO table FROM PARQUET file` (verified present).
 - [x] **YAML export** — `FORMAT YAML` via PyYAML, list-of-dicts with native type preservation.

{execsql2-2.10.1 → execsql2-2.11.1}/CHANGELOG.md

@@ -13,6 +13,49 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.11.1] - 2026-04-01
+
+### Fixed
+
+- `x_assert` crash when `exec_log` is None — added null guard on `log_user_msg()` call.
+- `--ping` version-query loop exiting prematurely — `break` was at wrong indentation, skipping fallback queries when the first query returned no rows.
+- `CONSOLE SET WIDTH/HEIGHT` crash — `gui_console_width()`/`gui_console_height()` restored as setter functions with GUI console propagation.
+- `$ERROR_MESSAGE` now contains full `errmsg()` (with script location and timestamp) for non-halting errors.
+- Non-halting SQL and metacommand errors now logged to exec_log.
+- `x_debug_log_subvars` log format — was printing full tuple instead of name/value for local variables.
+- Dead `endloop()` removed from `control.py` — `state.endloop()` is canonical.
+- YAML `append=True` now emits `---` document separator for valid multi-document streams.
+- REPL dot-command parsing consistency between dispatcher and exit-check.
+- `__delattr__` on state proxy uses cached `_DEFAULT_CTX` instead of allocating per call.
+- `write_query_to_xlsx` single-sheet now updates `export_metadata`.
+- `isinstance()` used instead of `type()` equality in `MetaCommandList.add()`.
+- Module docstrings in `conditions.py` and `control.py` moved before imports.
+- FEATHER divergence doc corrected — `polars` only, not `polars + pyarrow`.
+- README pre-commit rev updated to `v2.11.0`; options table completed.
+
+______________________________________________________________________
+
+## [2.11.0] - 2026-04-01
+
+### Added
+
+- `--debug` CLI flag — starts the script in step-through debug mode. The debug REPL pauses before each statement, as if `BREAKPOINT` were inserted at the top with `.next` always active.
+
+### Changed
+
+- BREAKPOINT debug REPL now pauses **before** each statement instead of after, so the upcoming statement can be inspected before it runs.
+
+### Fixed
+
+- BREAKPOINT REPL no longer wraps variable values in extra single quotes — values are now displayed exactly as defined.
+- Error messages now include script file name and line number — `ErrInfo` fields `script_file` and `script_line_no` are populated via a new `stamp_errinfo()` helper called from `exit_now()` and metacommand error paths, restoring monolith-level "Line N of script foo.sql" context in all error output.
+- `$ERROR_MESSAGE` substitution variable is now updated on every error: in `exit_now()`, in non-halting SQL errors (`SqlStmt.run()`), and in non-halting metacommand errors (`MetacommandStmt.run()`). Previously it was initialized to `""` and never changed.
+- `MetacommandStmt.run()` now re-raises the original handler `ErrInfo` when `halt_on_metacommand_err` is True, instead of discarding it and raising a generic "Unknown metacommand" error.
+- `write_warning()` now accepts an `always=True` keyword argument that bypasses the `conf.write_warnings` gate, ensuring structural warnings (IF-level mismatch, unsubstituted variables) are always visible on stderr.
+- Uncaught-exception error message in `_execute_script_direct()` and `_execute_script_textual_console()` no longer appends "in script , line 0" when `current_script_line()` returns an empty string.
+
+______________________________________________________________________
+
 ## [2.10.1] - 2026-04-01
 
 ### Fixed

{execsql2-2.10.1 → execsql2-2.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.10.1
+Version: 2.11.1
 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: Repository, https://github.com/geocoug/execsql
 Project-URL: Issues, https://github.com/geocoug/execsql/issues
@@ -220,9 +220,13 @@ execsql script.sql                          # read connection from config file
 | `-v {0,1,2,3}`                      | GUI level (0=none, 1=password, 2=selection, 3=full)             |
 | `-w`                                | Skip password prompt when a username is supplied                |
 | `--dsn URL`                         | Connection string (e.g. `postgresql://user:pass@host/db`)       |
+| `--output-dir DIR`                  | Default base directory for EXPORT output files                  |
 | `--dry-run`                         | Parse the script and report commands without executing          |
 | `--lint`                            | Static analysis: check structure and warn on issues (no DB)     |
+| `--ping`                            | Test database connectivity and exit                             |
+| `--profile`                         | Show per-statement timing summary after execution               |
 | `--progress`                        | Show a progress bar for long-running IMPORT operations          |
+| `--debug`                           | Start in step-through debug mode (REPL pauses before each stmt) |
 | `--dump-keywords`                   | Print metacommand keywords as JSON and exit                     |
 | `--gui-framework {tkinter,textual}` | GUI framework for interactive prompts                           |
 
@@ -297,7 +301,7 @@ execsql-format --check scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.4.4
+    rev: v2.11.0
     hooks:
       - id: execsql-format
         args: [--in-place]

{execsql2-2.10.1 → execsql2-2.11.1}/README.md

@@ -110,9 +110,13 @@ execsql script.sql                          # read connection from config file
 | `-v {0,1,2,3}`                      | GUI level (0=none, 1=password, 2=selection, 3=full)             |
 | `-w`                                | Skip password prompt when a username is supplied                |
 | `--dsn URL`                         | Connection string (e.g. `postgresql://user:pass@host/db`)       |
+| `--output-dir DIR`                  | Default base directory for EXPORT output files                  |
 | `--dry-run`                         | Parse the script and report commands without executing          |
 | `--lint`                            | Static analysis: check structure and warn on issues (no DB)     |
+| `--ping`                            | Test database connectivity and exit                             |
+| `--profile`                         | Show per-statement timing summary after execution               |
 | `--progress`                        | Show a progress bar for long-running IMPORT operations          |
+| `--debug`                           | Start in step-through debug mode (REPL pauses before each stmt) |
 | `--dump-keywords`                   | Print metacommand keywords as JSON and exit                     |
 | `--gui-framework {tkinter,textual}` | GUI framework for interactive prompts                           |
 
@@ -187,7 +191,7 @@ execsql-format --check scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.4.4
+    rev: v2.11.0
     hooks:
       - id: execsql-format
         args: [--in-place]

{execsql2-2.10.1 → execsql2-2.11.1}/docs/about/divergence.md

@@ -22,6 +22,7 @@ ______________________________________________________________________
 | `--progress`                    | Show a Rich progress bar during long-running IMPORT operations.                                                                                                                                                                                                                                                                         |
 | `--dump-keywords`               | Emit all metacommand keywords, conditionals, config options, and export formats as structured JSON.                                                                                                                                                                                                                                     |
 | `--gui-framework`               | Select GUI backend: `tkinter` (default) or `textual` (terminal UI).                                                                                                                                                                                                                                                                     |
+| `--debug`                       | Start in step-through debug mode. The debug REPL pauses before each statement, as if `BREAKPOINT` were at the top with `.next` always active.                                                                                                                                                                                           |
 | `--dry-run`                     | Parse the script and print the full command list without connecting to a database or executing anything. Substitution variables already populated at parse time (env vars, `--assign-arg` values, built-in start-time vars) are expanded in the output; execution-time variables (`$DB_NAME`, `$CURRENT_TIME`, etc.) remain unexpanded. |
 | `--profile`                     | Record wall-clock time for each SQL and metacommand statement. After the script completes, print a summary table sorted by elapsed time (descending), showing time, percentage of total, source location, command type, and a command preview. Top 20 slowest statements are shown.                                                     |
 | `--ping`                        | Test database connectivity and exit. Connects using the supplied connection parameters, queries for the server version, and prints a one-line success message (exit 0) or the error (exit 1). No script file argument is required.                                                                                                      |
@@ -32,7 +33,7 @@ ______________________________________________________________________
 | Format            | Description                                                                                                          |
 | ----------------- | -------------------------------------------------------------------------------------------------------------------- |
 | `PARQUET`         | Export query or table results to Apache Parquet via `polars`.                                                        |
-| `FEATHER`         | Export to Apache Feather/IPC via `polars` + `pyarrow` (upstream used `pandas`).                                      |
+| `FEATHER`         | Export to Apache Feather/IPC via `polars` (upstream used `pandas` + `pyarrow`).                                      |
 | `YAML`            | Export query or table results as a YAML sequence of mappings via `PyYAML`.                                           |
 | `MARKDOWN` / `MD` | Export query or table results as a GitHub-Flavored Markdown (GFM) pipe table. Pure Python, no optional dependencies. |
 | `XLSX`            | Export query or table results to an Excel XLSX workbook via `openpyxl` (single or multi-sheet).                      |
@@ -167,13 +168,17 @@ These are behavioral changes driven by security or correctness issues in the ups
 
 ### Bug Fixes
 
-| Area                              | Fix                                                                                                        |
-| --------------------------------- | ---------------------------------------------------------------------------------------------------------- |
-| Oracle default port               | Corrected from `5432` (PostgreSQL) to `1521`.                                                              |
-| MySQL `LOAD DATA INFILE` encoding | Python encoding names are now mapped to MySQL charset names.                                               |
-| `dt_cast` type converters         | Base `Database` class auto-populates 8 type converters that were previously left empty after the refactor. |
-| `FileWriter` CPU busy-loop        | Uses blocking `queue.get(timeout=0.1)` instead of `get_nowait()` in a tight loop.                          |
-| Substitution variable cycles      | 100-iteration limit prevents infinite loops on cyclic variable references.                                 |
+| Area                              | Fix                                                                                                                                                                                           |
+| --------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Oracle default port               | Corrected from `5432` (PostgreSQL) to `1521`.                                                                                                                                                 |
+| MySQL `LOAD DATA INFILE` encoding | Python encoding names are now mapped to MySQL charset names.                                                                                                                                  |
+| `dt_cast` type converters         | Base `Database` class auto-populates 8 type converters that were previously left empty after the refactor.                                                                                    |
+| `FileWriter` CPU busy-loop        | Uses blocking `queue.get(timeout=0.1)` instead of `get_nowait()` in a tight loop.                                                                                                             |
+| Substitution variable cycles      | 100-iteration limit prevents infinite loops on cyclic variable references.                                                                                                                    |
+| Script location in error messages | `ErrInfo.script_file` and `script_line_no` are now populated via `stamp_errinfo()` so error output includes "Line N of script foo.sql" context — restoring behavior present in the monolith.  |
+| `$ERROR_MESSAGE` not updated      | `$ERROR_MESSAGE` is now set on every error path: `exit_now()`, non-halting SQL errors, and non-halting metacommand errors. Previously it was initialized to `""` and never changed.           |
+| Metacommand error message lost    | When `halt_on_metacommand_err` is `ON`, the original handler `ErrInfo` is now re-raised; the generic "Unknown metacommand" message no longer replaces the specific error from the handler.    |
+| 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. |
 
 ______________________________________________________________________
 

{execsql2-2.10.1 → execsql2-2.11.1}/docs/getting-started/syntax.md

@@ -224,6 +224,10 @@ Valid encoding names can be displayed with the `-y` option. See also [Character
     execsql --ping --dsn sqlite:///mydb.sqlite
     ```
 
+`--debug`
+
+:   Start in step-through debug mode. The debug REPL pauses before each statement, as if a `BREAKPOINT` metacommand were inserted at the top of the script with `.next` always active. Type `.continue` or `.c` at the REPL prompt to resume normal execution, or `.next` / `.n` to step one statement at a time. Silently skipped in non-TTY environments.
+
 `--profile`
 
 :   Record the wall-clock execution time of each SQL statement and metacommand. After the script finishes, print a summary table to the console showing elapsed time, percentage of total time, source file and line number, command type, and a preview of the command text. Statements are sorted from slowest to fastest; the top 20 are displayed. Useful for identifying slow queries or metacommands in long-running scripts.

{execsql2-2.10.1 → execsql2-2.11.1}/docs/reference/metacommands.md

@@ -127,20 +127,30 @@ Pauses script execution and drops into an interactive debug REPL (read-eval-prin
 
 **Non-interactive safety:** If `sys.stdin` is not a TTY (e.g. CI pipelines, piped input, batch execution) the metacommand is silently skipped. Scripts will never hang in automation.
 
-**REPL commands:**
+All REPL commands are dot-prefixed to avoid ambiguity with variable names and SQL. Anything without a dot prefix is treated as a variable lookup or SQL.
+
+**REPL commands (dot-prefixed):**
 
 | Command | Description |
 |---------|-------------|
-| `continue` or `c` | Resume script execution |
-| `abort`, `q`, or `quit` | Halt the script with exit status 1 |
-| `vars` | List all substitution variables and their current values |
-| `$VARNAME` | Print the value of a single variable (also `&VAR`, `@VAR`) |
-| `SELECT ...;` | Run an ad-hoc SQL query against the current database and pretty-print results |
-| `next` or `n` | Execute the next script statement, then pause again (step mode) |
-| `stack` | Show the command-list stack: script name, cursor index, and nesting depth |
-| `help` | Show the list of available REPL commands |
+| `.continue` or `.c` | Resume script execution |
+| `.abort` or `.q` | Halt the script with exit status 1 |
+| `.vars` | List user, system, local, and counter variables (grouped by type) |
+| `.vars all` | Include environment variables (`&`) in the listing |
+| `.next` or `.n` | Execute the next script statement, then pause again (step mode) |
+| `.stack` | Show the command-list stack: script name, cursor index, and nesting depth |
+| `.help` | Show the list of available REPL commands |
+
+**Variable inspection and SQL (no dot prefix):**
 
-Pressing Ctrl-D (EOF) or Ctrl-C (KeyboardInterrupt) at the `execsql debug>` prompt resumes execution, the same as typing `continue`.
+| Input | Description |
+|-------|-------------|
+| `logfile` | Print the value of the `logfile` variable |
+| `$ARG_1` | Print the value of a system/built-in variable |
+| `&HOME` | Print the value of an environment variable |
+| `SELECT ...;` | Run ad-hoc SQL against the current database and pretty-print results |
+
+Pressing Ctrl-D (EOF) or Ctrl-C (KeyboardInterrupt) at the `execsql debug>` prompt resumes execution, the same as typing `.continue`.
 
 **Example:**
 
@@ -153,6 +163,9 @@ SELECT count(*) FROM staging;
 
 BREAKPOINT is silently skipped inside a `False` [IF](#if_cmd) block.
 
+!!! tip
+    Use `execsql --debug script.sql` to start in step-through mode without adding a `BREAKPOINT` metacommand to your script. The REPL pauses before each statement.
+
 
 ## BEGIN BATCH and END BATCH { #batch }
 

{execsql2-2.10.1 → execsql2-2.11.1}/pyproject.toml

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

{execsql2-2.10.1 → execsql2-2.11.1}/src/execsql/cli/__init__.py

@@ -278,6 +278,11 @@ def main(
         "--profile",
         help="Record per-statement execution times and print a timing summary after the script completes.",
     ),
+    debug: bool = typer.Option(
+        False,
+        "--debug",
+        help="Start in step-through debug mode. The debug REPL pauses before each statement.",
+    ),
     version: bool | None = typer.Option(
         None,
         "--version",
@@ -446,6 +451,7 @@ def main(
         profile=profile,
         ping=ping,
         lint=lint,
+        debug=debug,
     )
 
 

{execsql2-2.10.1 → execsql2-2.11.1}/src/execsql/cli/lint.py

@@ -194,7 +194,7 @@ def _lint_cmdlist(
     for cmd in cmdlist.cmdlist:
         src = cmd.source
         lno = cmd.line_no
-        stmt = cmd.command.statement if cmd.command_type == "sql" else cmd.command.statement
+        stmt = cmd.command.statement
 
         if cmd.command_type == "sql":
             # SQL statements: check for variable references only

{execsql2-2.10.1 → execsql2-2.11.1}/src/execsql/cli/run.py

@@ -8,6 +8,7 @@ and drives the main execution loop.  Separated from argument parsing
 from __future__ import annotations
 
 import atexit
+from typing import Any
 import datetime
 import getpass
 import os
@@ -128,7 +129,7 @@ def _print_profile(profile_data: list[tuple]) -> None:
 # ---------------------------------------------------------------------------
 
 
-def _ping_db(db) -> None:
+def _ping_db(db: Any) -> None:
     """Test connectivity for *db*, print connection details, and exit.
 
     Attempts to execute ``SELECT version()`` (or ``SELECT sqlite_version()``
@@ -156,7 +157,7 @@ def _ping_db(db) -> None:
             curs.close()
             if row and row[0]:
                 version_str = str(row[0]).split("\n")[0].strip()
-            break
+                break
         except Exception:
             continue
 
@@ -214,6 +215,7 @@ def _run(
     profile: bool = False,
     ping: bool = False,
     lint: bool = False,
+    debug: bool = False,
 ) -> None:
     """Initialise state, connect to the database, load the script, and run it.
 
@@ -547,6 +549,9 @@ def _run(
     if profile:
         _state.profile_data = []
 
+    if debug:
+        _state.step_mode = True
+
     _execute_script_direct(conf, profile=profile)
 
 
@@ -653,7 +658,7 @@ def _execute_script_direct(conf: ConfigData, *, profile: bool = False) -> None:
         lno = strace[0][1]
         msg = f"{Path(sys.argv[0]).name}: Uncaught exception {sys.exc_info()[0]} ({sys.exc_info()[1]}) on line {lno}"
         script, slno = current_script_line()
-        if script is not None:
+        if script:
             msg += f" in script {script}, line {slno}"
         from execsql.utils.errors import exit_now
 

{execsql2-2.10.1 → execsql2-2.11.1}/src/execsql/exporters/xlsx.py

@@ -178,6 +178,11 @@ def write_query_to_xlsx(
     wb.save(outfile)
     wb.close()
 
+    if _state.export_metadata is not None:
+        _state.export_metadata.add(
+            ExportRecord(queryname=select_stmt, outfile=outfile, zipfile=None, description=desc),
+        )
+
 
 def write_queries_to_xlsx(
     table_list: str,

{execsql2-2.10.1 → execsql2-2.11.1}/src/execsql/exporters/yaml.py

@@ -82,6 +82,8 @@ def write_query_to_yaml(
         f = ZipWriter(zipfile, outfile, append)
 
     try:
+        if append:
+            f.write("---\n")
         f.write(yaml_text)
     finally:
         f.close()

{execsql2-2.10.1 → execsql2-2.11.1}/src/execsql/metacommands/control.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from execsql.exceptions import ErrInfo
 
 """
 Control-flow metacommand handlers for execsql.
@@ -18,6 +17,8 @@ Implements the imperative ``x_*`` functions for script flow control:
 """
 
 import time
+
+from execsql.exceptions import ErrInfo
 from typing import Any
 
 import execsql.state as _state
@@ -62,7 +63,8 @@ def x_assert(**kwargs: Any) -> None:
 
     result = _state.xcmd_test(condition)
     if result:
-        _state.exec_log.log_user_msg(f"ASSERT passed: {condition}")
+        if _state.exec_log is not None:
+            _state.exec_log.log_user_msg(f"ASSERT passed: {condition}")
     else:
         raise ErrInfo(type="cmd", other_msg=message)
 
@@ -134,14 +136,6 @@ def x_loop(**kwargs: Any) -> None:
         )
 
 
-def endloop() -> None:
-    if len(_state.loopcommandstack) == 0:
-        raise ErrInfo("error", other_msg="END LOOP metacommand without a matching preceding LOOP metacommand.")
-    _state.compiling_loop = False
-    _state.commandliststack.append(_state.loopcommandstack[-1])
-    _state.loopcommandstack.pop()
-
-
 def x_halt(**kwargs: Any) -> None:
     errmsg = kwargs["errmsg"]
     tee = kwargs["tee"]

{execsql2-2.10.1 → execsql2-2.11.1}/src/execsql/metacommands/debug.py

@@ -74,7 +74,7 @@ def x_debug_log_subvars(**kwargs: Any) -> None:
     local = kwargs["local"]
     user = kwargs["user"]
     for s in _state.commandliststack[-1].localvars.substitutions:
-        _state.exec_log.log_status_info(f"Substitution [{s}] = [{s}]")
+        _state.exec_log.log_status_info(f"Substitution [{s[0]}] = [{s[1]}]")
     if local is None:
         for s in _state.subvars.substitutions:
             if user is None or s[0][0].isalnum() or s[0][0] == "_":