execsql2 2.15.8__tar.gz → 2.15.11__tar.gz

{execsql2-2.15.8 → execsql2-2.15.11}/.gitignore

@@ -35,6 +35,7 @@ htmlcov/
 execsql.log
 !scripts/generate_vscode_grammar.py
 scripts/
+!tests/scripts
 
 # Distribution
 *.whl
@@ -47,3 +48,4 @@ _execsql/
 .claude/
 ANALYSIS.md
 FINDINGS.md
+CLAUDE.md

{execsql2-2.15.8 → execsql2-2.15.11}/CHANGELOG.md

@@ -13,6 +13,48 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.15.11] - 2026-04-27
+
+### Fixed
+
+- `PAUSE` console-mode fallback now checks `sys.platform` before attempting POSIX terminal imports, preventing hangs on Windows when stdin reports as a TTY.
+
+______________________________________________________________________
+
+## [2.15.10] - 2026-04-27
+
+### Added
+
+- `--config FILE` CLI flag to specify an explicit configuration file. The file is loaded after the implicit search paths (system, user, script-dir, working-dir) so its values take precedence, while CLI arguments still override everything.
+- `$HOSTNAME` system substitution variable — the network name of the machine running execsql, useful for log messages and environment detection.
+
+### Fixed
+
+- Config file chaining no longer mutates a list during iteration; uses a deque for safe, predictable processing order.
+- REPL `_use_color()` result is now cached instead of re-checking environment variables and TTY status on every colorized output.
+- `DatabasePool.closeall()` no longer calls `self.__init__()` to reset state; fields are reset directly to avoid the re-initialization anti-pattern.
+- `PAUSE` console mode no longer crashes on Windows CI due to unconditional `import termios`; POSIX-only imports are now guarded by the TTY fallback check.
+- `HAS_ROWS()`, `ROW_COUNT_GT()`, `ROW_COUNT_GTE()`, `ROW_COUNT_EQ()`, and `ROW_COUNT_LT()` condition predicates now quote table names with standard SQL identifier quoting, preventing potential SQL injection when table names originate from substitution variables.
+- Corrected `__init__.py` module docstring that incorrectly described the CLI entry point as `execsql2` (the command is `execsql`).
+- Added note to configuration reference clarifying that `--output-dir` is a CLI-only option with no equivalent configuration file setting.
+
+______________________________________________________________________
+
+## [2.15.9] - 2026-04-27
+
+### Added
+
+- Textual TUI now displays a progress bar and remaining-time countdown for `PROMPT PAUSE` and `PAUSE` dialogs when the `CONTINUE AFTER` or `HALT AFTER` keywords specify a timed duration (matching existing Tkinter behavior).
+
+### Fixed
+
+- `PAUSE` metacommand in console mode (no `-v`) now responds to single keypresses (Enter to continue, Esc to quit) instead of requiring Enter after every key. Uses raw-mode terminal reading on POSIX and `msvcrt` polling on Windows.
+- `PAUSE` with `CONTINUE AFTER`/`HALT AFTER` in console mode now displays a live SIGALRM-driven progress bar showing time remaining, matching the documented behavior and terminal screenshot.
+- `PAUSE` progress bar output no longer bleeds into subsequent script output — the progress line is cleared before returning.
+- Fixed double minutes-to-seconds conversion in the console `PAUSE` path that caused a 1-minute pause to sleep for 60 minutes.
+
+______________________________________________________________________
+
 ## [2.15.8] - 2026-04-20
 
 ### Added

{execsql2-2.15.8 → execsql2-2.15.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.15.8
+Version: 2.15.11
 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
@@ -240,6 +240,7 @@ execsql script.sql                          # read connection from config file
 | `--ping`                            | Test database connectivity and exit                             |
 | `--profile`                         | Show per-statement timing summary after execution               |
 | `--progress`                        | Show a progress bar for long-running IMPORT operations          |
+| `--config FILE`                     | Load an explicit config file (highest priority after CLI args)  |
 | `--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                           |

{execsql2-2.15.8 → execsql2-2.15.11}/README.md

@@ -118,6 +118,7 @@ execsql script.sql                          # read connection from config file
 | `--ping`                            | Test database connectivity and exit                             |
 | `--profile`                         | Show per-statement timing summary after execution               |
 | `--progress`                        | Show a progress bar for long-running IMPORT operations          |
+| `--config FILE`                     | Load an explicit config file (highest priority after CLI args)  |
 | `--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                           |

{execsql2-2.15.8 → execsql2-2.15.11}/docs/about/divergence.md

@@ -21,6 +21,7 @@ ______________________________________________________________________
 | `--output-dir`                  | Set a default base directory for export output files.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | `--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.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+| `--config FILE`                 | Load an explicit configuration file after the implicit search paths. Its values take precedence over system, user, script-dir, and working-dir config files; CLI arguments still override everything. The file may chain additional configs via its `[config]` section.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | `--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.                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
@@ -175,6 +176,7 @@ All 33 mutable runtime globals in `state.py` have been consolidated into a `Runt
 
 ### Substitution Variables
 
+- **`$HOSTNAME`** — Network name of the machine running execsql (`platform.node()`). Useful for log messages and environment detection.
 - **`$SYSTEM_CMD_PID`** — New system variable set to the PID of the background process when `SHELL … CONTINUE` is used.
 - **Cycle detection** — `substitute_vars()` raises an error after 100 iterations to prevent infinite loops when variables reference each other cyclically. Upstream had no protection.
 - **O(1) substitution** — Variable substitution uses a single combined regex and dict lookup instead of O(V) per-variable regex passes. Behavior is identical; performance is improved.

{execsql2-2.15.8 → execsql2-2.15.11}/docs/reference/configuration.md

@@ -13,6 +13,8 @@ The name of the configuration file, in all locations, is `execsql.conf`.
 
 Configuration data is read from these files in the order listed above. Information in later files may augment or replace information in earlier files. Options and arguments specified on the command line will further augment or override information specified in the configuration files.
 
+An explicit configuration file can also be specified with the `--config FILE` command-line option. This file is loaded **after** all four implicit search paths, so its values take precedence over system, user, script-directory, and working-directory config files. CLI arguments still override everything. The `--config` file may chain additional configs via its `[config]` section, just like any other config file.
+
 In addition, *execsql* will read additional configuration files if they are specified in any of the standard configuration files ([see below](#config_config)).
 
 Configuration files use the [INI](https://en.wikipedia.org/wiki/INI_file) file format. Section names are case sensitive and must be all in lowercase. Property names are not case sensitive. Property values are read as-is and may or may not be case sensitive, depending on their use. Comments can be included in configuration files; each comment line must start with the "#" character.
@@ -200,6 +202,10 @@ The section and property names that may be used in a configuration file are list
 `zip_buffer_mb` { #zip_buffer_mb }
 :   The size of the internal buffer used when the [EXPORT](metacommands.md#export) metacommand exports data to a zipfile, in Mb. The default value is 10. The buffer should be at least as large as the largest data row to be exported. This value typically has little effect on performance, and only affects memory usage.
 
+!!! note "CLI-only output options"
+
+    The [`--output-dir`](../getting-started/syntax.md) option sets a default base directory for EXPORT output files. Relative paths in EXPORT metacommands are automatically joined to this directory; absolute paths and `stdout` are unaffected. This option is **only available on the command line** — there is no equivalent configuration file setting.
+
 ## Section `interface`
 
 `console_height`

{execsql2-2.15.8 → execsql2-2.15.11}/docs/reference/substitution_vars.md

@@ -138,6 +138,9 @@ $ERROR_HALT_STATE
 $ERROR_MESSAGE
 :   The message generated by any error, as it would be printed on the terminal by default. This is initially an empty string, and is set by any SQL error or metacommand error. If an error occurs, the error message is only accessible if the [ERROR_HALT OFF](metacommands.md#error_halt) or [METACOMMAND_ERROR_HALT OFF](metacommands.md#metacommanderrorhalt) metacommand has been used, or in an [ON ERROR_HALT EMAIL](metacommands.md#error_halt_email), [ON ERROR_HALT WRITE](metacommands.md#error_halt_write), or [ON ERROR_HALT EXECUTE SCRIPT](metacommands.md#error_halt_exec) metacommand.
 
+$HOSTNAME
+:   The network name of the machine running execsql, as returned by Python's `platform.node()`. Useful for log messages, environment detection, and multi-host deployment scripts.
+
 $LAST_ERROR
 :   The text of the last SQL statement or metacommand that caused an error. This value will only be available if the [ERROR_HALT OFF](metacommands.md#error_halt) or [METACOMMAND_ERROR_HALT OFF](metacommands.md#metacommanderrorhalt) metacommand has been used, or in an [ON ERROR_HALT EMAIL](metacommands.md#error_halt_email), [ON ERROR_HALT WRITE](metacommands.md#error_halt_write), or [ON ERROR_HALT EXECUTE SCRIPT](metacommands.md#error_halt_exec) metacommand.
 

{execsql2-2.15.8 → execsql2-2.15.11}/justfile

@@ -1,42 +1,65 @@
 # Install: brew install just  |  cargo install just  |  uv tool install rust-just
 # Usage:   just <recipe>
 
+set quiet
+set unstable
 
-# List available recipes
+
+[private]
 default:
-    @just --list
+    @just --list --unsorted
 
 # ── Dependencies ──────────────────────────────────────────────────────────────
 
 # Sync dependencies from lockfile
+[group('deps')]
 sync:
     uv sync --all-extras
 
 # Update pre-commit hooks
+[group('deps')]
 update-hooks:
     uv run pre-commit autoupdate
 
 
 # ── Code Quality ──────────────────────────────────────────────────────────────
 
-# Run linter + formatter
+# Lint, spell-check, and test
+[group('quality')]
+check: format lint test
+
+# Run linter
+[group('quality')]
 lint:
     uv run ruff check .
+
+# Run formatter
+[group('quality')]
+format:
     uv run ruff format .
 
 # Run pre-commit hooks on all files
+[group('quality')]
 pre-commit:
     uv run pre-commit run --all-files
 
 # Run tests
-test:
-    uv run tox -e py
+[group('quality')]
+test *ARGS:
+    uv run tox -e py -- {{ ARGS }}
 
 # Run tests across all supported Python versions
+[group('quality')]
 test-all:
     uv run tox run-parallel
 
+# Run tests with coverage report printed to terminal
+[group('quality')]
+coverage:
+    uv run pytest --cov-report=term-missing
+
 # Clean up Python build artifacts and caches
+[group('quality')]
 clean:
     find . -type d -name "__pycache__" -exec rm -rf {} +
     find . -type d -name ".pytest_cache" -exec rm -rf {} +
@@ -48,11 +71,14 @@ clean:
     find . -type f -name "*.pyc" -exec rm -f {} +
     find . -type f -name "*.pyo" -exec rm -f {} +
     find . -type f -name ".coverage" -exec rm -rf {} +
+    find . -type f -name "coverage.xml" -exec rm -rf {} +
+    find . -type f -name "execsql.log" -exec rm -f {} +
 
 
 # ── VS Code Extension ────────────────────────────────────────────────────────
 
-# Install VS Code extension via symlink
+# Regenerate grammar and install VS Code extension via symlink
+[group('vscode')]
 install-vscode:
     uv run python scripts/generate_vscode_grammar.py
     ln -sfn "$(pwd)/extras/vscode-execsql" ~/.vscode/extensions/execsql-syntax
@@ -61,31 +87,40 @@ install-vscode:
 
 # ── Documentation──────────────────────────────────────────────────────────────
 
-# Build documentation
-docs:
+# Copy CHANGELOG into docs source tree
+[private]
+_sync-changelog:
     cp CHANGELOG.md docs/about/change_log.md
+
+# Build documentation
+[group('docs')]
+docs: _sync-changelog
     uv run zensical build
 
 # Serve documentation locally
-docs-serve:
-    cp CHANGELOG.md docs/about/change_log.md
+[group('docs')]
+docs-serve: _sync-changelog
     uv run zensical serve
 
 
 # ── Versioning ────────────────────────────────────────────────────────────────
 
 # List the current version
+[group('version')]
 bump:
     uv run bump-my-version show-bump
 
 # Bump patch version (e.g. 1.2.3 → 1.2.4)
+[group('version')]
 bump-patch:
     uv run bump-my-version bump patch
 
 # Bump minor version (e.g. 1.2.3 → 1.3.0)
+[group('version')]
 bump-minor:
     uv run bump-my-version bump minor
 
 # Bump major version (e.g. 1.2.3 → 2.0.0)
+[group('version')]
 bump-major:
     uv run bump-my-version bump major

{execsql2-2.15.8 → execsql2-2.15.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.15.8"
+version = "2.15.11"
 description = "Runs a SQL script against a PostgreSQL, SQLite, MariaDB/MySQL, DuckDB, Firebird, MS-Access, MS-SQL-Server, or Oracle database, or an ODBC DSN. Provides metacommands to import and export data, copy data between databases, conditionally execute SQL and metacommands, and dynamically alter SQL and metacommands with substitution variables."
 readme = { file = "README.md", content-type = "text/markdown" }
 license = { file = "LICENSE.txt" }
@@ -164,7 +164,7 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.bumpversion]
-current_version = "2.15.8"
+current_version = "2.15.11"
 commit = true
 commit_args = "--no-verify"
 tag = true

{execsql2-2.15.8 → execsql2-2.15.11}/src/execsql/__init__.py

@@ -1,9 +1,10 @@
 """
 execsql — a maintained fork of the execsql SQL scripting tool.
 
-This package provides the ``execsql2`` CLI (entry point ``execsql2``) and the
-``execsql`` importable module.  The top-level package exposes only the package
-version; all public functionality lives in sub-modules.
+This package provides the ``execsql`` CLI command (distributed as the
+``execsql2`` package on PyPI) and the ``execsql`` importable module.
+The top-level package exposes only the package version; all public
+functionality lives in sub-modules.
 """
 
 from __future__ import annotations

{execsql2-2.15.8 → execsql2-2.15.11}/src/execsql/cli/__init__.py

@@ -283,6 +283,16 @@ def main(
         "--profile-limit",
         help="Number of top statements to show in the --profile timing summary (default: 20).",
     ),
+    config_file: str | None = typer.Option(
+        None,
+        "--config",
+        metavar="FILE",
+        help=(
+            "Path to an execsql configuration file. "
+            "Loaded after the implicit search paths so its values take precedence. "
+            "The file may chain additional configs via its [cyan][config][/cyan] section."
+        ),
+    ),
     debug: bool = typer.Option(
         False,
         "--debug",
@@ -376,6 +386,12 @@ def main(
         webbrowser.open("https://execsql2.readthedocs.io/en/latest/", new=2, autoraise=True)
         raise typer.Exit()
 
+    if config_file and not Path(config_file).is_file():
+        _err_console.print(
+            f"[bold red]Error:[/bold red] Config file [cyan]{config_file!r}[/cyan] does not exist.",
+        )
+        raise typer.Exit(code=2)
+
     positional = args or []
     if command is not None:
         script_name = None  # inline mode — no script file
@@ -458,6 +474,7 @@ def main(
         ping=ping,
         lint=lint,
         debug=debug,
+        config_file=config_file,
     )
 
 

{execsql2-2.15.8 → execsql2-2.15.11}/src/execsql/cli/run.py

@@ -12,6 +12,7 @@ from typing import Any
 import datetime
 import getpass
 import os
+import platform
 import sys
 import traceback
 from pathlib import Path
@@ -219,6 +220,7 @@ def _run(
     ping: bool = False,
     lint: bool = False,
     debug: bool = False,
+    config_file: str | None = None,
 ) -> None:
     """Initialise state, connect to the database, load the script, and run it.
 
@@ -276,13 +278,14 @@ def _run(
     elif osys.startswith("win"):
         osys = "windows"
     _state.subvars.add_substitution("$OS", osys)
+    _state.subvars.add_substitution("$HOSTNAME", platform.node())
     _state.subvars.add_substitution("$PYTHON_EXECUTABLE", sys.executable)
 
     # ------------------------------------------------------------------
     # Read configuration file
     # ------------------------------------------------------------------
     script_path = str(Path(script_name).resolve().parent) if script_name else os.getcwd()
-    _state.conf = ConfigData(script_path, _state.subvars)
+    _state.conf = ConfigData(script_path, _state.subvars, config_file=config_file)
     conf = _state.conf
 
     # ------------------------------------------------------------------

{execsql2-2.15.8 → execsql2-2.15.11}/src/execsql/config.py

@@ -198,7 +198,13 @@ class ConfigData:
                 raise ConfigError(f"Invalid {key}: {val}; must be >= {min_val}.")
             setattr(self, attr, val)
 
-    def __init__(self, script_path: str, variable_pool: object) -> None:
+    def __init__(
+        self,
+        script_path: str,
+        variable_pool: object,
+        *,
+        config_file: str | None = None,
+    ) -> None:
         """Load and merge all discoverable execsql.conf files for the given script path.
 
         Args:
@@ -207,6 +213,10 @@ class ConfigData:
             variable_pool: Substitution-variable registry used to expand
                 ``config_file`` path values and to populate ``[variables]``
                 sections.
+            config_file: Optional explicit config file path (from ``--config``).
+                Loaded after the implicit search paths so its values take
+                precedence over system, user, script, and working-directory
+                config files.
         """
         self.db_type = "a"
         self.server = None
@@ -290,9 +300,15 @@ class ConfigData:
             config_files = [sys_config_file, user_config_file, script_config_file, startdir_config_file]
         else:
             config_files = [sys_config_file, user_config_file, startdir_config_file]
+        if config_file:
+            config_files.append(str(Path(config_file).resolve()))
+        from collections import deque
+
         _MAX_CONFIG_CHAIN = 20  # Guard against circular config_file references.
+        config_queue: deque[str] = deque(config_files)
         self.files_read: list = []
-        for ix, configfile in enumerate(config_files):
+        while config_queue:
+            configfile = config_queue.popleft()
             if len(self.files_read) >= _MAX_CONFIG_CHAIN:
                 break
             if configfile not in self.files_read and Path(configfile).is_file():
@@ -425,7 +441,7 @@ class ConfigData:
                         conffile = str(Path(conffile) / self.config_file_name)
                     if Path(conffile).is_file():
                         # Silently ignore a non-existent file, for cross-OS compatibility.
-                        config_files.insert(ix + 1, conffile)
+                        config_queue.appendleft(conffile)
                 # OS-specific additional config files.
                 _os_config_key: str | None = None
                 if sys.platform == "linux" and cp.has_option(self._CONFIG_SECTION, "linux_config_file"):
@@ -445,7 +461,7 @@ class ConfigData:
                     if not Path(conffile).is_file():
                         conffile = str(Path(conffile) / self.config_file_name)
                     if Path(conffile).is_file():
-                        config_files.insert(ix + 1, conffile)
+                        config_queue.appendleft(conffile)
                 self._get_bool(cp, self._CONFIG_SECTION, "user_logfile", "user_logfile")
                 # dao_flush_delay_secs has a specific error message — keep inline
                 if cp.has_option(self._CONFIG_SECTION, "dao_flush_delay_secs"):

{execsql2-2.15.8 → execsql2-2.15.11}/src/execsql/db/base.py

@@ -747,4 +747,7 @@ class DatabasePool:
                     _state.exec_log.log_status_error(
                         f"Can't close database {nm} aliased as {alias}",
                     )
-        self.__init__()
+        self.pool = {}
+        self.initial_db = None
+        self.current_db = None
+        self.do_rollback = True

{execsql2-2.15.8 → execsql2-2.15.11}/src/execsql/debug/repl.py

@@ -45,23 +45,39 @@ _YELLOW = "\033[33m"
 _CYAN = "\033[36m"
 
 
+_color_cache: bool | None = None
+
+
 def _use_color() -> bool:
     """Return True if the output stream supports ANSI color.
 
     Checks ``NO_COLOR`` and ``EXECSQL_NO_COLOR`` environment variables first
     (either set → color off).  Then tests whether the active output stream
     reports itself as a TTY.
+
+    The result is cached after the first call; call ``_reset_color_cache()``
+    to force re-evaluation (e.g. when entering the REPL).
     """
-    if os.environ.get("NO_COLOR") is not None:
-        return False
-    if os.environ.get("EXECSQL_NO_COLOR") is not None:
-        return False
-    output = _state.output
-    if output is not None and hasattr(output, "isatty"):
-        return output.isatty()
-    # WriteHooks (the default _state.output) has no isatty — fall through
-    # to check the underlying stream it would write to.
-    return sys.stdout.isatty()
+    global _color_cache  # noqa: PLW0603
+    if _color_cache is not None:
+        return _color_cache
+    if os.environ.get("NO_COLOR") is not None or os.environ.get("EXECSQL_NO_COLOR") is not None:
+        _color_cache = False
+    else:
+        output = _state.output
+        if output is not None and hasattr(output, "isatty"):
+            _color_cache = output.isatty()
+        else:
+            # WriteHooks (the default _state.output) has no isatty — fall through
+            # to check the underlying stream it would write to.
+            _color_cache = sys.stdout.isatty()
+    return _color_cache
+
+
+def _reset_color_cache() -> None:
+    """Clear the cached color decision so it is re-evaluated on next use."""
+    global _color_cache  # noqa: PLW0603
+    _color_cache = None
 
 
 def _c(code: str, text: str) -> str:
@@ -169,6 +185,7 @@ def _debug_repl(*, step: bool = False) -> None:
         step: When ``True``, the entry banner says "Step" instead of
             "Breakpoint" to indicate the REPL was re-entered via step mode.
     """
+    _reset_color_cache()
     try:
         import readline as _readline  # noqa: F401 — side-effect: enables history/arrow keys
     except ImportError:

{execsql2-2.15.8 → execsql2-2.15.11}/src/execsql/gui/tui.py

@@ -244,7 +244,31 @@ class MsgScreen(_BaseDialog):
 
 
 class PauseScreen(_BaseDialog):
-    """Pause dialog with optional countdown and Continue/Cancel buttons."""
+    """Pause dialog with optional countdown progress bar and Continue/Cancel buttons."""
+
+    DEFAULT_CSS = (
+        _BaseDialog.DEFAULT_CSS
+        + """
+    #countdown-container {
+        height: auto;
+        margin: 1 0;
+    }
+    #countdown-container ProgressBar {
+        width: 1fr;
+    }
+    #countdown-container Bar {
+        width: 1fr;
+        &> .bar--bar {
+            background: $primary 30%;
+        }
+    }
+    #countdown-container .countdown-label {
+        text-align: center;
+        color: $text-muted;
+        width: 1fr;
+    }
+    """
+    )
 
     BINDINGS = [
         *_BaseDialog.BINDINGS,
@@ -254,17 +278,50 @@ class PauseScreen(_BaseDialog):
     def compose(self) -> ComposeResult:
         title = self.args.get("title", "Pause")
         message = self.args.get("message", "")
+        countdown = self.args.get("countdown")
         with Container(id="dialog"):
             yield Label(title, id="title")
             yield Static(message, id="message")
+            if countdown is not None:
+                with Vertical(id="countdown-container"):
+                    yield ProgressBar(
+                        total=float(countdown),
+                        show_percentage=False,
+                        show_eta=False,
+                        id="countdown-bar",
+                    )
+                    yield Static("", classes="countdown-label")
             with Horizontal(id="buttons"):
                 yield Button("Cancel", id="btn_cancel_exit", variant="warning")
                 yield Button("Continue", id="btn_continue", variant="primary")
 
     def on_mount(self) -> None:
+        import time
+
         countdown = self.args.get("countdown")
         if countdown is not None:
-            self.set_timer(float(countdown), self._auto_continue)
+            self._countdown_total = float(countdown)
+            self._countdown_start = time.time()
+            self._tick_interval = self.set_interval(0.2, self._tick)
+
+    def _tick(self) -> None:
+        import time
+
+        elapsed = time.time() - self._countdown_start
+        remaining = max(0.0, self._countdown_total - elapsed)
+        progress = min(self._countdown_total, elapsed)
+        bar = self.query_one("#countdown-bar", ProgressBar)
+        bar.update(progress=progress)
+        label = self.query_one(".countdown-label", Static)
+        if remaining >= 60:
+            mins = int(remaining) // 60
+            secs = int(remaining) % 60
+            label.update(f"{mins}m {secs:02d}s remaining")
+        else:
+            label.update(f"{remaining:.0f}s remaining")
+        if remaining <= 0:
+            self._tick_interval.stop()
+            self._auto_continue()
 
     def _auto_continue(self) -> None:
         self._result = {"quit": False}

{execsql2-2.15.8 → execsql2-2.15.11}/src/execsql/metacommands/conditions.py

@@ -30,6 +30,24 @@ from execsql.utils.gui import gui_console_isrunning
 from execsql.utils.strings import unquoted
 
 
+def _quote_table_name(name: str) -> str:
+    """Quote a potentially schema-qualified table name for safe SQL interpolation.
+
+    Splits on ``.`` and quotes each component with standard SQL double-quoting
+    (embedded double-quotes are escaped to ``""``).
+
+    Examples::
+
+        >>> _quote_table_name("books")
+        '"books"'
+        >>> _quote_table_name("staging.books")
+        '"staging"."books"'
+        >>> _quote_table_name('my"table')
+        '"my""table"'
+    """
+    return ".".join('"' + part.replace('"', '""') + '"' for part in name.split("."))
+
+
 def xf_contains(**kwargs: Any) -> bool:
     s1 = kwargs["string1"]
     s2 = kwargs["string2"]
@@ -59,7 +77,7 @@ def xf_endswith(**kwargs: Any) -> bool:
 
 def xf_hasrows(**kwargs: Any) -> bool:
     queryname = kwargs["queryname"]
-    sql = f"select count(*) from {queryname};"
+    sql = f"select count(*) from {_quote_table_name(queryname)};"
     try:
         hdrs, rec = _state.dbs.current().select_data(sql)
     except ErrInfo:
@@ -84,7 +102,7 @@ def _row_count(queryname: str, sql_context: str, metacommandline: str) -> int:
     Raises:
         ErrInfo: If the query fails or the result is not numeric.
     """
-    sql = f"select count(*) from {queryname};"
+    sql = f"select count(*) from {_quote_table_name(queryname)};"
     try:
         _hdrs, rec = _state.dbs.current().select_data(sql)
     except ErrInfo: