execsql2 2.15.8__py3-none-any.whl → 2.16.0__py3-none-any.whl

execsql/exporters/base.py

@@ -146,8 +146,10 @@ class WriteSpec:
         subvars = _state.subvars
         if self.repeatable or not self.written:
             self.written = True
-            msg = _state.commandliststack[-1].localvars.substitute_all(self.msg)
-            msg = subvars.substitute_all(msg)
+            msg = self.msg
+            if _state.commandliststack:
+                msg, _ = _state.commandliststack[-1].localvars.substitute_all(msg)
+            msg, _ = subvars.substitute_all(msg)
             if self.outfile:
                 from execsql.utils.fileio import EncodedFile
 
@@ -159,13 +161,13 @@ class WriteSpec:
                     fh.close()
             if (not self.outfile) or self.tee:
                 try:
-                    _state.output.write(msg.encode(conf.output_encoding))
+                    _state.output.write(msg)
                 except ConsoleUIError as e:
                     _state.output.reset()
                     _state.exec_log.log_status_info(
                         f"Console UI write failed (message {{{e.value}}}); output reset to stdout.",
                     )
-                    _state.output.write(msg.encode(conf.output_encoding))
+                    _state.output.write(msg)
             if conf.tee_write_log:
                 _state.exec_log.log_user_msg(msg)
         return None

execsql/exporters/delimited.py

@@ -31,6 +31,8 @@ from execsql.utils.strings import clean_words, dedup_words, fold_words
 
 __all__ = ["LineDelimiter", "CsvFile", "CsvWriter", "DelimitedWriter", "write_delimited_file"]
 
+_SPACE_DELIM_RX = re.compile(r" +")
+
 
 class LineDelimiter:
     """Encapsulates delimiter, quote character, and escape rules for a single line format."""
@@ -211,7 +213,7 @@ class CsvFile(EncodedFile):
             # to a single delimiter, split on the space(s), and consider the delimiter
             # count to be one fewer than the items returned.
             if delim == " ":
-                self.delim_counts[delim] = max(0, len(re.split(r" +", self.text)) - 1)
+                self.delim_counts[delim] = max(0, len(_SPACE_DELIM_RX.split(self.text)) - 1)
             else:
                 self.delim_counts[delim] = self.text.count(delim)
 
@@ -798,10 +800,11 @@ def write_delimited_file(
         if not (filefmt.lower() == "plain" or (append and zipfile is None)):
             datarow = line_delimiter.delimited(column_headers)
             ofile.write(datarow)
+        buf: list[str] = []
+        flush_every = getattr(_state.conf, "export_row_buffer", 1000) if _state.conf else 1000
         for rec in rowsource:
             try:
-                datarow = line_delimiter.delimited(rec)
-                ofile.write(datarow)
+                buf.append(line_delimiter.delimited(rec))
             except ErrInfo:
                 raise
             except Exception as e:
@@ -810,5 +813,10 @@ def write_delimited_file(
                     exception_msg=exception_desc(),
                     other_msg=f"Can't write output to file {fdesc}.",
                 ) from e
+            if len(buf) >= flush_every:
+                ofile.write("".join(buf))
+                buf.clear()
+        if buf:
+            ofile.write("".join(buf))
     finally:
         ofile.close()

execsql/exporters/pretty.py

@@ -56,15 +56,6 @@ def prettyprint_rowset(
     rcols = range(len(colhdrs))
     rrows = range(len(rows))
     colwidths = [max(0, len(colhdrs[j]), *(len(as_ucode(rows[i][j])) for i in rrows)) for j in rcols]
-    names = " " + " | ".join([colhdrs[j].ljust(colwidths[j]) for j in rcols])
-    sep = "|".join(["-" * (colwidths[j] + 2) for j in rcols])
-    rows = [names, sep] + [
-        " "
-        + " | ".join(
-            [as_ucode(rows[i][j]).ljust(colwidths[j]) for j in rcols],
-        )
-        for i in rrows
-    ]
     if output_dest == "stdout":
         ofile = _state.output
         margin = "    "
@@ -83,9 +74,15 @@ def prettyprint_rowset(
     try:
         if desc is not None:
             ofile.write(f"{desc}\n")
-        for row in rows:
-            ln = f"{margin}{row}\n"
-            ofile.write(ln)
+        names = " " + " | ".join([colhdrs[j].ljust(colwidths[j]) for j in rcols])
+        sep = "|".join(["-" * (colwidths[j] + 2) for j in rcols])
+        ofile.write(f"{margin}{names}\n")
+        ofile.write(f"{margin}{sep}\n")
+        for i in rrows:
+            line = " " + " | ".join(
+                [as_ucode(rows[i][j]).ljust(colwidths[j]) for j in rcols],
+            )
+            ofile.write(f"{margin}{line}\n")
     finally:
         if output_dest != "stdout":
             ofile.close()

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/__init__.py

@@ -497,3 +497,6 @@ DATABASE_TYPES = [
 from execsql.metacommands.dispatch import build_dispatch_table
 
 DISPATCH_TABLE = build_dispatch_table()
+
+# Plugin discovery is deferred to state.initialize() so it does not run
+# at import time.  See execsql.plugins.discover_metacommand_plugins().

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/connect.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from execsql.db.access import AccessDatabase
 
 """
 Database connection metacommand handlers for execsql.
@@ -24,6 +23,7 @@ from pathlib import Path
 from typing import Any
 
 import execsql.state as _state
+from execsql.db.access import AccessDatabase  # noqa: F401 — used in x_connect_access; module-level for test patchability
 from execsql.db.dsn import DsnDatabase
 from execsql.db.duckdb import DuckDBDatabase
 from execsql.db.firebird import FirebirdDatabase

execsql/metacommands/control.py

@@ -24,8 +24,6 @@ from typing import Any
 import execsql.state as _state
 from execsql.script import (
     CommandList,
-    CommandListUntilLoop,
-    CommandListWhileLoop,
     MetacommandStmt,
     ScriptCmd,
     current_script_line,
@@ -122,18 +120,14 @@ def x_if_end(**kwargs: Any) -> None:
 
 
 def x_loop(**kwargs: Any) -> None:
-    _state.compiling_loop = True
-    looptype = kwargs["looptype"].upper()
-    loopcond = kwargs["loopcond"]
-    listname = "loop" + str(len(_state.loopcommandstack) + 1)
-    if looptype == "WHILE":
-        _state.loopcommandstack.append(
-            CommandListWhileLoop([], listname, paramnames=None, loopcondition=loopcond),
-        )
-    else:
-        _state.loopcommandstack.append(
-            CommandListUntilLoop([], listname, paramnames=None, loopcondition=loopcond),
-        )
+    # LOOP is now handled natively by the AST executor (_execute_loop).
+    # This handler exists only for dispatch table registration compatibility.
+    from execsql.exceptions import ErrInfo
+
+    raise ErrInfo(
+        type="cmd",
+        other_msg="LOOP should be handled by the AST executor, not the dispatch table.",
+    )
 
 
 def x_halt(**kwargs: Any) -> None:

execsql/metacommands/debug.py

@@ -73,8 +73,9 @@ def x_debug_write_odbc_drivers(**kwargs: Any) -> None:
 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[0]}] = [{s[1]}]")
+    if _state.commandliststack:
+        for s in _state.commandliststack[-1].localvars.substitutions:
+            _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] == "_":
@@ -142,8 +143,9 @@ def x_debug_write_subvars(**kwargs: Any) -> None:
         else:
             filewriter_write(output_dest, txt)
 
-    for s in _state.commandliststack[-1].localvars.substitutions:
-        write(f"Substitution [{s[0]}] = [{s[1]}]\n")
+    if _state.commandliststack:
+        for s in _state.commandliststack[-1].localvars.substitutions:
+            write(f"Substitution [{s[0]}] = [{s[1]}]\n")
     if local is None:
         for s in _state.subvars.substitutions:
             if user is None or s[0][0].isalnum() or s[0][0] == "_":