execsql2 2.21.1__py3-none-any.whl → 2.22.0__py3-none-any.whl

execsql/gui/desktop.py

@@ -12,7 +12,8 @@ from __future__ import annotations
 import os
 import threading
 import time
-from typing import Any
+from typing import Any, cast
+from collections.abc import Callable
 
 from execsql.gui.base import GuiBackend
 
@@ -53,7 +54,7 @@ def _center_window(win: tk.Tk | tk.Toplevel, width: int = 600, height: int = 400
 from execsql.gui.base import DIFF_MARKER, compare_stats as _compare_stats, compute_row_diffs
 
 
-def _add_help_button(frame: tk.Frame, url: str | None) -> None:
+def _add_help_button(frame: Any, url: str | None) -> None:
     """Add a Help button to the top-right of *frame* that opens *url* in the system browser.
 
     Uses ``place()`` so the button overlays the top-right corner without
@@ -82,19 +83,31 @@ def _populate_treeview(tree: ttk.Treeview, headers: list, rows: list) -> None:
         tree.insert("", "end", values=[str(c) if c is not None else "" for c in row])
 
 
-def _add_buttons(frame: tk.Frame, button_list: list, callback) -> None:
+def _add_buttons(frame: Any, button_list: list, callback: Callable[[Any], Any]) -> None:
     """Add buttons from button_list = [(label, value, key?), ...] to frame."""
     for _i, btn in enumerate(button_list):
         label = btn[0]
         value = btn[1]
-        b = tk.Button(frame, text=label, command=lambda v=value: callback(v), padx=8)
+
+        def _command(v: Any = value) -> None:
+            callback(v)
+
+        b = tk.Button(frame, text=label, command=_command, padx=8)
         b.pack(side=tk.LEFT, padx=4)
         if len(btn) > 2 and btn[2]:
             key_seq = btn[2]
             if key_seq == "<Return>":
-                frame.winfo_toplevel().bind("<Return>", lambda e, v=value: callback(v))
+
+                def _return_handler(_event: Any, v: Any = value) -> None:
+                    callback(v)
+
+                frame.winfo_toplevel().bind("<Return>", _return_handler)
             elif len(key_seq) == 1:
-                frame.winfo_toplevel().bind(key_seq, lambda e, v=value: callback(v))
+
+                def _key_handler(_event: Any, v: Any = value) -> None:
+                    callback(v)
+
+                frame.winfo_toplevel().bind(key_seq, _key_handler)
 
 
 # ---------------------------------------------------------------------------
@@ -318,6 +331,7 @@ class EntryFormDialog:
 
         for i, spec in enumerate(specs):
             etype = (spec.entry_type or "text").lower()
+            var: Any
             # For radiobuttons, the label is semicolon-delimited: first part is the label
             if etype == "radiobuttons":
                 parts = (spec.label or "").split(";")
@@ -369,7 +383,7 @@ class EntryFormDialog:
                 var = tk.StringVar(value=spec.initial_value or "")
                 ttk.Entry(file_frame, textvariable=var, width=30).pack(side=tk.LEFT, fill=tk.X, expand=True)
 
-                def _browse(sv=var, mode=etype):
+                def _browse(sv: Any = var, mode: str = etype) -> None:
                     from tkinter import filedialog
 
                     if mode == "inputfile":
@@ -597,7 +611,7 @@ class CompareDialog:
                         tree.item(iid, tags=("diff_match",))
                     elif state == "changed":
                         tree.item(iid, tags=("diff_changed",))
-                        originals[iid] = tree.item(iid, "values")
+                        originals[iid] = cast(tuple[Any, ...], tree.item(iid, "values"))
                         vals = list(tree.item(iid, "values"))
                         diff_set = changed_cols[ridx]
                         for ci, col_name in enumerate(headers_str):
@@ -828,10 +842,14 @@ class ActionDialog:
         button_specs = args.get("button_specs", [])
         for i, spec in enumerate(button_specs):
             btn_text = f"{spec.label}\n{spec.prompt}"
+
+            def _button_command(v: int = i + 1) -> None:
+                self._close(win, v)
+
             ttk.Button(
                 frame,
                 text=btn_text,
-                command=lambda v=i + 1: self._close(win, v),
+                command=_button_command,
             ).pack(fill=tk.X, pady=2)
 
         include_continue = args.get("include_continue_button")
@@ -1380,7 +1398,7 @@ class TkinterBackend(GuiBackend):
         root = self._root_or_raise()
         dlg = dialog_class(root, args)
         root.update()
-        return dlg.result
+        return cast(dict, dlg.result)
 
     def show_halt(self, args: dict) -> dict:
         return self._run_dialog(MsgDialog, args)

execsql/gui/tui.py

@@ -21,7 +21,7 @@ import ctypes
 import os
 import queue as _stdlib_queue
 import threading
-from typing import Any
+from typing import Any, Literal, cast
 
 from execsql.gui.base import GuiBackend
 
@@ -61,7 +61,7 @@ from textual.widgets import (
 
 __all__ = ["TextualBackend"]
 
-from execsql.gui.base import DIFF_MARKER, compare_stats as _compare_stats, compute_row_diffs
+from execsql.gui.base import DIFF_MARKER, DiffResult, compare_stats as _compare_stats, compute_row_diffs
 
 # ---------------------------------------------------------------------------
 # Helpers
@@ -105,7 +105,7 @@ def _button_row(button_list: list) -> list[Button]:
         if not value and value != 1:  # falsy but not accidentally 1
             cancel_label = label
         else:
-            variant = "primary" if i == 0 else "default"
+            variant: Literal["primary", "default"] = "primary" if i == 0 else "default"
             primary_buttons.append(Button(label, id=f"btn_{i}", variant=variant))
     return [Button(cancel_label, id="btn_cancel_exit", variant="warning")] + primary_buttons
 
@@ -695,7 +695,7 @@ class CompareScreen(_BaseDialog):
         self._col_keys1: list = []
         self._col_keys2: list = []
         self._diff_on = False
-        self._diff_result = None
+        self._diff_result: DiffResult | None = None
         self._original_cells1: dict = {}
         self._original_cells2: dict = {}
 
@@ -1407,7 +1407,9 @@ class _TextualSyncQueue:
             return
         if self._screen_map is None:
             self.__class__._screen_map = _build_screen_map()
-        screen_class = self._screen_map.get(spec.gui_type)
+        screen_map = self._screen_map
+        assert screen_map is not None
+        screen_class = screen_map.get(spec.gui_type)
         if screen_class is None:
             spec.return_queue.put({"error": f"Unknown GUI type: {spec.gui_type}", "button": None})
             return
@@ -1578,7 +1580,7 @@ class ConsoleApp(App):
             else:
                 spec.return_queue.put(result if result is not None else {})
 
-        self.run_worker(_push, exclusive=False)
+        self.run_worker(cast(Any, _push), exclusive=False)
 
     def write_console(self, text: str) -> None:
         """Thread-safe method to append text to the RichLog widget."""

execsql/importers/base.py

@@ -63,23 +63,29 @@ def import_data_table(
 
         hdrs = dedup_words(hdrs)
 
+    tablespec_cache: Any = None
+
     def get_ts():
-        if not get_ts.tablespec:
+        nonlocal tablespec_cache
+        if tablespec_cache is None:
             from execsql.models import DataTable
 
-            get_ts.tablespec = DataTable(hdrs, data)
-        return get_ts.tablespec
-
-    get_ts.tablespec = None
+            tablespec_cache = DataTable(hdrs, data)
+        return tablespec_cache
 
-    exec_log = _state.exec_log
     if is_new:
         if is_new == 2:
             tblspec = db.schema_qualified_table_name(schemaname, tablename)
             try:
                 db.drop_table(tblspec)
-            except Exception:
-                exec_log.log_status_info(f"Could not drop existing table ({tblspec}) for IMPORT metacommand")
+            except ErrInfo:
+                raise
+            except Exception as e:
+                raise ErrInfo(
+                    type="db",
+                    other_msg=f"Could not drop existing table ({tblspec}) for IMPORT metacommand",
+                    exception_msg=exception_desc(),
+                ) from e
         sql = get_ts().create_table(db.type, schemaname, tablename)
         try:
             db.execute(sql)

execsql/importers/csv.py

@@ -54,9 +54,14 @@ def importtable(
         if is_new == 2:
             try:
                 db.drop_table(db.schema_qualified_table_name(schemaname, tablename))
-            except Exception:
-                _state.exec_log.log_status_info(f"Could not drop existing table ({tablename}) for IMPORT metacommand")
-                # Don't raise an exception; this may not be a problem because the table may not already exist.
+            except ErrInfo:
+                raise
+            except Exception as e:
+                raise ErrInfo(
+                    type="db",
+                    other_msg=f"Could not drop existing table ({tablename}) for IMPORT metacommand",
+                    exception_msg=exception_desc(),
+                ) from e
         try:
             db.execute(sql)
             # Don't commit table creation here; the commit will be done after data import

execsql/importers/xls.py

@@ -33,6 +33,7 @@ def xls_data(
     if len(filename) < 4:
         raise ErrInfo(type="cmd", other_msg=f"{filename} is not a recognizable Excel spreadsheet name.")
     ext3 = filename[-3:].lower()
+    wbk: Any
     if ext3 == "xls":
         # xlrd imported lazily
         from execsql.exporters.xls import XlsFile

execsql/metacommands/conditions.py

@@ -61,8 +61,8 @@ def _quote_table_name(name: str) -> str:
 
 
 def xf_contains(**kwargs: Any) -> bool:
-    s1 = kwargs["string1"]
-    s2 = kwargs["string2"]
+    s1 = str(kwargs["string1"])
+    s2 = str(kwargs["string2"])
     if kwargs["ignorecase"] and kwargs["ignorecase"].lower() == "i":
         s1 = s1.lower()
         s2 = s2.lower()
@@ -70,8 +70,8 @@ def xf_contains(**kwargs: Any) -> bool:
 
 
 def xf_startswith(**kwargs: Any) -> bool:
-    s1 = kwargs["string1"]
-    s2 = kwargs["string2"]
+    s1 = str(kwargs["string1"])
+    s2 = str(kwargs["string2"])
     if kwargs["ignorecase"] and kwargs["ignorecase"].lower() == "i":
         s1 = s1.lower()
         s2 = s2.lower()
@@ -79,8 +79,8 @@ def xf_startswith(**kwargs: Any) -> bool:
 
 
 def xf_endswith(**kwargs: Any) -> bool:
-    s1 = kwargs["string1"]
-    s2 = kwargs["string2"]
+    s1 = str(kwargs["string1"])
+    s2 = str(kwargs["string2"])
     if kwargs["ignorecase"] and kwargs["ignorecase"].lower() == "i":
         s1 = s1.lower()
         s2 = s2.lower()
@@ -97,7 +97,7 @@ def xf_hasrows(**kwargs: Any) -> bool:
     except Exception as e:
         raise ErrInfo("db", sql, exception_msg=exception_desc()) from e
     nrows = rec[0][0]
-    return nrows > 0
+    return bool(nrows > 0)
 
 
 def _row_count(queryname: str, sql_context: str, metacommandline: str) -> int:
@@ -313,13 +313,13 @@ def xf_equals(**kwargs: Any) -> bool:
 
 
 def xf_identical(**kwargs: Any) -> bool:
-    s1 = kwargs["string1"].strip('"')
-    s2 = kwargs["string2"].strip('"')
+    s1 = str(kwargs["string1"]).strip('"')
+    s2 = str(kwargs["string2"]).strip('"')
     return s1 == s2
 
 
 def xf_isnull(**kwargs: Any) -> bool:
-    item = kwargs["item"].strip().strip('"')
+    item = str(kwargs["item"]).strip().strip('"')
     return item == ""
 
 
@@ -379,12 +379,12 @@ def xf_isfalse(**kwargs: Any) -> bool:
 
 
 def xf_dbms(**kwargs: Any) -> bool:
-    dbms = kwargs["dbms"]
-    return _state.dbs.current().type.dbms_id.lower() == dbms.strip().lower()
+    dbms = str(kwargs["dbms"])
+    return bool(_state.dbs.current().type.dbms_id.lower() == dbms.strip().lower())
 
 
 def xf_dbname(**kwargs: Any) -> bool:
-    dbname = kwargs["dbname"]
+    dbname = str(kwargs["dbname"])
     return _state.dbs.current().name().lower() == dbname.strip().lower()
 
 
@@ -875,6 +875,6 @@ CONDITIONAL_TABLE = build_conditional_table()
 def xcmd_test(teststr: str) -> bool:
     result = CondParser(teststr).parse().eval()
     if result is not None:
-        return result
+        return bool(result)
     else:
         raise ErrInfo(type="cmd", command_text=teststr, other_msg="Unrecognized conditional")

execsql/metacommands/connect.py

@@ -27,7 +27,7 @@ Plus the connection-management handlers:
 """
 
 from pathlib import Path
-from typing import Any
+from typing import Any, cast
 
 import execsql.state as _state
 from execsql.db.access import AccessDatabase  # noqa: F401 — used in x_connect_access; module-level for test patchability
@@ -498,7 +498,7 @@ def x_pg_vacuum(**kwargs: Any) -> None:
     db = _state.dbs.current()
     if db.type == dbt_postgres:
         args = kwargs["vacuum_args"]
-        db.vacuum(args)
+        cast(Any, db).vacuum(args)
 
 
 def x_daoflushdelay(**kwargs: Any) -> None:

execsql/metacommands/control.py

@@ -243,7 +243,7 @@ def x_halt_msg(**kwargs: Any) -> None:
     else:
         headers, rows = None, None
     enable_gui()
-    return_queue = _queue.Queue()
+    return_queue: _queue.Queue[Any] = _queue.Queue()
     gui_args = {
         "title": "HALT",
         "message": errmsg,

execsql/metacommands/data.py

@@ -227,7 +227,7 @@ def x_prompt_selectsub(**kwargs: Any) -> None:
     if cont:
         btns.append(("Continue", 2, "<Return>"))
     enable_gui()
-    return_queue = _queue.Queue()
+    return_queue: _queue.Queue[Any] = _queue.Queue()
     gui_args = {
         "title": "Select data",
         "message": msg,
@@ -254,6 +254,7 @@ def x_prompt_selectsub(**kwargs: Any) -> None:
             exit_now(2, None)
     else:
         if btn_val == 1:
+            assert selected_row is not None
             for i, item in enumerate(selected_row):
                 if item is None:
                     item = ""

execsql/metacommands/io_export.py

@@ -113,10 +113,13 @@ def _dispatch_format(
     elif filefmt == "xlsx":
         write_query_to_xlsx(select_stmt, db, outfile, append, sheetname=sheetname, desc=description)
     elif filefmt == "duckdb":
+        assert tablename is not None
         write_query_to_duckdb(select_stmt, db, outfile, append, tablename=tablename)
     elif filefmt == "sqlite":
+        assert tablename is not None
         write_query_to_sqlite(select_stmt, db, outfile, append, tablename=tablename)
     elif filefmt == "xml":
+        assert xml_table is not None
         write_query_to_xml(select_stmt, xml_table, db, outfile, append, desc=description, zipfile=zipfilename)
     elif filefmt == "json":
         write_query_to_json(select_stmt, db, outfile, append, desc=description, zipfile=zipfilename)
@@ -131,6 +134,7 @@ def _dispatch_format(
     elif filefmt == "latex":
         write_query_to_latex(select_stmt, db, outfile, append, desc=description, zipfile=zipfilename)
     elif filefmt == "hdf5":
+        assert hdf5_table is not None
         write_query_to_hdf5(hdf5_table, select_stmt, db, outfile, append, desc=description)
     elif filefmt == "yaml":
         write_query_to_yaml(select_stmt, db, outfile, append, desc=description, zipfile=zipfilename)

execsql/metacommands/io_fileops.py

@@ -9,9 +9,10 @@ from __future__ import annotations
 
 import os
 import sys
+from itertools import tee
 from pathlib import Path
 from shutil import copyfileobj
-from typing import Any
+from typing import Any, Literal, cast
 
 import execsql.state as _state
 from execsql.exceptions import ErrInfo
@@ -22,6 +23,12 @@ from execsql.utils.fileio import filewriter_close
 from execsql.utils.strings import unquoted
 
 
+def _close_rowsource(rows: Any) -> None:
+    close = getattr(rows, "close", None)
+    if close:
+        close()
+
+
 def x_include(**kwargs: Any) -> None:
     # INCLUDE is now handled natively by the AST executor (_execute_include_native).
     # This handler exists only for dispatch table registration compatibility.
@@ -77,36 +84,59 @@ def x_copy(**kwargs: Any) -> None:
             pass  # Best-effort check; some adapters lack information_schema.
     select_stmt = f"select * from {tbl1};"
 
-    def get_ts() -> DataTable:
-        if get_ts.tablespec is None:
-            hdrs, rows = db1.select_rowsource(select_stmt)
-            get_ts.tablespec = DataTable(hdrs, rows)
-        return get_ts.tablespec
-
-    get_ts.tablespec = None
+    get_ts_tablespec = None
+    rows_to_close = None
+    rows_for_insert: Any
 
     if new_tbl2:
-        tbl_desc = get_ts()
+        try:
+            hdrs, rows = db1.select_rowsource(select_stmt)
+        except ErrInfo:
+            raise
+        except Exception as e:
+            raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
+        rows_to_close = rows
+        rows = cast(Any, rows)
+        rows_for_schema, rows_for_insert = tee(rows)
+        get_ts_tablespec = DataTable(hdrs, rows_for_schema)
+        tbl_desc = get_ts_tablespec
         create_tbl = tbl_desc.create_table(db2.type, schema2, table2)
         if new_tbl2 == "replacement":
             try:
                 db2.drop_table(tbl2)
-            except Exception:
-                _state.exec_log.log_status_info(f"Could not drop existing table ({tbl2}) for COPY metacommand")
+            except ErrInfo:
+                raise
+            except Exception as e:
+                raise ErrInfo(
+                    type="db",
+                    other_msg=f"Could not drop existing table ({tbl2}) for COPY metacommand",
+                    exception_msg=exception_desc(),
+                ) from e
         db2.execute(create_tbl)
         if db2.needs_explicit_commit_after_ddl():
             db2.execute("COMMIT;")
+    else:
+        try:
+            hdrs, rows = db1.select_rowsource(select_stmt)
+        except ErrInfo:
+            raise
+        except Exception as e:
+            raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
+        rows_to_close = rows
+        rows_for_insert = rows
+
+    def get_ts() -> DataTable:
+        nonlocal get_ts_tablespec
+        if get_ts_tablespec is None:
+            ts_hdrs, ts_rows = db1.select_rowsource(select_stmt)
+            get_ts_tablespec = DataTable(ts_hdrs, ts_rows)
+        return get_ts_tablespec
+
     try:
-        hdrs, rows = db1.select_rowsource(select_stmt)
-    except ErrInfo:
-        raise
-    except Exception as e:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
-    try:
-        db2.populate_table(schema2, table2, rows, hdrs, get_ts)
+        db2.populate_table(schema2, table2, rows_for_insert, hdrs, get_ts)
         db2.commit()
     except BaseException:
-        rows.close()
+        _close_rowsource(rows_to_close)
         raise
 
 
@@ -144,13 +174,9 @@ def x_copy_query(**kwargs: Any) -> None:
         except Exception:
             pass  # Best-effort check; some adapters lack information_schema.
 
-    def get_ts() -> DataTable:
-        if not get_ts.tablespec:
-            hdrs, rows = db1.select_rowsource(select_stmt)
-            get_ts.tablespec = DataTable(hdrs, rows)
-        return get_ts.tablespec
-
-    get_ts.tablespec = None
+    get_ts_tablespec = None
+    rows_to_close = None
+    rows_for_insert: Any
 
     if new_tbl2:
         try:
@@ -159,28 +185,48 @@ def x_copy_query(**kwargs: Any) -> None:
             raise
         except Exception as e:
             raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
-        get_ts.tablespec = DataTable(hdrs, rows)
-        tbl_desc = get_ts.tablespec
+        rows_to_close = rows
+        rows = cast(Any, rows)
+        rows_for_schema, rows_for_insert = tee(rows)
+        get_ts_tablespec = DataTable(hdrs, rows_for_schema)
+        tbl_desc = get_ts_tablespec
         create_tbl = tbl_desc.create_table(db2.type, schema2, table2)
         if new_tbl2 == "replacement":
             try:
                 db2.drop_table(tbl2)
-            except Exception:
-                _state.exec_log.log_status_info(f"Could not drop existing table ({tbl2}) for COPY metacommand")
+            except ErrInfo:
+                raise
+            except Exception as e:
+                raise ErrInfo(
+                    type="db",
+                    other_msg=f"Could not drop existing table ({tbl2}) for COPY metacommand",
+                    exception_msg=exception_desc(),
+                ) from e
         db2.execute(create_tbl)
         if db2.needs_explicit_commit_after_ddl():
             db2.execute("COMMIT;")
+    else:
+        try:
+            hdrs, rows = db1.select_rowsource(select_stmt)
+        except ErrInfo:
+            raise
+        except Exception as e:
+            raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
+        rows_to_close = rows
+        rows_for_insert = rows
+
+    def get_ts() -> DataTable:
+        nonlocal get_ts_tablespec
+        if get_ts_tablespec is None:
+            ts_hdrs, ts_rows = db1.select_rowsource(select_stmt)
+            get_ts_tablespec = DataTable(ts_hdrs, ts_rows)
+        return get_ts_tablespec
+
     try:
-        hdrs, rows = db1.select_rowsource(select_stmt)
-    except ErrInfo:
-        raise
-    except Exception as e:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
-    try:
-        db2.populate_table(schema2, table2, rows, hdrs, get_ts)
+        db2.populate_table(schema2, table2, rows_for_insert, hdrs, get_ts)
         db2.commit()
     except BaseException:
-        rows.close()
+        _close_rowsource(rows_to_close)
         raise
 
 
@@ -191,7 +237,7 @@ def x_zip(**kwargs: Any) -> None:
     files = kwargs["filename"].strip(' "')
     zipfile_name = kwargs["zipfilename"].strip(' "')
     append = kwargs["append"]
-    zmode = "a" if append is not None else "w"
+    zmode: Literal["a", "w"] = "a" if append is not None else "w"
     zf = _zipfile.ZipFile(zipfile_name, mode=zmode, compression=_zipfile.ZIP_BZIP2, compresslevel=9)
     fnlist = _glob.glob(files)
     for f in fnlist:

execsql/metacommands/io_import.py

@@ -296,6 +296,7 @@ def x_import_xls_pattern(**kwargs: Any) -> None:
     if len(filename) < 4:
         raise ErrInfo(type="cmd", other_msg=f"{filename} is not a recognizable Excel spreadsheet name.")
     ext3 = filename[-3:].lower()
+    wbk: Any
     if ext3 == "xls":
         wbk = XlsFile()
     elif ext3 == "lsx":

execsql/metacommands/io_write.py

@@ -51,7 +51,7 @@ def x_write(**kwargs: Any) -> None:
             ) from e
         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.exec_log.log_status_info(f"Console UI write failed (message {{{e}}}); output reset to stdout.")
             _state.output.write(msg)
     if _state.conf.tee_write_log:
         _state.exec_log.log_user_msg(msg)