execsql2 2.15.7__py3-none-any.whl → 2.15.11__py3-none-any.whl

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

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,
     )
 
 

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
 
     # ------------------------------------------------------------------

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"):

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

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:

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}

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:

execsql/metacommands/upsert.py

@@ -26,11 +26,11 @@ from execsql.utils.errors import exception_desc
 
 _KW_METHOD = re.compile(r"\bMETHOD\s+(upsert|update|insert)\b", re.IGNORECASE)
 _KW_EXCLUDE = re.compile(
-    r"\bEXCLUDE\s+([\w\s,]+?)(?=\s+(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE_NULL|LOGFILE|CLEANUP|EXPORT_FAILURES|EXPORT_FORMAT|EXPORT_MAX_ROWS)\b|\s*$)",
+    r"\bEXCLUDE\s+([\w\s,]+?)(?=\s+(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE_NULL|LOGFILE|CLEANUP|EXPORT_FAILURES|EXPORT_FORMAT|EXPORT_MAX_ROWS|STRICT_COLUMNS)\b|\s*$)",
     re.IGNORECASE,
 )
 _KW_EXCLUDE_NULL = re.compile(
-    r"\bEXCLUDE_NULL\s+([\w\s,]+?)(?=\s+(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE|LOGFILE|CLEANUP|EXPORT_FAILURES|EXPORT_FORMAT|EXPORT_MAX_ROWS)\b|\s*$)",
+    r"\bEXCLUDE_NULL\s+([\w\s,]+?)(?=\s+(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE|LOGFILE|CLEANUP|EXPORT_FAILURES|EXPORT_FORMAT|EXPORT_MAX_ROWS|STRICT_COLUMNS)\b|\s*$)",
     re.IGNORECASE,
 )
 _KW_COMMIT = re.compile(r"\bCOMMIT\b", re.IGNORECASE)
@@ -44,10 +44,11 @@ _KW_EXPORT_FAILURES = re.compile(
 )
 _KW_EXPORT_FORMAT = re.compile(r"\bEXPORT_FORMAT\s+(\S+)", re.IGNORECASE)
 _KW_EXPORT_MAX_ROWS = re.compile(r"\bEXPORT_MAX_ROWS\s+(\S+)", re.IGNORECASE)
+_KW_STRICT_COLUMNS = re.compile(r"\bSTRICT_COLUMNS\b", re.IGNORECASE)
 
 # All recognized keywords — used to split table names from options.
 _ALL_KEYWORDS = re.compile(
-    r"\b(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE_NULL|EXCLUDE|LOGFILE|CLEANUP|EXPORT_FAILURES|EXPORT_FORMAT|EXPORT_MAX_ROWS)\b",
+    r"\b(?:METHOD|COMMIT|INTERACTIVE|COMPACT|EXCLUDE_NULL|EXCLUDE|LOGFILE|CLEANUP|EXPORT_FAILURES|EXPORT_FORMAT|EXPORT_MAX_ROWS|STRICT_COLUMNS)\b",
     re.IGNORECASE,
 )
 
@@ -145,6 +146,7 @@ def _parse_tables_and_options(tail: str) -> dict[str, Any]:
         "export_failures": export_failures,
         "export_format": export_format,
         "export_max_rows": export_max_rows,
+        "strict_columns": bool(_KW_STRICT_COLUMNS.search(opts_part)),
     }
 
 
@@ -191,6 +193,9 @@ def _set_subvars(result: Any) -> None:
     sv("$PG_UPSERT_STARTED_AT", result.started_at)
     sv("$PG_UPSERT_FINISHED_AT", result.finished_at)
     sv("$PG_UPSERT_RESULT_JSON", json.dumps(result.to_dict(), separators=(",", ":")))
+    # Warnings: tables with WARNING-level findings (still qa_passed=True).
+    warned_tables = [t.table_name for t in result.tables if t.qa_warnings]
+    sv("$PG_UPSERT_QA_WARNINGS", ", ".join(warned_tables) if warned_tables else "")
     # Default export path subvar to empty; _export_failures_if_requested
     # will overwrite it with the actual path if an export was produced.
     sv("$PG_UPSERT_EXPORT_PATH", "")
@@ -230,16 +235,20 @@ def _require_postgres(db: Any, metacommandline: str | None) -> None:
         )
 
 
-def _build_result_from_qa_errors(ups: Any) -> Any:
-    """Build an UpsertResult from ``ups.qa_errors`` after a QA/CHECK run."""
+def _build_result_from_qa_findings(ups: Any) -> Any:
+    """Build an UpsertResult from ``ups.qa_findings`` after a QA/CHECK run.
+
+    Uses ``qa_findings`` (all findings: errors + warnings) so that
+    ``$PG_UPSERT_RESULT_JSON`` includes both severity levels.
+    """
     from pg_upsert.models import TableResult, UpsertResult
 
     table_results: dict[str, Any] = {}
     for table_name in ups.tables:
         table_results[table_name] = TableResult(table_name=table_name)
-    for err in ups.qa_errors:
-        if err.table in table_results:
-            table_results[err.table].qa_errors.append(err)
+    for finding in ups.qa_findings:
+        if finding.table in table_results:
+            table_results[finding.table]._qa_findings.append(finding)
     return UpsertResult(
         tables=list(table_results.values()),
         committed=False,
@@ -289,6 +298,7 @@ def _create_pgupsert(
         "upsert_method": opts["method"],
         "exclude_cols": opts["exclude_cols"],
         "exclude_null_check_cols": opts["exclude_null_check_cols"],
+        "strict_columns": opts.get("strict_columns", False),
         "ui_mode": ui_mode,
         "callback": _make_callback(),
     }
@@ -508,7 +518,7 @@ def x_pg_upsert_qa(**kwargs: Any) -> None:
     finally:
         _detach_log_handlers(loggers, handlers, prev_levels)
 
-    result = _build_result_from_qa_errors(ups)
+    result = _build_result_from_qa_findings(ups)
     _set_subvars(result)
     _export_failures_if_requested(result, opts, metacommandline)
     if opts.get("cleanup"):
@@ -551,7 +561,7 @@ def x_pg_upsert_check(**kwargs: Any) -> None:
     finally:
         _detach_log_handlers(loggers, handlers, prev_levels)
 
-    result = _build_result_from_qa_errors(ups)
+    result = _build_result_from_qa_findings(ups)
     _set_subvars(result)
     _export_failures_if_requested(result, opts, metacommandline)
     if opts.get("cleanup"):

execsql/utils/gui.py

@@ -544,30 +544,98 @@ def get_yn_win(prompt: str) -> bool:
     return get_yn(prompt)
 
 
+def _clear_progress_line() -> None:
+    """Erase the SIGALRM progress bar line and move to the next line."""
+    # \r returns to column 0, the spaces overwrite the bar, then \n advances.
+    sys.stdout.write("\r" + " " * 50 + "\r\n")
+    sys.stdout.flush()
+
+
 def pause(
     text: str,
     action: str | None = None,
     countdown: float | None = None,
     timeunit: str | None = None,
 ) -> int:
-    """Display a pause message and wait for the user.
+    """Display a pause message and wait for the user (POSIX).
 
-    Returns 0 (user continued), 1 (user quit), or 2 (timed out).
-    In headless mode, prints the message and continues immediately unless
-    countdown/action is set, in which case it sleeps then returns 2.
-    """
-    import time
+    Returns 0 (user continued), 1 (user quit/ESC), or 2 (timed out).
+
+    Uses raw-mode terminal reading so that single keypresses (Enter, Esc)
+    are detected without requiring the user to press Enter first.  When
+    *countdown* is set, a SIGALRM-based progress bar is displayed via
+    :class:`~execsql.utils.timer.TimerHandler`.
 
+    Note: *countdown* is expected in **seconds** — the caller (``x_pause``)
+    has already converted minutes to seconds, so *timeunit* is not used here.
+    """
     print(f"\n{text}", file=sys.stderr)
-    if countdown is not None and action is not None:
-        seconds = float(countdown)
-        if timeunit and timeunit.upper() == "MINUTES":
-            seconds *= 60
-        time.sleep(seconds)
-        return 2  # timed out
-    else:
-        input("Press Enter to continue...")
-    return 0
+
+    # When stdin is not a real TTY (pytest, piped input, etc.) or the
+    # platform lacks POSIX terminal APIs (Windows), fall back to simple
+    # blocking behaviour.
+    if sys.platform == "win32" or not hasattr(sys.stdin, "fileno") or not sys.stdin.isatty():
+        if countdown is not None and action is not None:
+            import time
+
+            time.sleep(float(countdown))
+            return 2
+        try:
+            input("Press Enter to continue...")
+        except EOFError:
+            pass
+        return 0
+
+    # POSIX-only imports — guarded by the isatty() check above so this
+    # function can still be called safely on Windows (falls back above).
+    import signal
+    import termios
+    import tty
+
+    from execsql.exceptions import ExecSqlTimeoutError
+    from execsql.utils.timer import TimerHandler
+
+    if countdown is None or action is None:
+        sys.stderr.write("Press Enter to continue, Esc to quit...\n")
+        sys.stderr.flush()
+
+    fd = sys.stdin.fileno()
+    old_settings = termios.tcgetattr(fd)
+
+    timer_handler: TimerHandler | None = None
+    old_alarm = signal.SIG_DFL
+
+    try:
+        tty.setraw(fd)
+
+        if countdown is not None and action is not None:
+            seconds = float(countdown)
+            timer_handler = TimerHandler(seconds)
+            old_alarm = signal.signal(signal.SIGALRM, timer_handler.alarm_handler)
+            signal.setitimer(signal.ITIMER_REAL, 0.01, 0.01)
+
+        has_bar = countdown is not None and action is not None
+
+        while True:
+            try:
+                ch = sys.stdin.read(1)
+            except ExecSqlTimeoutError:
+                # TimerHandler raised — countdown expired.
+                _clear_progress_line()
+                return 2  # timed out
+            if ch in ("\r", "\n"):
+                if has_bar:
+                    _clear_progress_line()
+                return 0  # user continued
+            if ch == "\x1b":
+                if has_bar:
+                    _clear_progress_line()
+                return 1  # user quit (ESC)
+    finally:
+        termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
+        if timer_handler is not None:
+            signal.setitimer(signal.ITIMER_REAL, 0)
+            signal.signal(signal.SIGALRM, old_alarm)
 
 
 def pause_win(
@@ -576,5 +644,59 @@ def pause_win(
     countdown: float | None = None,
     timeunit: str | None = None,
 ) -> int:
-    """GUI pause dialog — falls back to terminal in headless mode."""
-    return pause(text, action=action, countdown=countdown, timeunit=timeunit)
+    """Display a pause message and wait for the user (Windows).
+
+    Returns 0 (user continued), 1 (user quit/ESC), or 2 (timed out).
+
+    Uses ``msvcrt.kbhit()``/``msvcrt.getwch()`` for non-blocking single-char
+    reads with a polling loop that renders a text-mode progress bar when
+    *countdown* is set.  Falls back to :func:`pause` on non-Windows platforms.
+
+    Note: *countdown* is expected in **seconds** — the caller (``x_pause``)
+    has already converted minutes to seconds, so *timeunit* is not used here.
+    """
+    try:
+        import msvcrt
+    except ImportError:
+        # Not on Windows — delegate to the POSIX implementation.
+        return pause(text, action=action, countdown=countdown, timeunit=timeunit)
+
+    import time
+
+    print(f"\n{text}", file=sys.stderr)
+
+    if countdown is not None and action is not None:
+        seconds = float(countdown)
+        start = time.time()
+        bar_len = 30
+        while True:
+            elapsed = time.time() - start
+            remaining = max(0.0, seconds - elapsed)
+            if remaining <= 0:
+                _clear_progress_line()
+                return 2  # timed out
+            bar_left = int(round(bar_len * remaining / seconds, 0))
+            sys.stdout.write(
+                "{:8.1f}  |{}{}|\r".format(remaining, "+" * bar_left, "-" * (bar_len - bar_left)),
+            )
+            sys.stdout.flush()
+            if msvcrt.kbhit():
+                ch = msvcrt.getwch()
+                if ch in ("\r", "\n"):
+                    _clear_progress_line()
+                    return 0
+                if ch == "\x1b":
+                    _clear_progress_line()
+                    return 1
+            time.sleep(0.01)
+    else:
+        sys.stderr.write("Press Enter to continue, Esc to quit...\n")
+        sys.stderr.flush()
+        while True:
+            if msvcrt.kbhit():
+                ch = msvcrt.getwch()
+                if ch in ("\r", "\n"):
+                    return 0
+                if ch == "\x1b":
+                    return 1
+            time.sleep(0.01)

{execsql2-2.15.7.dist-info → execsql2-2.15.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.15.7
+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
@@ -52,7 +52,7 @@ Requires-Dist: keyring; extra == 'all'
 Requires-Dist: odfpy; extra == 'all'
 Requires-Dist: openpyxl; extra == 'all'
 Requires-Dist: oracledb; extra == 'all'
-Requires-Dist: pg-upsert>=1.21.0; extra == 'all'
+Requires-Dist: pg-upsert>=1.22.0; extra == 'all'
 Requires-Dist: polars; extra == 'all'
 Requires-Dist: psycopg2-binary; extra == 'all'
 Requires-Dist: pymysql; extra == 'all'
@@ -117,7 +117,7 @@ Requires-Dist: oracledb; extra == 'oracle'
 Provides-Extra: postgres
 Requires-Dist: psycopg2-binary; extra == 'postgres'
 Provides-Extra: upsert
-Requires-Dist: pg-upsert>=1.21.0; extra == 'upsert'
+Requires-Dist: pg-upsert>=1.22.0; extra == 'upsert'
 Description-Content-Type: text/markdown
 
 > [!NOTE]
@@ -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.7.dist-info → execsql2-2.15.11.dist-info}/RECORD

@@ -1,6 +1,6 @@
-execsql/__init__.py,sha256=BIny4bL8uHuSl3gXPqEkIB2FtcexlARjR7IYPwtD9bM,486
+execsql/__init__.py,sha256=zinIcvuXFile66yk4JKvD1NO3QqxR5MoSHXBHeRMRC0,515
 execsql/__main__.py,sha256=HdbK-SAhyUmfB6xINY5AzxdMSxGzWSGEG_2dv42Jn64,315
-execsql/config.py,sha256=DUW5cET6Vr7fsZURRSt2JpswrZKW96jyouFjUGLjOT0,28543
+execsql/config.py,sha256=YkLEtyLfjfihEMmAXM9Bkz2h_AkCh7CroWwlAqtmR2M,29083
 execsql/exceptions.py,sha256=j8hykBiof9H3Za9hwLIbDcVB2Xn65ODXXplp1jkvdgM,8453
 execsql/format.py,sha256=-6iknDddqbkapMo4NKmT5LAynDLqMW5kHgDWRg0KSws,11990
 execsql/models.py,sha256=xXhMfycetIBGLhrEWwz2Witn3k7rdgMok73HSdTLSCw,13445
@@ -8,14 +8,14 @@ execsql/parser.py,sha256=P3ea8k7T_XLMrbhpFNZXwytdShrY302MKnhosqza1lo,15493
 execsql/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 execsql/state.py,sha256=gX7By2R9Ytxbgy3QFG69DJa8ebO-0NSpYNpCYCrnO1w,15258
 execsql/types.py,sha256=5K3aTuWQZHftz5slFODwqxlcvvt6lROISUnvUtRUazs,31799
-execsql/cli/__init__.py,sha256=YXxOVF2lNkCkifXyjoC7yWrhHJFT9PzI7cnCzsLJwT8,16488
+execsql/cli/__init__.py,sha256=jYw5J88e_vOthmEyzsNxxzkRf7xc7CphLixqBrUjr_c,17115
 execsql/cli/dsn.py,sha256=svaZtrUXFRL2W5G6FRRiKtR6kehOp7urrVhIx_642Z8,2820
 execsql/cli/help.py,sha256=Sn_TgSJiQeBx-xZH0fuP5OvR_wasSTumjWF9UHfIX5k,5414
 execsql/cli/lint.py,sha256=mVZu3Knp13-yQZkofiaeDmxLTWP7DkbaZoDeHPsfAEQ,24094
-execsql/cli/run.py,sha256=JGfndnBnJMkEqbz26pflhEdXDScZNIdGu6b6jTRLYl8,30681
+execsql/cli/run.py,sha256=HXOkqCI5Qyve8_c3OeHuB2RylmgS0iF5gUSPl-Zn5do,30824
 execsql/db/__init__.py,sha256=jTbuafuKOqYtXFR1wvCOoKK5Lr3l1uErfaIbIr6UywI,1063
 execsql/db/access.py,sha256=v0GKN4yE30r-A1gcv224jZhj0JmmRTmGSuz_KH11iY4,18119
-execsql/db/base.py,sha256=vbPvthhj_6phNN4QeOUnYzkShqOjJTeg5QEgftj11qY,31229
+execsql/db/base.py,sha256=-el1s7YrxHkdy0lFx86BKZ8mBXWD-1EvE44e5ZhD5KI,31322
 execsql/db/dsn.py,sha256=sMXHOCVPZMMq52ReF6AywmWfyZjkQPmOIDXiIe_PGD4,5400
 execsql/db/duckdb.py,sha256=pkmjD89gkbl0sHfcGpowx4X7PGTEpg-CoTpnzHR0Cu0,3174
 execsql/db/factory.py,sha256=YR1m_c2Hhj_GXVGGkWoSEPZBpgNu_c4FxRnbp-xV3rs,5230
@@ -26,7 +26,7 @@ execsql/db/postgres.py,sha256=Oq881tnKgOzO0nbRmzyM_Ym8twu7QlPsRjXpHz20wpk,21012
 execsql/db/sqlite.py,sha256=0aPomjNsyXww6lY039GuZufTp2T4Eyw8wdJjmXebNsE,10378
 execsql/db/sqlserver.py,sha256=XbhprA1URZYPmSIMHEAGNdCbxZBs3yy5Kb6IvDxbACU,7597
 execsql/debug/__init__.py,sha256=j6EGUR0dHzUhWN1mHHtf1-Lhjq3Sb1V-vmnq2Ztgj1M,178
-execsql/debug/repl.py,sha256=HeQ9emFKUjo7UTouxuTcmpGCTJIR1nOLxKkRJ5mvd2c,16669
+execsql/debug/repl.py,sha256=ngUVuQjey7TilSMumMqOouUhzx3Zx7W5rKCqZ5XoLnY,17227
 execsql/exporters/__init__.py,sha256=-Cnji-OgodJV8ftcDcOyTof0kQMy9J5kKVC8GVFpc3o,670
 execsql/exporters/base.py,sha256=W9USFyk_2eztjJ51X6CJh7-chE1i3cSx-STOtbHXCNI,6373
 execsql/exporters/delimited.py,sha256=URvEQo1IRF_tfdVHL3uBwEonihC-XfDm0f1argQPf4M,32088
@@ -53,7 +53,7 @@ execsql/gui/__init__.py,sha256=oCb-cyhLZzVpWJ4WU5HbqEDBrV-lm0ytEwxemrOZyqs,2048
 execsql/gui/base.py,sha256=15wCaSLvSb21hToCczru46ghmd56ryMpEOOZ0R_dE3U,12740
 execsql/gui/console.py,sha256=pCBUcFGjlKXMkMjztbmt9glP3me9jAKAgQxnmUE38-0,19396
 execsql/gui/desktop.py,sha256=Cz4Epr2H4tXMbjGVda0VcVYjEmtW6S394GBSCdsfMJw,54708
-execsql/gui/tui.py,sha256=dsy-YHWUoFgIPz-r5KEG6srWEyu8rIviSkrkwuMM9no,63425
+execsql/gui/tui.py,sha256=INBCuW6iEEV15P_JrHeviI1JlNCXfoiyPBU-IC5MaLY,65200
 execsql/importers/__init__.py,sha256=dDsxSVeQYXBvm9yGqN3QswyGbLWTwt08pvUuRJgZhl4,289
 execsql/importers/base.py,sha256=FGVz3ntN6xHL99rQixlQj3tAf570K_oU83UtbYE1lJg,4124
 execsql/importers/csv.py,sha256=GUVRP294vHlOlF8XNecPEzatUBOOFIqnrEV9cBQkiv0,4849
@@ -62,7 +62,7 @@ execsql/importers/json.py,sha256=Z7QJZQ9fyqaxFxjfqcfZoaoW2GSZt-DMqW5LZiEfyNs,468
 execsql/importers/ods.py,sha256=MJsdsjropzCvxAA3DDZfAL_AnmZ4yij7DnrjGyDJqHQ,2843
 execsql/importers/xls.py,sha256=e0Zfe47ZiCpA1Ae3XDJ1ko3sCiH3-8U6XLKi6NvD0jQ,3683
 execsql/metacommands/__init__.py,sha256=3Kz-VasFS9B-C-UdHOjr3RMXjheMeYHe6qYBwp5e7wE,11434
-execsql/metacommands/conditions.py,sha256=V7t1Xtmve5UOaPWHFjAz93uW3rYMFejvA2gNh8YABvs,28602
+execsql/metacommands/conditions.py,sha256=B6fBumkqoPO4wcQbw_ypYITaSnzPemAA1g5GrNLNfD0,29204
 execsql/metacommands/connect.py,sha256=U17ByjVmwrLN5DB7Ea9lTLyFJr8On2c9LfPO1Wc4l4U,14890
 execsql/metacommands/control.py,sha256=PAZFK1ck5SDSm5QdFV1ctif3KpEiyYWIXdDceRWgQ6k,8513
 execsql/metacommands/data.py,sha256=tRQBGTAuW-eJ2tBNWaoZI9OjTyNNyHJISo7gOdL-sm8,11370
@@ -76,7 +76,7 @@ execsql/metacommands/io_write.py,sha256=NpL2aYGfBpbqmPpYsqniYltYfd_SCA1EQz3_4qSd
 execsql/metacommands/prompt.py,sha256=E2e7q4pxbl_wEBrhco0B2gm5hO_HG3rNIF75PLdTgGg,36767
 execsql/metacommands/script_ext.py,sha256=TUgAldB2LSJAwZrCvDDi804hQ1d9BDQD2GDqHNPVOcM,2280
 execsql/metacommands/system.py,sha256=azRbv_P8l0t8BkDM9bmAUkhpnLSLHSCcmByqs-a3FxQ,7352
-execsql/metacommands/upsert.py,sha256=imXKk2A9TuG4rS_mr40_g2A1IY9iOMKhFYkAm4n3dFk,19214
+execsql/metacommands/upsert.py,sha256=DxtAhGpC6qD--sk932u40cbfQfvFlV-SXnV7WUTwk_8,19858
 execsql/script/__init__.py,sha256=HbVQmQEVn4gBtzwy5_nlbDGuRnbWd4dI4nG-q1KyBxs,3498
 execsql/script/control.py,sha256=s-1eZdGARM6H1FwZ6VDdO_f50j7bvvRtTHesfUm9tbc,6144
 execsql/script/engine.py,sha256=HDlwm3_EqU6A4Z4O27dqQRvkpIACUuzYh3dZZAc8C98,43130
@@ -87,30 +87,30 @@ execsql/utils/crypto.py,sha256=2OnBWwn9bCBGc1ZkyRv16TvhottoCNYtXqgbE3mG3Sg,2960
 execsql/utils/datetime.py,sha256=rMCXAbvj6bxKCYzC97vrludO6PU5DYQ39buZ0smDC5A,3573
 execsql/utils/errors.py,sha256=cIYU7mKgjrRy5D2D4aDFHsH__lToz4Nv3fLQ62R1V2M,7786
 execsql/utils/fileio.py,sha256=3HDm6QFGeXwFMmCsbea4H5Ub6u2Jrx-oNsWA3Q5aytQ,23860
-execsql/utils/gui.py,sha256=eZeFJm8EaWnzeHIw_O-tn9hO8sxGjZRX_aUFDtGQp4w,18396
+execsql/utils/gui.py,sha256=h_7V2zYfp0l6C3Ft8QtUJAPgxCUrFkgIqwimz5s1bbQ,22821
 execsql/utils/mail.py,sha256=Sd7vWj-dz3w0XDSFU9PM8gmy41pojk-Vsgbfven2DMk,5786
 execsql/utils/numeric.py,sha256=xh02ANSRk3nUpQ-rtm66ILoMqoi7HtzCoRMIOT9U8QI,1570
 execsql/utils/regex.py,sha256=diEzTZqU_HHwVMadPAvN1Vgzhl7I03eVaEFGCXyGGL8,3770
 execsql/utils/strings.py,sha256=5Dvzrk-9SIw2lpxXZQkiJbNyo1sy7iXXAtSULlZ0KG8,8488
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.15.7.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.15.7.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.15.7.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.15.7.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
-execsql2-2.15.7.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.15.7.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
-execsql2-2.15.7.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
-execsql2-2.15.7.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
-execsql2-2.15.7.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
-execsql2-2.15.7.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
-execsql2-2.15.7.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
-execsql2-2.15.7.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
-execsql2-2.15.7.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
-execsql2-2.15.7.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
-execsql2-2.15.7.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
-execsql2-2.15.7.dist-info/METADATA,sha256=EJ8BkbT-M-KMojwtJD1l7vTvSWj7tFBJ-JQ4XTZWC-s,18114
-execsql2-2.15.7.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.15.7.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.15.7.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.15.7.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
-execsql2-2.15.7.dist-info/RECORD,,
+execsql2-2.15.11.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.15.11.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.15.11.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
+execsql2-2.15.11.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
+execsql2-2.15.11.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.15.11.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
+execsql2-2.15.11.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
+execsql2-2.15.11.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
+execsql2-2.15.11.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
+execsql2-2.15.11.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
+execsql2-2.15.11.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
+execsql2-2.15.11.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
+execsql2-2.15.11.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
+execsql2-2.15.11.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
+execsql2-2.15.11.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
+execsql2-2.15.11.dist-info/METADATA,sha256=ClzgnoVBb7i4U2HC5k3bAycug19JGF6loGfMHDrzXJA,18221
+execsql2-2.15.11.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+execsql2-2.15.11.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.15.11.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.15.11.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
+execsql2-2.15.11.dist-info/RECORD,,