execsql2 2.11.0__tar.gz → 2.11.1__tar.gz

{execsql2-2.11.0 → 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.11.0 → execsql2-2.11.1}/CHANGELOG.md

@@ -13,6 +13,28 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.11.0
+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,8 +220,11 @@ 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                     |
@@ -298,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.11.0 → execsql2-2.11.1}/README.md

@@ -110,8 +110,11 @@ 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                     |
@@ -188,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.11.0 → execsql2-2.11.1}/docs/about/divergence.md

@@ -33,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).                      |

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.11.0"
+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.11.0"
+current_version = "2.11.1"
 commit = true
 commit_args = "--no-verify"
 tag = true

{execsql2-2.11.0 → 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.11.0 → 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
 

{execsql2-2.11.0 → 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.11.0 → 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.11.0 → 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.11.0 → 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] == "_":

{execsql2-2.11.0 → execsql2-2.11.1}/src/execsql/metacommands/debug_repl.py

@@ -98,13 +98,14 @@ def _debug_repl() -> None:
 
         # Dot-prefixed → REPL command
         if line.startswith("."):
+            cmd = line[1:].strip().lower()
             _handle_dot_command(line)
-            if line.lower().lstrip(".") in ("continue", "c"):
+            if cmd in ("continue", "c"):
                 return
-            if line.lower().lstrip(".") in ("abort", "q", "quit"):
+            if cmd in ("abort", "q", "quit"):
                 # _handle_dot_command already raised SystemExit, but guard anyway
                 return
-            if line.lower().lstrip(".") in ("next", "n"):
+            if cmd in ("next", "n"):
                 return
             continue
 

{execsql2-2.11.0 → execsql2-2.11.1}/src/execsql/script/engine.py

@@ -194,7 +194,7 @@ class MetaCommandList:
         patterns; each compiles into a separate :class:`MetaCommand` prepended to
         the dispatch list so that later registrations take priority.
         """
-        if type(matching_regexes) in (tuple, list):
+        if isinstance(matching_regexes, (tuple, list)):
             raw_patterns = list(matching_regexes)
             regexes = [re.compile(rx, re.I) for rx in raw_patterns]
         else:
@@ -305,9 +305,14 @@ class SqlStmt:
             except Exception:
                 e = ErrInfo(type="exception", exception_msg=exception_desc())
             if e:
+                from execsql.utils.errors import stamp_errinfo
+
+                stamp_errinfo(e)
                 _state.subvars.add_substitution("$LAST_ERROR", cmd)
-                _state.subvars.add_substitution("$ERROR_MESSAGE", str(e))
+                _state.subvars.add_substitution("$ERROR_MESSAGE", e.errmsg())
                 _state.status.sql_error = True
+                if _state.exec_log is not None:
+                    _state.exec_log.log_status_info(f"SQL error: {e.errmsg()}")
                 if _state.status.halt_on_err:
                     from execsql.utils.errors import exit_now
 
@@ -349,9 +354,14 @@ class MetacommandStmt:
         except Exception:
             e = ErrInfo(type="exception", exception_msg=exception_desc())
         if e:
+            from execsql.utils.errors import stamp_errinfo
+
+            stamp_errinfo(e)
             _state.status.metacommand_error = True
             _state.subvars.add_substitution("$LAST_ERROR", cmd)
-            _state.subvars.add_substitution("$ERROR_MESSAGE", str(e))
+            _state.subvars.add_substitution("$ERROR_MESSAGE", e.errmsg())
+            if _state.exec_log is not None:
+                _state.exec_log.log_status_info(f"Metacommand error: {e.errmsg()}")
             if _state.status.halt_on_metacommand_err:
                 # Re-raise the original ErrInfo so its message is preserved, not
                 # replaced with the generic "Unknown metacommand" text.

{execsql2-2.11.0 → execsql2-2.11.1}/src/execsql/state.py

@@ -336,8 +336,7 @@ class _StateModule(types.ModuleType):
             # via setattr (local) or delattr (non-local).  Since context
             # attrs live on _ctx, not __dict__, patch takes the delattr
             # path.  We reset to the default rather than truly deleting.
-            _defaults = RuntimeContext()
-            setattr(self.__dict__["_ctx"], name, getattr(_defaults, name))
+            setattr(self.__dict__["_ctx"], name, getattr(_DEFAULT_CTX, name))
         else:
             super().__delattr__(name)
 
@@ -468,4 +467,5 @@ def initialize(
 # ---------------------------------------------------------------------------
 
 _ctx = RuntimeContext()
+_DEFAULT_CTX = RuntimeContext()  # Cached defaults for __delattr__ reset
 sys.modules[__name__].__class__ = _StateModule

{execsql2-2.11.0 → execsql2-2.11.1}/src/execsql/utils/gui.py

@@ -358,13 +358,35 @@ def gui_console_wait_user(message: str = "") -> None:
         print(message, file=sys.stderr)
 
 
-def gui_console_width() -> int:
-    """Return the current console width in characters."""
+def gui_console_width(width: int | None = None) -> int:
+    """Get or set the console width in characters.
+
+    When *width* is provided, updates the active GUI console (if any).
+    Always returns the current width.
+    """
+    global _console_width
+    if width is not None:
+        import execsql.state as _state
+
+        _console_width = int(width)
+        if _state.gui_console is not None and hasattr(_state.gui_console, "set_width"):
+            _state.gui_console.set_width(_console_width)
     return _console_width
 
 
-def gui_console_height() -> int:
-    """Return the current console height in lines."""
+def gui_console_height(height: int | None = None) -> int:
+    """Get or set the console height in lines.
+
+    When *height* is provided, updates the active GUI console (if any).
+    Always returns the current height.
+    """
+    global _console_height
+    if height is not None:
+        import execsql.state as _state
+
+        _console_height = int(height)
+        if _state.gui_console is not None and hasattr(_state.gui_console, "set_height"):
+            _state.gui_console.set_height(_console_height)
     return _console_height
 
 

{execsql2-2.11.0 → execsql2-2.11.1}/tests/metacommands/test_metacommands_extended.py

@@ -866,11 +866,9 @@ class TestControlHandlers:
         assert len(_state.loopcommandstack) == 1
 
     def test_endloop_without_loop_raises(self):
-        from execsql.metacommands.control import endloop
-
         _state.loopcommandstack = []
         with pytest.raises(ErrInfo):
-            endloop()
+            _state.endloop()
 
 
 # ---------------------------------------------------------------------------

{execsql2-2.11.0 → execsql2-2.11.1}/uv.lock

@@ -657,7 +657,7 @@ wheels = [
 
 [[package]]
 name = "execsql2"
-version = "2.11.0"
+version = "2.11.1"
 source = { editable = "." }
 dependencies = [
     { name = "rich" },