execsql2 2.27.0__py3-none-any.whl → 2.28.0__py3-none-any.whl

execsql/cli/commands/format.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from pathlib import Path
 
 import typer
+from rich.markup import escape
 
 from execsql.cli.application import ExecsqlCommand, app
 from execsql.cli.help import _err_console
@@ -90,7 +91,7 @@ def format_cmd(
         try:
             _require_sqlglot()
         except ImportError as exc:
-            _err_console.print(f"[bold red]Error:[/bold red] {exc}", highlight=False)
+            _err_console.print(f"[bold red]Error:[/bold red] {escape(str(exc))}", highlight=False)
             raise typer.Exit(code=1) from exc
     raise typer.Exit(
         code=run_formatter(

execsql/cli/commands/lsp.py

@@ -3,13 +3,31 @@
 from __future__ import annotations
 
 import typer
+from rich.markup import escape
 
 from execsql.cli.application import ExecsqlCommand, app
 from execsql.cli.help import _err_console
+from execsql.utils.errors import install_hint
 
 __all__ = ["lsp_cmd"]
 
 
+def _lsp_libraries_installed() -> bool:
+    """Whether pygls and lsprotocol are installed (whether or not this execsql can use them)."""
+    from importlib.util import find_spec
+
+    return all(find_spec(name) is not None for name in ("pygls", "lsprotocol"))
+
+
+def _pygls_version() -> str:
+    from importlib.metadata import PackageNotFoundError, version
+
+    try:
+        return version("pygls")
+    except PackageNotFoundError:
+        return "unknown"
+
+
 @app.command(
     cls=ExecsqlCommand,
     name="lsp",
@@ -17,24 +35,30 @@ __all__ = ["lsp_cmd"]
         "Run the execsql language server on stdin/stdout, for an editor to start. "
         "Shows execsql lint findings as you type, completes metacommands, "
         "conditional tests and variables, explains them on hover, and finds where variables, "
-        "SCRIPTs and included files are defined, offers quick fixes, and formats documents. Needs the lsp extra "
-        "(installed with any extras you already have, e.g. execsql2[postgres,lsp])."
+        "SCRIPTs and included files are defined, offers quick fixes, and formats documents. Requires the lsp "
+        "extra; --check reports whether it is installed."
     ),
 )
 def lsp_cmd(
     # Editors' language clients pass --stdio (VS Code always does); stdio is the only transport.
     stdio: bool = typer.Option(False, "--stdio", hidden=True),
+    check: bool = typer.Option(False, "--check", help="Report whether the language server can start, and exit."),
 ) -> None:
     """The ``lsp`` command; its user-facing help is the decorator's ``help``."""
     try:
         from execsql.lsp.server import create_server
     except ImportError as exc:
-        _err_console.print(
-            "[bold red]Error:[/bold red] execsql lsp needs the lsp extra. Install it with the "
-            'extras you already have, e.g. uv tool install "execsql2\\[postgres,lsp]" or '
-            'pipx install --force "execsql2\\[postgres,lsp]". '
-            "See https://execsql2.readthedocs.io/en/latest/getting-started/installation/#adding-an-extra-later",
-            highlight=False,
-        )
+        if _lsp_libraries_installed():
+            # pygls is there but this execsql cannot use it (another major version, a broken install).
+            message = (
+                f"execsql lsp cannot use the installed pygls {_pygls_version()} ({exc}). "
+                f"It needs pygls 2.x, which the lsp extra installs. {install_hint('lsp')}"
+            )
+        else:
+            message = f"execsql lsp needs the lsp extra. {install_hint('lsp')}"
+        _err_console.print(f"[bold red]Error:[/bold red] {escape(message)}", highlight=False)
         raise typer.Exit(code=1) from exc
+    if check:
+        typer.echo(f"execsql lsp is ready (pygls {_pygls_version()}).")
+        return
     create_server().start_io()

execsql/cli/lint.py

@@ -48,6 +48,7 @@ Public surface:
 
 from __future__ import annotations
 
+import functools
 import json
 import re
 from collections import Counter
@@ -460,23 +461,40 @@ def _read_ini_vars(
     language server; a file that is unreadable or not valid INI defines
     nothing.
     """
-    from configparser import ConfigParser
-    from configparser import Error as ConfigError
-
     p = Path(ini_file)
     if not p.is_absolute() and script_dir is not None:
         p = script_dir / p
+    try:
+        if not p.is_file():
+            return
+        stat = p.stat()
+        if stat.st_size > _MAX_INI_BYTES:
+            return
+        resolved = str(p.resolve())
+    except OSError:
+        return
+    defined_vars.update(_ini_section_keys(resolved, stat.st_size, stat.st_mtime_ns, section))
+
+
+@functools.lru_cache(maxsize=64)
+def _ini_section_keys(path: str, size: int, mtime_ns: int, section: str) -> frozenset[str]:
+    """The upper-cased keys of *section* in the INI file at *path*.
+
+    Cached by the file's size and modification time: a script that names
+    the same file on many SUB_INI lines, and the language server re-linting
+    on every edit, read it once.
+    """
+    from configparser import ConfigParser
+    from configparser import Error as ConfigError
 
     cp = ConfigParser()
     try:
-        if not p.is_file() or p.stat().st_size > _MAX_INI_BYTES:
-            return
-        cp.read_string(p.read_text(encoding="utf-8"), source=str(p))
+        cp.read_string(Path(path).read_text(encoding="utf-8"), source=path)
     except (OSError, UnicodeDecodeError, ConfigError):
-        return
-    if cp.has_section(section):
-        for key, _value in cp.items(section):
-            defined_vars.add(key.upper())
+        return frozenset()
+    if not cp.has_section(section):
+        return frozenset()
+    return frozenset(key.upper() for key, _value in cp.items(section))
 
 
 def _is_known_var(raw_name: str, defined_vars: set[str]) -> bool:
@@ -834,7 +852,12 @@ def _referencing_text(node: Node) -> list[str]:
     return texts
 
 
-def _check_unused_variables(script: Script, defined: set[str], issues: list[_Issue]) -> None:
+def _check_unused_variables(
+    script: Script,
+    defined: set[str],
+    issues: list[_Issue],
+    script_dir: Path | None = None,
+) -> None:
     """Report variables a SUB defines that nothing ever reads.
 
     Almost always a typo in either the definition or the reference — the two
@@ -845,8 +868,11 @@ def _check_unused_variables(script: Script, defined: set[str], issues: list[_Iss
     referenced: set[str] = set()
     _collect_var_references(script.body, referenced)
     unused = sorted(defined - referenced)
+    lines: dict[str, int] = {}
+    if unused:
+        _definition_lines(script.body, script_dir, lines)
     for name in unused:
-        line = _definition_line(script.body, name)
+        line = lines.get(name, 0)
         issues.append(
             _issue(
                 "V002",
@@ -857,18 +883,15 @@ def _check_unused_variables(script: Script, defined: set[str], issues: list[_Iss
         )
 
 
-def _definition_line(nodes: list[Node], name: str) -> int:
-    """Line of the SUB that defines *name*, or 0 when it cannot be located."""
+def _definition_lines(nodes: list[Node], script_dir: Path | None, lines: dict[str, int]) -> None:
+    """Add to *lines* the line of the first metacommand that defines each variable, in script order."""
     for node in nodes:
         if isinstance(node, MetaCommandStatement):
             probe: set[str] = set()
-            _extract_var_definition(node.command, None, probe)
-            if name in probe:
-                return node.span.start_line
-        found = _definition_line(list(node.children()), name)
-        if found:
-            return found
-    return 0
+            _extract_var_definition(node.command, script_dir, probe)
+            for name in probe:
+                lines.setdefault(name, node.span.start_line)
+        _definition_lines(list(node.children()), script_dir, lines)
 
 
 # ---------------------------------------------------------------------------
@@ -1008,7 +1031,7 @@ def lint(
     )
 
     # Pass 3: whole-script rules, which need every reference collected first
-    _check_unused_variables(script, all_defined, issues)
+    _check_unused_variables(script, all_defined, issues, script_dir)
 
     return issues
 

execsql/db/access.py

@@ -17,7 +17,7 @@ from typing import Any, cast
 from execsql.db.base import Database, _fetched
 from execsql.db.tiers import SupportTier
 from execsql.exceptions import ErrInfo
-from execsql.utils.errors import exception_desc, fatal_error
+from execsql.utils.errors import exception_desc, fatal_error, install_hint
 from execsql.utils.auth import (
     begin_login,
     clear_stored_password,
@@ -68,7 +68,7 @@ class AccessDatabase(Database):
         try:
             import pyodbc  # noqa: F401
         except Exception:
-            fatal_error("The pyodbc module is required.  See http://github.com/mkleehammer/pyodbc")
+            fatal_error(f"The pyodbc module is required to connect to Access. {install_hint('odbc')}")
         from execsql.types import dbt_access
 
         super().__init__(
@@ -327,8 +327,8 @@ class AccessDatabase(Database):
             rows = curs.fetchall()
             return [d[0] for d in curs.description], rows
 
-    def select_rowsource(self, sql: str) -> tuple[list[str], Any]:
-        """Return column names and an iterable that yields rows one at a time."""
+    def select_rowsource(self, sql: str, *, decode_bytes: bool = True) -> tuple[list[str], Any]:  # noqa: ARG002
+        """Return column names and an iterable that yields rows one at a time (values as the driver returns them)."""
         # Return 1) a list of column names, and 2) an iterable that yields rows.
         self.dao_flush_check()
         curs = self.cursor()

execsql/db/base.py

@@ -405,8 +405,13 @@ class Database(ABC):
             rows = curs.fetchall()
             return [d[0] for d in curs.description], rows
 
-    def select_rowsource(self, sql: str) -> tuple[list[str], Generator]:
-        """Execute *sql* and return ``(column_names, row_generator)`` for streaming large result sets."""
+    def select_rowsource(self, sql: str, *, decode_bytes: bool = True) -> tuple[list[str], Generator]:
+        """Execute *sql* and return ``(column_names, row_generator)`` for streaming large result sets.
+
+        A binary value (``bytes``) is decoded to text with the connection's
+        encoding, as the exporters expect, unless *decode_bytes* is false:
+        COPY passes false so binary columns reach the target unchanged.
+        """
         # Return 1) a list of column names, and 2) an iterable that yields rows.
         curs = self.cursor()
         try:
@@ -433,7 +438,7 @@ class Database(ABC):
                         break
                     else:
                         for row in rows:
-                            if self.encoding:
+                            if self.encoding and decode_bytes:
                                 yield [
                                     c.decode(self.encoding, "backslashreplace") if isinstance(c, bytes) else c
                                     for c in row
@@ -501,6 +506,15 @@ class Database(ABC):
         """The schema (MySQL: database) an unqualified table name is created in, or ``None`` if unknown."""
         return None
 
+    def table_exists_where_created(self, table_name: str, schema_name: str | None = None) -> bool:
+        """Whether *table_name* exists where a ``CREATE TABLE`` on this connection would put it.
+
+        The same as :meth:`table_exists`, except on a connection that sees
+        tables of other databases (DuckDB ``ATTACH``): only the current
+        database counts there.
+        """
+        return self.table_exists(table_name, schema_name)
+
     def _query_current_schema(self, sql: str) -> str | None:
         with self._cursor() as curs:
             curs.execute(sql)

execsql/db/dsn.py

@@ -12,7 +12,7 @@ the CLI.
 from execsql.db.base import Database
 from execsql.db.tiers import SupportTier
 from execsql.exceptions import ErrInfo
-from execsql.utils.errors import exception_desc, fatal_error
+from execsql.utils.errors import exception_desc, fatal_error, install_hint
 from execsql.utils.auth import (
     begin_login,
     clear_stored_password,
@@ -51,7 +51,7 @@ class DsnDatabase(Database):
         try:
             import pyodbc  # noqa: F401
         except Exception:
-            fatal_error("The pyodbc module is required.  See http://github.com/mkleehammer/pyodbc")
+            fatal_error(f"The pyodbc module is required to connect through an ODBC DSN. {install_hint('odbc')}")
         from execsql.types import dbt_dsn
 
         super().__init__(

execsql/db/duckdb.py

@@ -14,7 +14,7 @@ from typing import Any
 
 from execsql.db.base import Database, statement_start
 from execsql.exceptions import ErrInfo
-from execsql.utils.errors import exception_desc, fatal_error
+from execsql.utils.errors import exception_desc, fatal_error, install_hint
 import execsql.state as _state
 
 __all__ = ["DuckDBDatabase"]
@@ -62,7 +62,7 @@ class DuckDBDatabase(Database):
         try:
             import duckdb  # noqa: F401
         except Exception:
-            fatal_error("The duckdb module is required.")
+            fatal_error(f"The duckdb module is required to use DuckDB. {install_hint('duckdb')}")
         from execsql.types import dbt_duckdb
 
         super().__init__(
@@ -167,6 +167,18 @@ class DuckDBDatabase(Database):
                 self.rollback()
                 raise
 
+    def table_exists_where_created(self, table_name: str, schema_name: str | None = None) -> bool:
+        """Whether *table_name* exists in the current database (not an ``ATTACH``ed one)."""
+        # information_schema.tables lists the tables of every attached database.
+        sql = "select table_name from information_schema.tables where table_name = ? and table_catalog = current_database()"
+        params: list = [table_name]
+        if schema_name:
+            sql += " and table_schema = ?"
+            params.append(schema_name)
+        with self._cursor() as curs:
+            curs.execute(sql, params)
+            return len(curs.fetchall()) > 0
+
     def view_exists(self, view_name: str, schema_name: str | None = None) -> bool:
         """Return True if the named view exists in the DuckDB database."""
         # DuckDB information_schema has no 'views' table; views are listed in 'tables'

execsql/db/firebird.py

@@ -11,7 +11,7 @@ via the ``firebird-driver`` package.  Corresponds to ``-t f`` on the CLI.
 from execsql.db.base import Database
 from execsql.db.tiers import SupportTier
 from execsql.exceptions import ErrInfo
-from execsql.utils.errors import exception_desc, fatal_error
+from execsql.utils.errors import exception_desc, fatal_error, install_hint
 from execsql.utils.auth import (
     begin_login,
     clear_stored_password,
@@ -46,8 +46,7 @@ class FirebirdDatabase(Database):
             from firebird import driver as firebird_lib  # noqa: F401
         except Exception:
             fatal_error(
-                "The firebird-driver module is required to connect to Firebird.   "
-                "See https://pypi.org/project/firebird-driver/",
+                f"The firebird-driver module is required to connect to Firebird. {install_hint('firebird')}",
             )
         from execsql.types import dbt_firebird
 

execsql/db/mysql.py

@@ -12,7 +12,7 @@ from typing import Any, cast
 
 from execsql.db.base import Database
 from execsql.exceptions import ErrInfo
-from execsql.utils.errors import exception_desc, fatal_error
+from execsql.utils.errors import exception_desc, fatal_error, install_hint
 from execsql.utils.auth import (
     begin_login,
     clear_stored_password,
@@ -81,7 +81,7 @@ class MySQLDatabase(Database):
             import pymysql as mysql_lib  # noqa: F401
         except Exception:
             fatal_error(
-                "The pymysql module is required to connect to MySQL.   See https://pypi.python.org/pypi/PyMySQL",
+                f"The pymysql module is required to connect to MySQL. {install_hint('mysql')}",
             )
         from execsql.types import dbt_mysql
 

execsql/db/oracle.py

@@ -14,7 +14,7 @@ from typing import Any
 from execsql.db.base import Database
 from execsql.db.tiers import SupportTier
 from execsql.exceptions import ErrInfo
-from execsql.utils.errors import exception_desc, fatal_error
+from execsql.utils.errors import exception_desc, fatal_error, install_hint
 from execsql.utils.auth import (
     begin_login,
     clear_stored_password,
@@ -76,7 +76,7 @@ class OracleDatabase(Database):
     ) -> None:
         if _oracle_driver() is None:
             fatal_error(
-                'The oracledb module is required to connect to Oracle. Install it with: pip install "execsql2[oracle]"',
+                f"The oracledb module is required to connect to Oracle. {install_hint('oracle')}",
             )
         from execsql.types import dbt_oracle
 
@@ -164,12 +164,12 @@ class OracleDatabase(Database):
         else:
             return super().select_data(sql)
 
-    def select_rowsource(self, sql: str) -> Any:
+    def select_rowsource(self, sql: str, *, decode_bytes: bool = True) -> Any:
         """Return column names and an iterable that yields rows one at a time."""
         if sql[-1:] == ";":
-            return super().select_rowsource(sql[:-1])
+            return super().select_rowsource(sql[:-1], decode_bytes=decode_bytes)
         else:
-            return super().select_rowsource(sql)
+            return super().select_rowsource(sql, decode_bytes=decode_bytes)
 
     def select_rowdict(self, sql: str) -> Any:
         """Return column names and an iterable that yields rows as dictionaries."""

execsql/db/postgres.py

@@ -15,7 +15,7 @@ from typing import Any
 
 from execsql.db.base import Database
 from execsql.exceptions import ErrInfo
-from execsql.utils.errors import exception_desc, fatal_error
+from execsql.utils.errors import exception_desc, fatal_error, install_hint
 from execsql.utils.auth import (
     begin_login,
     clear_stored_password,
@@ -51,8 +51,7 @@ class PostgresDatabase(Database):
             import psycopg  # noqa: F401
         except Exception:
             fatal_error(
-                "The psycopg module (psycopg3) is required to connect to PostgreSQL.   "
-                "See https://www.psycopg.org/psycopg3/",
+                f"The psycopg module (psycopg3) is required to connect to PostgreSQL. {install_hint('postgres')}",
             )
         from execsql.types import dbt_postgres
 

execsql/db/sqlserver.py

@@ -11,7 +11,7 @@ import re
 
 from execsql.db.base import Database
 from execsql.exceptions import ErrInfo
-from execsql.utils.errors import fatal_error
+from execsql.utils.errors import fatal_error, install_hint
 from execsql.utils.auth import (
     begin_login,
     clear_stored_password,
@@ -41,7 +41,7 @@ class SqlServerDatabase(Database):
         try:
             import pyodbc  # noqa: F401
         except Exception:
-            fatal_error("The pyodbc module is required.  See http://github.com/mkleehammer/pyodbc")
+            fatal_error(f"The pyodbc module is required to connect to SQL Server. {install_hint('mssql')}")
         from execsql.types import dbt_sqlserver
 
         super().__init__(

execsql/exporters/duckdb.py

@@ -33,9 +33,9 @@ def export_duckdb(
     try:
         import duckdb
     except Exception:
-        from execsql.utils.errors import fatal_error
+        from execsql.utils.errors import fatal_error, install_hint
 
-        fatal_error("The duckdb module is required to export data in that format.")
+        fatal_error(f"The duckdb module is required to export data in that format. {install_hint('duckdb')}")
         return
 
     from execsql.models import DataTable

execsql/exporters/ods.py

@@ -20,7 +20,7 @@ import execsql.state as _state
 from execsql.exceptions import OdsFileError
 from execsql.exceptions import ErrInfo
 from execsql.script import current_script_line
-from execsql.utils.errors import exception_desc, fatal_error
+from execsql.utils.errors import exception_desc, fatal_error, install_hint
 from execsql.utils.fileio import filewriter_close
 from execsql.utils.strings import unquoted
 
@@ -57,7 +57,7 @@ class OdsFile:
             import odf.number  # noqa: F401
             import odf.style  # noqa: F401
         except ImportError:
-            fatal_error("The odfpy library is needed to create OpenDocument spreadsheets.")
+            fatal_error(f"The odfpy library is needed to create OpenDocument spreadsheets. {install_hint('formats')}")
         self.filename: str | None = None
         self.wbk: Any = None
         self.cell_style_names: list[str] = []

execsql/exporters/templates.py

@@ -14,7 +14,7 @@ from typing import Any
 
 import execsql.state as _state
 from execsql.exceptions import ErrInfo
-from execsql.utils.errors import fatal_error
+from execsql.utils.errors import fatal_error, install_hint
 from execsql.utils.fileio import filewriter_close
 
 __all__ = ["StrTemplateReport", "JinjaTemplateReport", "report_query"]
@@ -91,7 +91,7 @@ class JinjaTemplateReport:
             self._jinja2 = jinja2
         except ImportError:
             fatal_error(
-                "The jinja2 library is required to produce reports with the Jinja2 templating system.   See http://jinja.pocoo.org/",
+                f"The jinja2 library is required to produce reports with the Jinja2 templating system. {install_hint('formats')}",
             )
         conf = _state.conf
         template_root = getattr(conf, "template_root", None)

execsql/exporters/xls.py

@@ -22,7 +22,7 @@ from pathlib import Path
 from typing import Any, cast
 
 from execsql.exceptions import XlsFileError, XlsxFileError
-from execsql.utils.errors import fatal_error
+from execsql.utils.errors import fatal_error, install_hint
 
 __all__ = ["XlsFile", "XlsxFile"]
 
@@ -51,7 +51,7 @@ class XlsFile:
 
             self._xlrd = xlrd
         except ImportError:
-            fatal_error("The xlrd library is needed to read Excel (.xls) spreadsheets.")
+            fatal_error(f"The xlrd library is needed to read Excel (.xls) spreadsheets. {install_hint('formats')}")
         self.filename: str | None = None
         self.encoding: str | None = None
         self.wbk: Any = None
@@ -190,7 +190,7 @@ class XlsxFile:
 
             self._openpyxl = openpyxl
         except ImportError:
-            fatal_error("The openpyxl library is needed to read Excel (.xlsx) spreadsheets.")
+            fatal_error(f"The openpyxl library is needed to read Excel (.xlsx) spreadsheets. {install_hint('formats')}")
         self.filename: str | None = None
         self.encoding: str | None = None
         self.wbk: Any = None

execsql/exporters/xlsx.py

@@ -20,7 +20,7 @@ from execsql.exceptions import ErrInfo
 from execsql.exporters.base import ExportRecord
 from execsql.exporters.pretty import prettyprint_query
 from execsql.script import current_script_line
-from execsql.utils.errors import exception_desc, fatal_error
+from execsql.utils.errors import exception_desc, fatal_error, install_hint
 from execsql.utils.fileio import filewriter_close
 from execsql.utils.strings import unquoted
 
@@ -39,7 +39,7 @@ def _require_openpyxl() -> Any:
         return openpyxl
     except ImportError:
         fatal_error(
-            "The openpyxl library is needed to write Excel (.xlsx) spreadsheets (install the formats extra, execsql2[formats]).",
+            f"The openpyxl library is needed to write Excel (.xlsx) spreadsheets. {install_hint('formats')}",
         )
 
 

execsql/exporters/yaml.py

@@ -6,8 +6,7 @@ YAML export for execsql.
 Provides :func:`write_query_to_yaml` which serialises a query result set as a
 YAML sequence of mappings (one mapping per row).
 
-Requires the ``PyYAML`` package (``pip install PyYAML`` or
-``pip install 'execsql2[formats]'``).
+Requires the ``PyYAML`` package (the ``formats`` extra).
 """
 
 from typing import Any
@@ -15,7 +14,7 @@ from typing import Any
 import execsql.state as _state
 from execsql.exceptions import ErrInfo
 from execsql.exporters.zip import ZipWriter
-from execsql.utils.errors import exception_desc
+from execsql.utils.errors import exception_desc, install_hint
 from execsql.utils.fileio import filewriter_close
 
 __all__ = ["write_query_to_yaml"]
@@ -54,7 +53,7 @@ def write_query_to_yaml(
     except ImportError as exc:
         raise ErrInfo(
             "error",
-            other_msg=("PyYAML is required for FORMAT YAML export. Install it with: pip install PyYAML"),
+            other_msg=f"PyYAML is required for FORMAT YAML export. {install_hint('formats')}",
         ) from exc
 
     conf = _state.conf

execsql/format.py

@@ -21,11 +21,14 @@ from types import ModuleType
 __all__ = ["collect_paths", "format_file", "open_dollar_quote", "parse_keyword", "run_formatter"]
 
 
-_SQLGLOT_MISSING_MSG = (
-    "execsql format requires sqlglot for SQL reformatting.\n"
-    '  Install the formatter extra:  uv tool install "execsql2[formatter]"  (or pip install "execsql2[formatter]")\n'
-    "  Or skip SQL reformatting with the --no-sql flag."
-)
+def _sqlglot_missing_msg() -> str:
+    from execsql.utils.errors import install_hint
+
+    return (
+        "execsql format requires sqlglot for SQL reformatting.\n"
+        f"  {install_hint('formatter')}\n"
+        "  Or skip SQL reformatting with the --no-sql flag."
+    )
 
 
 def _require_sqlglot():
@@ -36,7 +39,7 @@ def _require_sqlglot():
 
         return sqlglot
     except ImportError as e:
-        raise ImportError(_SQLGLOT_MISSING_MSG) from e
+        raise ImportError(_sqlglot_missing_msg()) from e
 
 
 # ---------------------------------------------------------------------------
@@ -532,20 +535,57 @@ def _statement_sources(sqlglot: ModuleType, sql: str) -> list[str]:
     return sources
 
 
-def _layout_tokens(sqlglot: ModuleType, sql: str) -> list[str]:
-    """*sql*'s tokens with everything the formatter may change taken out.
+def _ends_with_semicolon(sqlglot: ModuleType, sql: str) -> bool:
+    """Whether the last token of *sql* is a statement-ending ``;``."""
+    tokens = sqlglot.tokenize(sql, read="postgres")
+    return bool(tokens) and tokens[-1].token_type.name == "SEMICOLON"
+
+
+def _layout_tokens(sqlglot: ModuleType, sql: str) -> list[tuple[str, str]]:
+    """*sql*'s tokens, as (type, text), with everything the formatter may change taken out.
 
-    Whitespace and comments are not tokens.  Keywords and unquoted names are
-    compared without case; strings and quoted names exactly.
+    Whitespace and comments are not tokens.  Keywords and unquoted names
+    (function names included) are compared without case; strings and quoted
+    names exactly.  The type is compared too, so a string that came back as a
+    quoted name of the same text is a change.
     """
     return [
-        token.text
-        if token.token_type.name.endswith("STRING") or token.token_type.name == "IDENTIFIER"
-        else token.text.upper()
+        (
+            token.token_type.name,
+            token.text
+            if token.token_type.name.endswith("STRING") or token.token_type.name == "IDENTIFIER"
+            else token.text.upper(),
+        )
         for token in sqlglot.tokenize(sql, read="postgres")
     ]
 
 
+# An optimizer hint (``/*+ ... */``, Oracle and MySQL) or a MySQL executable
+# comment (``/*! ... */``) is SQL the server reads, though it looks like a
+# comment.  sqlglot keeps neither: it writes them back as ``/* + ... */`` and
+# moves a hint away from its keyword, which disables it.
+_RX_HINT_COMMENT = re.compile(r"/\*[+!]")
+
+
+def _has_hint_comment(sqlglot: ModuleType, sql: str) -> bool:
+    """Whether *sql* holds a hint or executable comment outside its strings and quoted names."""
+    if not _RX_HINT_COMMENT.search(sql):
+        return False
+    tokens = [(t.start, t.end) for t in sqlglot.tokenize(sql, read="postgres")]
+    return any(not any(start <= m.start() <= end for start, end in tokens) for m in _RX_HINT_COMMENT.finditer(sql))
+
+
+def _as_written(source: str) -> str:
+    """A statement's source text to keep as written, without the space that followed the previous ``;``.
+
+    A statement that starts on its own line keeps that line's indentation.
+    """
+    source = source.rstrip()
+    body = source.lstrip()
+    lead = source[: len(source) - len(body)]
+    return source[lead.rfind("\n") + 1 :] if "\n" in lead else body
+
+
 def _sqlglot_format(
     sql_lines: list[str],
     sql_indent: int = 4,
@@ -596,9 +636,10 @@ def _sqlglot_format(
             # parse is left exactly as written.
             ast = sqlglot.parse(protected, read="postgres", error_level=sqlglot_errors.ErrorLevel.RAISE)
             nodes = [node for node in ast if node is not None]
-            sources = None if rewrite_sql else _statement_sources(sqlglot, protected)
-            if sources is not None and len(sources) != len(nodes):
+            sources = _statement_sources(sqlglot, protected)
+            if len(sources) != len(nodes) and (not rewrite_sql or _has_hint_comment(sqlglot, protected)):
                 return sql_lines
+            aligned = len(sources) == len(nodes)
             statements: list[str] = []
             for i, node in enumerate(nodes):
                 # For Command nodes (psql backslash commands, ERROR:, etc.)
@@ -614,20 +655,29 @@ def _sqlglot_format(
                         max_text_width=120,
                     )
                 generated = re.sub(r"\bINTO TEMPORARY\b(?!\s+TABLE)", "INTO TEMPORARY TABLE", generated)
-                if sources is not None and _layout_tokens(sqlglot, generated) != _layout_tokens(sqlglot, sources[i]):
-                    generated = sources[i].lstrip("\n").rstrip()  # layout only: keep it as written
+                if aligned and (
+                    _has_hint_comment(sqlglot, sources[i])
+                    or (not rewrite_sql and _layout_tokens(sqlglot, generated) != _layout_tokens(sqlglot, sources[i]))
+                ):
+                    generated = _as_written(sources[i])
                 statements.append(generated)
         stmts = [s for s in statements if s]
         if not stmts:
             return sql_lines
 
+        # Terminate the last statement only if the source did: execsql refuses
+        # a script whose last statement is unfinished, and formatting must not
+        # turn it into one that runs.
+        terminated = _ends_with_semicolon(sqlglot, protected)
+
         # Safety: if sqlglot produced more statements than the input had
-        # semicolons, it likely split a fragment (e.g. a SELECT column list)
-        # into multiple pseudo-statements.  Fall back to the original text.
-        if len(stmts) > max(input_semis, 1):
+        # semicolons (plus an unterminated last one), it likely split a
+        # fragment (e.g. a SELECT column list) into multiple pseudo-statements.
+        # Fall back to the original text.
+        if len(stmts) > max(input_semis + (0 if terminated else 1), 1):
             return sql_lines
 
-        joined = ";\n".join(stmts) + ";"
+        joined = ";\n".join(stmts) + (";" if terminated else "")
 
         # Content-loss check: sqlglot with IGNORE error level can silently
         # drop tokens it doesn't understand (e.g. ``ERROR: ...``).  If the

execsql/importers/base.py

@@ -16,15 +16,7 @@ from execsql.exceptions import ErrInfo
 from execsql.db.base import Database
 import execsql.state as _state
 
-__all__ = ["import_data_table", "refuse_existing_table", "table_exists_if_known"]
-
-
-def table_exists_if_known(db: Database, table_name: str, schema_name: str | None = None) -> bool | None:
-    """Whether the table exists, or ``None`` when the database cannot say (no catalog access, ...)."""
-    try:
-        return db.table_exists(table_name, schema_name)
-    except Exception:
-        return None
+__all__ = ["import_data_table", "refuse_existing_table"]
 
 
 def refuse_existing_table(db: Database, schema_name: str | None, table_name: str) -> None:
@@ -43,7 +35,11 @@ def refuse_existing_table(db: Database, schema_name: str | None, table_name: str
             lookup_schema = None
         if lookup_schema is None:
             return  # An unqualified lookup would search every schema.
-    if table_exists_if_known(db, table_name, lookup_schema):
+    try:
+        exists = db.table_exists_where_created(table_name, lookup_schema)
+    except Exception:
+        return  # The database cannot say; CREATE TABLE reports any conflict.
+    if exists:
         name = db.schema_qualified_table_name(schema_name, table_name)
         raise ErrInfo(
             type="cmd",

execsql/lsp/document.py

@@ -86,6 +86,8 @@ class ScriptIndex:
 # cannot make every request read a huge file or walk an endless include chain.
 MAX_INCLUDED_BYTES = 10 * 1024 * 1024
 MAX_INCLUDED_FILES = 200
+# The files an INCLUDE names, all together; past it indexing follows no more of them.
+MAX_INCLUDED_TOTAL_BYTES = 20 * 1024 * 1024
 
 
 def read_included(path: Path) -> str | None:
@@ -121,7 +123,7 @@ def index_script(
     prefers the editor's unsaved copy of a file that is open.
     """
     index = ScriptIndex(path=path)
-    _index_into(index, source, path, set(), read, top=True)
+    _index_into(index, source, path, set(), read, top=True, budget=[MAX_INCLUDED_TOTAL_BYTES])
     return index
 
 
@@ -133,6 +135,7 @@ def _index_into(
     read: Callable[[Path], str | None],
     *,
     top: bool,
+    budget: list[int],
 ) -> None:
     if path is not None:
         seen.add(str(Path(path).resolve()))
@@ -166,8 +169,9 @@ def _index_into(
                 index.includes.append((Location(path, row, start, end), str(resolved)))
             if "!" not in target and str(resolved.resolve()) not in seen and len(seen) < MAX_INCLUDED_FILES:
                 included = read(resolved)
-                if included is not None:
-                    _index_into(index, included, str(resolved), seen, read, top=False)
+                if included is not None and len(included) <= budget[0]:
+                    budget[0] -= len(included)
+                    _index_into(index, included, str(resolved), seen, read, top=False, budget=budget)
 
     for row, text in enumerate(lines):
         for m in _RX_VARIABLE.finditer(text):

execsql/metacommands/debug.py

@@ -27,7 +27,7 @@ from pathlib import Path
 from typing import Any
 
 import execsql.state as _state
-from execsql.utils.errors import fatal_error
+from execsql.utils.errors import fatal_error, install_hint
 from execsql.utils.fileio import EncodedFile, filewriter_open_as_new, filewriter_write
 
 
@@ -110,7 +110,7 @@ def x_debug_write_odbc_drivers(**kwargs: Any) -> None:
     try:
         import pyodbc
     except Exception:
-        fatal_error("The pyodbc module is required.")
+        fatal_error(f"The pyodbc module is required to list ODBC drivers. {install_hint('odbc')}")
     output_dest = kwargs["filename"]
     append = kwargs["append"]
     if output_dest is not None and output_dest != "stdout" and append is None:

execsql/metacommands/io_fileops.py

@@ -114,7 +114,7 @@ def x_copy(**kwargs: Any) -> None:
 
     if new_tbl2:
         try:
-            hdrs, rows = db1.select_rowsource(select_stmt)
+            hdrs, rows = db1.select_rowsource(select_stmt, decode_bytes=False)
         except ErrInfo:
             raise
         except Exception as e:
@@ -142,7 +142,7 @@ def x_copy(**kwargs: Any) -> None:
             db2.execute("COMMIT;")
     else:
         try:
-            hdrs, rows = db1.select_rowsource(select_stmt)
+            hdrs, rows = db1.select_rowsource(select_stmt, decode_bytes=False)
         except ErrInfo:
             raise
         except Exception as e:
@@ -153,7 +153,7 @@ def x_copy(**kwargs: Any) -> None:
     def get_ts() -> DataTable:
         nonlocal get_ts_tablespec
         if get_ts_tablespec is None:
-            ts_hdrs, ts_rows = db1.select_rowsource(select_stmt)
+            ts_hdrs, ts_rows = db1.select_rowsource(select_stmt, decode_bytes=False)
             get_ts_tablespec = DataTable(ts_hdrs, ts_rows, infer_strings=False)
         return get_ts_tablespec
 
@@ -201,7 +201,7 @@ def x_copy_query(**kwargs: Any) -> None:
 
     if new_tbl2:
         try:
-            hdrs, rows = db1.select_rowsource(select_stmt)
+            hdrs, rows = db1.select_rowsource(select_stmt, decode_bytes=False)
         except ErrInfo:
             raise
         except Exception as e:
@@ -229,7 +229,7 @@ def x_copy_query(**kwargs: Any) -> None:
             db2.execute("COMMIT;")
     else:
         try:
-            hdrs, rows = db1.select_rowsource(select_stmt)
+            hdrs, rows = db1.select_rowsource(select_stmt, decode_bytes=False)
         except ErrInfo:
             raise
         except Exception as e:
@@ -240,7 +240,7 @@ def x_copy_query(**kwargs: Any) -> None:
     def get_ts() -> DataTable:
         nonlocal get_ts_tablespec
         if get_ts_tablespec is None:
-            ts_hdrs, ts_rows = db1.select_rowsource(select_stmt)
+            ts_hdrs, ts_rows = db1.select_rowsource(select_stmt, decode_bytes=False)
             get_ts_tablespec = DataTable(ts_hdrs, ts_rows, infer_strings=False)
         return get_ts_tablespec
 

execsql/metacommands/upsert.py

@@ -17,7 +17,7 @@ from typing import Any
 import execsql.state as _state
 from execsql.exceptions import ErrInfo
 from execsql.types import dbt_postgres
-from execsql.utils.errors import exception_desc
+from execsql.utils.errors import exception_desc, install_hint
 
 
 # ---------------------------------------------------------------------------
@@ -213,10 +213,7 @@ def _require_pg_upsert() -> None:
     except ImportError as exc:
         raise ErrInfo(
             "exception",
-            other_msg=(
-                'PG_UPSERT requires the pg-upsert package. Install the upsert extra: uv tool install "execsql2[upsert]"'
-                ' (or pip install "execsql2[upsert]").'
-            ),
+            other_msg=f"PG_UPSERT requires the pg-upsert package. {install_hint('upsert')}",
         ) from exc
 
 

execsql/models.py

@@ -167,8 +167,16 @@ class Column:
                 self.Accum(DT_Text()),
                 self.Accum(DT_Binary()),
             )
+        if not infer_strings:
+            # Values from a database cursor: a bytes value is binary data, so
+            # Binary is tried before the text types (which accept anything).
+            text = [ac for ac in self.accums if isinstance(ac.dt, (DT_Character, DT_Varchar, DT_Text))]
+            binary = [ac for ac in self.accums if isinstance(ac.dt, DT_Binary)]
+            self.accums = tuple(ac for ac in self.accums if ac not in text and ac not in binary) + tuple(binary + text)
         self.infer_strings = infer_strings
         self.str_accums = tuple(ac for ac in self.accums if isinstance(ac.dt, (DT_Character, DT_Varchar, DT_Text)))
+        # A bytes value is checked as binary or text only: int(b"12") is 12.
+        self.bytes_accums = tuple(ac for ac in self.accums if isinstance(ac.dt, DT_Binary)) + self.str_accums
         self.dt_eval = False
         # self.dt is a tuple of: 0: column name; 1: data type class; 2: max length or None;
         # 3: bool indicating any null values; 4: precision or None; 5: scale or None.
@@ -198,6 +206,9 @@ class Column:
         if not self.infer_strings and isinstance(column_value, str):
             for dt in self.str_accums:
                 dt.check(column_value)
+        elif not self.infer_strings and isinstance(column_value, (bytes, bytearray, memoryview)):
+            for dt in self.bytes_accums:
+                dt.check(column_value)
         else:
             for dt in self.accums:
                 dt.check(column_value)

execsql/utils/errors.py

@@ -37,8 +37,24 @@ __all__ = [
     "stamp_errinfo",
     "write_warning",
     "file_size_date",
+    "install_hint",
 ]
 
+_ADDING_AN_EXTRA = "https://execsql2.readthedocs.io/en/latest/getting-started/installation/#adding-an-extra-later"
+
+
+def install_hint(extra: str) -> str:
+    """How to install the execsql2 *extra*, for a message about a missing optional package.
+
+    ``uv tool install`` and ``pipx install --force`` replace an install's
+    extras with the ones named, so the hint says to keep those already there.
+    """
+    return (
+        f'Install the {extra} extra along with the extras you already have: uv tool install "execsql2[...,{extra}]" '
+        f'or pipx install --force "execsql2[...,{extra}]" (in a project environment: pip install "execsql2[{extra}]"). '
+        f"See {_ADDING_AN_EXTRA}"
+    )
+
 
 def exception_info() -> tuple:
     # Returns the exception type, value, source file name, source line number, and source line text.

{execsql2-2.27.0.dist-info → execsql2-2.28.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: execsql2
-Version: 2.27.0
+Version: 2.28.0
 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
@@ -95,8 +95,10 @@ Requires-Dist: openpyxl>=3.1; extra == 'dev'
 Requires-Dist: polars>=1.0; extra == 'dev'
 Requires-Dist: pre-commit>=3.5.0; extra == 'dev'
 Requires-Dist: pygls<3,>=2.1; extra == 'dev'
+Requires-Dist: pytest-asyncio>=1.0; extra == 'dev'
 Requires-Dist: pytest-cov>=5.0.0; extra == 'dev'
 Requires-Dist: pytest-lsp>=1.0; extra == 'dev'
+Requires-Dist: pytest>=8; extra == 'dev'
 Requires-Dist: pyyaml>=6.0; extra == 'dev'
 Requires-Dist: ruff>=0.4; extra == 'dev'
 Requires-Dist: sqlglot<30.22,>=30.21.0; extra == 'dev'
@@ -464,7 +466,7 @@ execsql format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.27.0
+    rev: v2.28.0
     hooks:
       - id: execsql-format
       - id: execsql-lint

{execsql2-2.27.0.dist-info → execsql2-2.28.0.dist-info}/RECORD

@@ -4,10 +4,10 @@ execsql/api.py,sha256=UJJSlFHySuINeoExaMXqhl00hVSPH1s7G4m8T0NX_xI,26484
 execsql/config.py,sha256=GUKE3sLGExMMhMkmxi8eXXBWmN74E0vqnt1eTBPRsG4,38166
 execsql/config_validation.py,sha256=a4ZszyJFGTNgs1jkvXE3yMCaYFtF1Uqih2ojMDVh1v8,10556
 execsql/exceptions.py,sha256=aHavdblmP7m5ZLxyyKKmPSwwbdmP962j4ShP1Gd9r64,9651
-execsql/format.py,sha256=_KNFGTnEihO0Bn-E8k0QNLijAS4NDE8Ee1ldL7_MKZc,57430
+execsql/format.py,sha256=z-KZ8VY1muz8S6iaErZX9E_7wE_VtjEcUB7e_KyhfyI,59565
 execsql/interactive.py,sha256=7vm7NAlcarBJJOIffcLOcJqH9ZCInvHB_CmC2sQsXf8,8241
 execsql/manifest.py,sha256=ibceEZtH2FqsUiujbTGy5D3W0WgO4tFCs7bjIHVdep4,8062
-execsql/models.py,sha256=yXR9FMCSCRonfyiuWlYwqLBMLzWQcvFQOjGHogM8Veg,15556
+execsql/models.py,sha256=caUGQ3C9hvFaj6c6-GwBzZc8FAGTD1ZSJYd8bFyRh5I,16410
 execsql/parser.py,sha256=bw26e1lD-PZscV11VtBdqSLkjpcYfNLQC2EYfYD5UwU,16012
 execsql/plugins.py,sha256=RykMlIjTyWcnQc9ygjLErS3wdcsZSsG9QTIvg4DwfAI,13626
 execsql/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,56 +19,56 @@ execsql/cli/application.py,sha256=qKjkhDMWB7fEjEbqOLZ3pNFw80piBnRSeW_DfZg-9MA,12
 execsql/cli/dispatch.py,sha256=deyN2QQYvdzMSqGGa3CSMpaqdLNeMgc5Uke0mUbl764,2704
 execsql/cli/dsn.py,sha256=uBspf8DXCn2pXmT1Ug1c4IG7IgR5IFGKp9138puaubo,3289
 execsql/cli/help.py,sha256=bEy6ssVjyIw73JD_UPLXnCtnCifdVCKJr_cydAAVxhk,8220
-execsql/cli/lint.py,sha256=11hmvhCRn7iq-Y1A-a6dxjktsRQChAatz7InF08jwJU,46759
+execsql/cli/lint.py,sha256=8dZhwPrkc-_0WFd1D_qjBdKuql0SP5dpkdBRFd25xC8,47604
 execsql/cli/options.py,sha256=Srhf1gEOB5yy_7PxkTKBv07xK8Qzw8H-z7PUUnItpwE,2916
 execsql/cli/run.py,sha256=5f0SX6QyNl8Ur2MwuW2GaN1OqVpWbEI8CQV3k-hBwH8,41987
 execsql/cli/commands/__init__.py,sha256=FVe_xF7w98krP-USxqf-BIcflA1ctMYVsV8p0i6cChA,572
 execsql/cli/commands/config.py,sha256=V7CGGkhSCqeJIlAXxAYyG_xNhnsORiwqth2XWEVPzss,8213
-execsql/cli/commands/format.py,sha256=4BY2EUExt32DOv871SZW3kimK4x9qaUsElhu3B49yqc,4412
+execsql/cli/commands/format.py,sha256=3awfNmCc6kImeyXKZo1Jt1qXbEuWk86ZllqEOY5vxzw,4456
 execsql/cli/commands/init.py,sha256=kmuFgGz8sv_1KfiNh190E3A23evqkgYZeBRTU6vdjbs,5465
 execsql/cli/commands/lint.py,sha256=Lba5IDsXtiUbQ6DkhC9fdLnoSpfoaewoAWF-ei3h59s,8189
 execsql/cli/commands/listing.py,sha256=thtkJ-ILGd0SPs57oVIMkkCGpXsfS0hQxueMc2ccRVw,3514
-execsql/cli/commands/lsp.py,sha256=3Q2Liz3zCiSrlZVkqwvG64PgZOifKn_qB46MVRQqBns,1645
+execsql/cli/commands/lsp.py,sha256=4Xng1xtoCxF6X0eQ8oC4KnV0ovEeGmlDb0tpdjJnskg,2483
 execsql/cli/commands/run.py,sha256=sGFDku66CazJrorr0mmrhUI3QDvQVSMEYlU8G1Pd5fQ,16492
 execsql/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 execsql/data/execsql.conf.template,sha256=pqh7G21ifYO0BjZoTgUhGyQAx4eKOmbIr6nToc1V7QA,12494
 execsql/data/script_header.sql,sha256=a7WKScekNgJoxVEmMRTkWv8NsAzW1jJ4vJfGy9HVy0g,349
 execsql/db/__init__.py,sha256=jTbuafuKOqYtXFR1wvCOoKK5Lr3l1uErfaIbIr6UywI,1063
-execsql/db/access.py,sha256=O19alGOCjhBtVFaCnGN8zwVZ2wR57h1spizAF5dhUOg,21207
-execsql/db/base.py,sha256=K_NJ5Tpn68qUyc5epnT3V3jUxkv1lCAXF0rGul-8otc,42264
-execsql/db/dsn.py,sha256=a3_q7oucR37CMCKNO9S5ShsB_JDwmZY4d8QI1aqeFSU,6893
-execsql/db/duckdb.py,sha256=h62nEuwNl8Bz8ZcJJNIAfFK1o91KXxAeh8unlwTivKc,7047
+execsql/db/access.py,sha256=xfBzcgP1qJovxSYwrpu0bdxqyJWqMoMP8i4FsaCTYXA,21306
+execsql/db/base.py,sha256=rMkOxfqhlrG1_LnlkIQYwZXnm-wRd2xN4YQ9oY7OOZM,42990
+execsql/db/dsn.py,sha256=CaISffisqO5IjSE-elEpwK9vXLaArp3ItpV8lvRTu-I,6920
+execsql/db/duckdb.py,sha256=2iVlbjQdOSAwhI2LxWEm7FYZxjjVcKiE8rT_3VJdRIo,7761
 execsql/db/factory.py,sha256=cMptU3BL1Nsilo7LKLAI5RR-LiC9RTH-3UC9rHT2JLQ,5519
-execsql/db/firebird.py,sha256=sU2XqYV0U6hTgUuetFfMdlZwlBlXgPVXXn_wi1XCy1U,10196
-execsql/db/mysql.py,sha256=ooH4uNomr_VatEldJ70ynsOth4_STa8-761O33NfndY,21496
-execsql/db/oracle.py,sha256=-n8CgbZd9zaGnbfQQmWAdFgPA_B-HkLNC6yvENbzqyc,13720
-execsql/db/postgres.py,sha256=QXL34lyg6w7zj2S-1AAlyswPGjbXZz7GZS2qFB4pANY,23604
+execsql/db/firebird.py,sha256=CoNnzFtOFAkp8OJByXXXclitCPAAjM23eFJGfy3C7IE,10171
+execsql/db/mysql.py,sha256=ovadEv8InaK2VZjfMRwZNQ7dTQaE2qaWNUra-FjP0xA,21492
+execsql/db/oracle.py,sha256=i5qPahsy_z1AuZT7l54Hzixknkvbzd-SCQgiVcTN94w,13796
+execsql/db/postgres.py,sha256=PZ2vXKh9Nbs6aAc899vaPz1w9ZntKNCqQ2pCl_giiVQ,23587
 execsql/db/sqlite.py,sha256=fEpNPkfJGnqm1Wx_rZK5SEqaWsBqLy85Jxk_5NsnqgM,12109
-execsql/db/sqlserver.py,sha256=e4UP2Ps0EXjVjX4TOYNslsviBF2dorx8TEvPhxb9rrY,9503
+execsql/db/sqlserver.py,sha256=cdbyHoSUKEwUee2GQTKD5SlLyBraYiOvJ2ro5MJuMFA,9525
 execsql/db/tiers.py,sha256=PH2sUYwlYqcANGVKXprWQKVIlM6fpWU9q74djn8oFwc,2924
 execsql/debug/__init__.py,sha256=j6EGUR0dHzUhWN1mHHtf1-Lhjq3Sb1V-vmnq2Ztgj1M,178
 execsql/debug/repl.py,sha256=jnwrqRac4krc1pES7Ni-j1Dyw3mJIcWl5LQQIX1GkRw,20753
 execsql/exporters/__init__.py,sha256=-Cnji-OgodJV8ftcDcOyTof0kQMy9J5kKVC8GVFpc3o,670
 execsql/exporters/base.py,sha256=_GoO0YqwlTxrjogxHI3CxxRR64sMgIEjRogt0KCqzoY,6402
 execsql/exporters/delimited.py,sha256=N0cP_CNlb_LLCUqbHmTQsOGufWnD_ddGdeFnXPE8Erc,35606
-execsql/exporters/duckdb.py,sha256=912TMdYaSVD-kb-_oebTBHQp8FvYMbWTDEDD80w5Z50,3455
+execsql/exporters/duckdb.py,sha256=1Qo6idHvQIJjGbA5trt_s5to9XtoDpcS_wWGXOrVe6I,3495
 execsql/exporters/feather.py,sha256=tah48aep0cQRikZcmADXUPTzFddgDUT78Ndw_l0Hsj4,4178
 execsql/exporters/html.py,sha256=hwf9UHs7EZ7xiP3p9ilBIsAukXcDu-KO2dcQHVh2z30,10111
 execsql/exporters/json.py,sha256=wWGT6zjvIdWlO5FmXbaEw1xOhy23f1YY6bm5uQD_NS0,4393
 execsql/exporters/latex.py,sha256=bdUN3GwfENUZHgpw6bvjsjfivDgzyf-HRkYTP-eH-pM,5480
 execsql/exporters/markdown.py,sha256=FuMGFxm9uZUOrdEuXT2ZZLCqmVDly7SMrFlrjP6kVEI,4827
-execsql/exporters/ods.py,sha256=Ke9pfcyT6R85LWIWcMI6pzRzkKir5w_gmiptCeeuoBc,20730
+execsql/exporters/ods.py,sha256=5Qubpuz7CLIrl7KgMp1uXIFPrF_7alMjuTuVdj76eh4,20771
 execsql/exporters/parquet.py,sha256=mbCo2Wlit1lkXmyo5EyLd_ATIHSICS49bouiBT2kdAs,1121
 execsql/exporters/pretty.py,sha256=SiJHBXIjoFsOHegXcdrtxYa6xSIPga1U0DQEy7pK4QY,4145
 execsql/exporters/protocol.py,sha256=BxATgz0xKHbB2FpZBeNg7wZfIiCohhD1awlr3JCec0c,4372
 execsql/exporters/raw.py,sha256=9o3BMt7UYmnjbP8OEzmM2kNKfwwERi2yDcuNfUoEfuQ,2530
 execsql/exporters/sqlite.py,sha256=QjP_W90S-hecNqp2A-Vy58DD8MZitME1sTq4lqIS43w,3401
-execsql/exporters/templates.py,sha256=nRFurwTb5nxoyHpx609FGIp3MDbX_mYQ3IvgswaEbyA,7054
+execsql/exporters/templates.py,sha256=N9PRFet0mYuDQFu7PNbq5c6qGu2You2qfHpqnxg17NA,7065
 execsql/exporters/values.py,sha256=UPxN5IprasBZLqM5jfUXQihjdTeBFTxbJslOEtmGOcY,3384
-execsql/exporters/xls.py,sha256=iZ_N7hneyfaDKbO1XdYv6doJCFPqJWEJql5rduoNyRU,11197
-execsql/exporters/xlsx.py,sha256=hmL0i-2HweXFenl5uXjM3-w2DW2Ky8DeYTcZnFzmeOU,12708
+execsql/exporters/xls.py,sha256=n4J4J4sJq-5iU3Fa1JTAxTq8VAXEhv2znNRGoi1arSw,11265
+execsql/exporters/xlsx.py,sha256=7sm-3KniYlB2K-n6xQmIoHbAvl2ryJhFWU95SEkR7e4,12702
 execsql/exporters/xml.py,sha256=t1PSr3i8xvTCWzd9jaxxAy5NcRpl6sqjnZALafKCqpM,2575
-execsql/exporters/yaml.py,sha256=R61Rs_0rd5G3bg344L4hC84GM79IfYXaDO2tkF-BluY,3121
+execsql/exporters/yaml.py,sha256=ex2h91E12wItvh84AarjrDTcZ4SDx9uq0c9wtr-NuQM,3084
 execsql/exporters/zip.py,sha256=0vDkXB19WzLzgCACBVNnGJYxacgBwEehQDL7Inl-rgw,5002
 execsql/gui/__init__.py,sha256=oCb-cyhLZzVpWJ4WU5HbqEDBrV-lm0ytEwxemrOZyqs,2048
 execsql/gui/base.py,sha256=DMTqHLlpZlGCsNKyrLlJPbaxvukC0n1YmR4aHEN3jPY,14983
@@ -76,7 +76,7 @@ execsql/gui/console.py,sha256=dzdSl4NJNvRd9VvlwRCXHvfnXjQPimyTx7NcibcUZC8,18305
 execsql/gui/desktop.py,sha256=y-T317NzSs9kcA4-NZW-Dx2cZ4Bv1mPoCr7hwQCJYoo,59467
 execsql/gui/tui.py,sha256=VoUtjSMopYtbtc8_-qV7YQAFvc-bS7zrZ5J2hl1cPxM,66853
 execsql/importers/__init__.py,sha256=zZwdQxMaValCNqUrVdvaA7XPU3J8NmqVJ4uolNWY2iU,299
-execsql/importers/base.py,sha256=ikvJ98vVCcDBqp5ZdwwHwf-6zQCO4f8uI355VCVukHo,5783
+execsql/importers/base.py,sha256=N94kJ_a3_UvjOrZv7TCYOL2b4lshYb_HuLTqpht4D4A,5578
 execsql/importers/csv.py,sha256=4zIv-K02fuHKxnbqS5iTvLOeVnfssLYYJrs0Gh3qv7I,5021
 execsql/importers/feather.py,sha256=g2B69d2uv9vmnXcmjFyTVsMP40LYEzFYkhk3gD26mGw,1900
 execsql/importers/json.py,sha256=fL47h09Zzx4Qw3TTQRQJbdPdD3qVMiU-kK9C7j1IQzg,5534
@@ -86,7 +86,7 @@ execsql/lsp/__init__.py,sha256=KXpbN_CfnfMcvHmE0xPz9ddpp9CAaQH_O7mzBi4O4X8,259
 execsql/lsp/code_actions.py,sha256=QEzp7KnIS_9QeanClcpmC2miMCT9ehxxOWUth4ZHPzg,8884
 execsql/lsp/completion.py,sha256=-_HNiWzRgtJDisErNGiBHWwsKeVWBHNnAOu235XV_ys,8148
 execsql/lsp/diagnostics.py,sha256=Rf5izQN7BX2SUjll-kA5_D12BybFKdj5f4mEPQ0C2q4,2496
-execsql/lsp/document.py,sha256=1AtEQ4QKoykxCefZGCessXcB4YjXDHX918XTezOqxRI,8493
+execsql/lsp/document.py,sha256=E9FfnAypzggO__QGWSlbfa6AhYE_1IMpIbyrwkEKx8s,8774
 execsql/lsp/folding.py,sha256=PgwehzXnPcR68myldo2SYrqbfGla4f6gb_UrhKmaqyQ,2752
 execsql/lsp/formatting.py,sha256=9YpCfLsi09M1PZovB2HJN-Tp9Jqgk-2xxit5g5NrTqU,1217
 execsql/lsp/hover.py,sha256=yihlkc0i8f50rtYz8afnd-a81H1ocXOlkYb09m-VkqU,5379
@@ -98,19 +98,19 @@ execsql/metacommands/conditions.py,sha256=4DsMXr6vnfbtcKqgnxYV4UK4NmAfE_hpfgkFjl
 execsql/metacommands/connect.py,sha256=SPk4h9yiUgTD3w1gNOT_oYx8VShggsO357by5Hoy6OI,15344
 execsql/metacommands/control.py,sha256=9swW6X8jXDUpu5cHiAnQVx1ahFyWxlx7mjg4dqYfX5Y,9355
 execsql/metacommands/data.py,sha256=gaKJ0xA-maFnezT9TJv-q4G4Etn-kJnF7vZWZoG4UqI,12305
-execsql/metacommands/debug.py,sha256=XyMoKnQKyYHdzcfGUGFEaecIlDOi1LMirwbbpbiRO7I,12922
+execsql/metacommands/debug.py,sha256=mKRT7uLwnw34Xl46fNDI_zH4MsPpZyihoLlonapbXuU,12981
 execsql/metacommands/dispatch.py,sha256=so0ebcnv66NhVDtA1Bt4GelD0hsC5w7gy7rItz2Mdos,87430
 execsql/metacommands/effects.py,sha256=cRSo48R4nRJzkRR3OGHLhJzofcdAaNIobaxmn1N9TGw,3813
 execsql/metacommands/io.py,sha256=vlGBje5sgnqeilooMdhJDgSRIhysHy5_7LrKtik9Xjs,3011
 execsql/metacommands/io_export.py,sha256=YamxQwURRjZRpCG2z8W3QurncCmEmAyLFqDkxtHo5dY,14434
-execsql/metacommands/io_fileops.py,sha256=uXP5PdHOc8yi1rPo8PbWmvAx_yp69ozCkK_SHYoL0NE,12646
+execsql/metacommands/io_fileops.py,sha256=JkuHBsZFDZvAW3wUJtdWwm4qGkpXObqkQNcZalhJVkE,12766
 execsql/metacommands/io_import.py,sha256=gJICeK1MOfG6D73I7m8zBCalvr_ZJzD-QBKOpKYeYXo,15684
 execsql/metacommands/io_write.py,sha256=yXDkMbQ3haDARVATVUYZprakyJHSyk1NywdKkFLpQ14,12783
 execsql/metacommands/prompt.py,sha256=PlXhtBYCembG_1SSCrwpQR10mGF3_jXodu4aCSHlSCM,37950
 execsql/metacommands/reference.py,sha256=tMHyfpGMNJQubX4yERe_nFZaXOoxjYWI542YHusBVHE,53953
 execsql/metacommands/script_ext.py,sha256=CsUbyq8QFPnnvfX_k7fPlYNvvRw1xLmAWER4Exo5pwc,3658
 execsql/metacommands/system.py,sha256=6X2qmMpGUHDzyEluEotXt0Ks9jKQTpc2x0eoYNgN12M,7997
-execsql/metacommands/upsert.py,sha256=qez06e41ivxsLlB-Af91fkVzD6XhHVxpvv5sLMPul6M,20429
+execsql/metacommands/upsert.py,sha256=vy8zfvxs9OYsyDiXInNIRT93ovzue4N_KMPBabNH6Ys,20320
 execsql/script/__init__.py,sha256=I7hVO6wm3iOocxRRGEcFHhjdtL1moKbUYLB-wKbjPdk,3267
 execsql/script/ast.py,sha256=WqCpFxhxrT2IIGvbArTp3QS0BZryRZAb7IL4ri3I6xg,20591
 execsql/script/control.py,sha256=WqLy-HLPqHG3vEzYpKMiIJsD7LpORjyQuUWzFzcGz4w,2327
@@ -123,7 +123,7 @@ execsql/utils/auth.py,sha256=BV7VtLM-ID8jNB42vx7GEz8yb3Z1Qs9xCr4cUMqL864,14539
 execsql/utils/color.py,sha256=goQqhnLg8yERpFolQikA9zYSVcuAm0unKTJiWTbQm-U,634
 execsql/utils/crypto.py,sha256=KlT6lPk-v0-qQQfAMfWvT9Q6kRdCD3_5JVaLajNocKM,3051
 execsql/utils/datetime.py,sha256=rqtGrc0t37V00mvirJ8wJKHmDtDSYzTg_UgCyIBzv9E,5583
-execsql/utils/errors.py,sha256=JqV5mDKJnsYF8Uam6iLE3HNqkL1cUiiP8ExHpBBFnC8,11630
+execsql/utils/errors.py,sha256=NA-JXP4cyEZ8Y_KNOPLS_ebXTJhQ50gNMBSTTcnsLIc,12350
 execsql/utils/fileio.py,sha256=ADp8Iltf_zfv0PL0VRdO0BDIHkVpKVVh59_5zmkTfkw,47564
 execsql/utils/gui.py,sha256=1iiupP9AsLdR6ST0gcLE143o6y6YGUFlNv_pdVPxfCE,23943
 execsql/utils/mail.py,sha256=4RiKtXa_sqij_YGdYmjQ3PG0u3G9qjs-9caQwBErtBw,7278
@@ -131,23 +131,23 @@ execsql/utils/numeric.py,sha256=_7bi5R6pHjMCkOPne_Sh5nUj-B8e9g6WFmjptFHaunA,1573
 execsql/utils/regex.py,sha256=B3mSBhRRx_DpUnX_t9IoYd05KvWAebiLMCZqQAmEwcw,3885
 execsql/utils/strings.py,sha256=UQNjpRCEFa1UO6feU-M-9e24wWAvizs_iu_4fFusLxo,8516
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.27.0.data/data/execsql2_extras/README.md,sha256=7SG9FbBpdqkgQTTt1aBTbCgymBZyV0rLrQMQrendzxs,5032
-execsql2-2.27.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.27.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
-execsql2-2.27.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.27.0.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
-execsql2-2.27.0.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
-execsql2-2.27.0.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
-execsql2-2.27.0.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
-execsql2-2.27.0.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
-execsql2-2.27.0.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
-execsql2-2.27.0.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
-execsql2-2.27.0.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
-execsql2-2.27.0.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
-execsql2-2.27.0.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
-execsql2-2.27.0.dist-info/METADATA,sha256=2sB1585HuNTyYAej0E12cjn1uvpBg9biCkUgn9_g1Dc,27762
-execsql2-2.27.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-execsql2-2.27.0.dist-info/entry_points.txt,sha256=jOf53-4IVGjEZeNYUOF1GGaiPNfVZcNKxP3vDFKEyMA,58
-execsql2-2.27.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.27.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
-execsql2-2.27.0.dist-info/RECORD,,
+execsql2-2.28.0.data/data/execsql2_extras/README.md,sha256=7SG9FbBpdqkgQTTt1aBTbCgymBZyV0rLrQMQrendzxs,5032
+execsql2-2.28.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.28.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
+execsql2-2.28.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.28.0.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
+execsql2-2.28.0.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
+execsql2-2.28.0.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
+execsql2-2.28.0.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
+execsql2-2.28.0.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
+execsql2-2.28.0.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
+execsql2-2.28.0.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
+execsql2-2.28.0.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
+execsql2-2.28.0.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
+execsql2-2.28.0.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
+execsql2-2.28.0.dist-info/METADATA,sha256=8mBy6p3UOLvFCmFwhoNh77QQIR5qYSotGYH0fUF0XgQ,27854
+execsql2-2.28.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+execsql2-2.28.0.dist-info/entry_points.txt,sha256=jOf53-4IVGjEZeNYUOF1GGaiPNfVZcNKxP3vDFKEyMA,58
+execsql2-2.28.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.28.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
+execsql2-2.28.0.dist-info/RECORD,,