execsql2 2.25.0__py3-none-any.whl → 2.26.0__py3-none-any.whl

execsql/cli/commands/format.py

@@ -51,6 +51,15 @@ def format_cmd(
         help="Commas at the start of lines instead of the end. Default: [format] leading_comma, else off.",
         show_default=False,
     ),
+    rewrite_sql: bool | None = typer.Option(
+        None,
+        "--rewrite-sql/--no-rewrite-sql",
+        help=(
+            "Also let sqlglot rewrite SQL text (x::int as CAST(x AS INT), BTRIM as TRIM, an alias with AS); "
+            "without it such a statement is kept as written. Default: [format] rewrite_sql, else off."
+        ),
+        show_default=False,
+    ),
     script_encoding: ScriptEncodingOpt = None,
     # The old spelling of --script-encoding, kept working but out of --help.
     encoding: str | None = typer.Option(None, "--encoding", metavar="NAME", hidden=True),
@@ -92,6 +101,7 @@ def format_cmd(
             no_sql=no_sql,
             indent=conf.format_indent if indent is None else indent,
             leading_comma=conf.format_leading_comma if leading_comma is None else leading_comma,
+            rewrite_sql=conf.format_rewrite_sql if rewrite_sql is None else rewrite_sql,
             encoding=script_encoding or encoding or _configured_script_encoding(conf) or "utf-8",
         ),
     )

execsql/cli/lint.py

@@ -243,6 +243,12 @@ _RX_PROMPT_CREDENTIALS = re.compile(
 )
 
 _RX_VAR_REF = re.compile(r"!!([$@&~#+]?\w+)!!", re.I)
+# Every candidate reference, including one nested in another's name
+# (``!!N_!!GROUP!!_CHECKS!!``), which _RX_VAR_REF's left-to-right scan skips.
+_RX_VAR_REF_ANY = re.compile(r"(?=!!([$@&~#+]?\w+)!!)")
+# Stands for a substituted value in _unresolved_var_refs: a word character
+# (so an enclosing name still matches) that no script name contains.
+_SUBSTITUTED = "ª"
 
 
 # ---------------------------------------------------------------------------
@@ -424,54 +430,108 @@ def _extract_var_definition(
             _read_ini_vars(ini_file, ini_section, script_dir, defined)
 
 
+# Larger than any real SUB_INI file; lint reads no more than this.
+_MAX_INI_BYTES = 1024 * 1024
+
+
 def _read_ini_vars(
     ini_file: str,
     section: str,
     script_dir: Path | None,
     defined_vars: set[str],
 ) -> None:
-    """Read an INI file and register its section keys as defined variables."""
+    """Read an INI file and register its section keys as defined variables.
+
+    Only a regular file up to :data:`_MAX_INI_BYTES` is read, so a script
+    naming a FIFO or a device (``/dev/zero``) cannot hang lint or the
+    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
 
-    if not p.exists():
-        return
-
     cp = ConfigParser()
-    cp.read(p)
+    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))
+    except (OSError, UnicodeDecodeError, ConfigError):
+        return
     if cp.has_section(section):
         for key, _value in cp.items(section):
             defined_vars.add(key.upper())
 
 
-def _check_var_ref(
-    raw_name: str,
-    source: str,
-    line_no: int,
-    defined_vars: set[str],
-    issues: list[_Issue],
-) -> None:
-    """Emit a warning if *raw_name* looks like an undefined user variable."""
-    if not raw_name:
-        return
-
+def _is_known_var(raw_name: str, defined_vars: set[str]) -> bool:
+    """Whether execsql may substitute *raw_name* (as written, with its sigil) at run time."""
     sigil = raw_name[0] if raw_name[0] in ("$", "@", "&", "~", "#", "+") else ""
     name = raw_name[len(sigil) :]
 
     # Skip non-$ sigil prefixes — resolved at runtime
     if sigil in ("@", "&", "~", "#", "+"):
-        return
+        return True
 
     if sigil == "$":
         # System variables: $ARG_N is set with -a/--assign-arg, $COUNTER_N by
         # CounterVars, the rest by execsql itself.  A SUB cannot define one.
-        if re.match(r"^(?:ARG|COUNTER)_\d+$", name, re.I) or name.upper() in _get_builtin_vars():
-            return
-    elif name.upper() in defined_vars:
-        # User variables, defined by a SUB-family metacommand or a prompt.
+        return bool(re.match(r"^(?:ARG|COUNTER)_\d+$", name, re.I)) or name.upper() in _get_builtin_vars()
+    # User variables, defined by a SUB-family metacommand or a prompt.
+    return name.upper() in defined_vars
+
+
+def _unresolved_var_refs(text: str, defined_vars: set[str]) -> list[str]:
+    """The variable names in *text* that execsql would leave unsubstituted, as written.
+
+    execsql substitutes a known variable wherever ``!!name!!`` appears and
+    repeats until nothing changes, so a variable written inside another's
+    name (``!!N_!!GROUP!!_CHECKS!!``) is replaced first, and the outer name
+    is only known at run time: it is not checked.  Here each known variable
+    is replaced by a placeholder character, a name holding one counts as
+    known, and that repeats until nothing is replaced.
+
+    In a run of unknown candidates that share delimiters, the inner ones
+    (every second, from the second) are reported: with ``GROUP`` undefined,
+    ``!!N_!!GROUP!!_CHECKS!!`` reports ``GROUP``, not the fragments ``N_``
+    and ``_CHECKS``.
+    """
+    while True:
+        parts: list[str] = []
+        end = 0
+        for m in _RX_VAR_REF_ANY.finditer(text):
+            name = m.group(1)
+            if m.start() >= end and (_SUBSTITUTED in name or _is_known_var(name, defined_vars)):
+                parts += [text[end : m.start()], _SUBSTITUTED]
+                end = m.start() + len(name) + 4
+        if not parts:
+            break
+        text = "".join([*parts, text[end:]])
+
+    unresolved: list[str] = []
+    run: list[str] = []
+    end = -1
+    for m in _RX_VAR_REF_ANY.finditer(text):
+        if run and m.start() != end - 2:  # not sharing the previous candidate's closing !!
+            unresolved.extend(run if len(run) == 1 else run[1::2])
+            run = []
+        run.append(m.group(1))
+        end = m.start() + len(m.group(1)) + 4
+    unresolved.extend(run if len(run) == 1 else run[1::2])
+    return unresolved
+
+
+def _check_var_ref(
+    raw_name: str,
+    source: str,
+    line_no: int,
+    defined_vars: set[str],
+    issues: list[_Issue],
+) -> None:
+    """Emit a warning if *raw_name* looks like an undefined user variable."""
+    if not raw_name or _is_known_var(raw_name, defined_vars):
         return
 
     issues.append(
@@ -735,7 +795,7 @@ def _collect_var_references(nodes: list[Node], seen: set[str]) -> None:
     """Record every variable read anywhere beneath *nodes*: ``!!var!!``, or ``sub_defined(var)`` / ``sub_empty(var)``."""
     for node in nodes:
         for text in _referencing_text(node):
-            for m in _RX_VAR_REF.finditer(text):
+            for m in _RX_VAR_REF_ANY.finditer(text):
                 seen.add(m.group(1).lstrip("$@&~#+").upper())
             for m in _RX_VAR_TEST.finditer(text):
                 seen.add(m.group(1).lstrip("$@&~#+").upper())
@@ -826,14 +886,14 @@ def _lint_nodes(
 
         # -- Variable references in SQL --
         if isinstance(node, SqlStatement):
-            for m in _RX_VAR_REF.finditer(node.text):
-                _check_var_ref(m.group(1), src, lno, defined_vars, issues)
+            for name in _unresolved_var_refs(node.text, defined_vars):
+                _check_var_ref(name, src, lno, defined_vars, issues)
 
         # -- Metacommand checks --
         elif isinstance(node, MetaCommandStatement):
             _check_metacommand(node, issues)
-            for m in _RX_VAR_REF.finditer(node.command):
-                _check_var_ref(m.group(1), src, lno, defined_vars, issues)
+            for name in _unresolved_var_refs(node.command, defined_vars):
+                _check_var_ref(name, src, lno, defined_vars, issues)
 
         # -- IncludeDirective checks --
         elif isinstance(node, IncludeDirective):

execsql/config.py

@@ -379,6 +379,7 @@ class ConfigData:
         self._get_int(cp, self._FORMAT_SECTION, "indent", "format_indent")
         self._get_bool(cp, self._FORMAT_SECTION, "leading_comma", "format_leading_comma")
         self._get_bool(cp, self._FORMAT_SECTION, "sql", "format_sql")
+        self._get_bool(cp, self._FORMAT_SECTION, "rewrite_sql", "format_rewrite_sql")
         self._get_str(cp, self._LINT_SECTION, "select", "lint_select")
         self._get_str(cp, self._LINT_SECTION, "ignore", "lint_ignore")
         self._get_bool(cp, self._LINT_SECTION, "strict", "lint_strict")
@@ -555,6 +556,7 @@ class ConfigData:
         self.format_indent = 4
         self.format_leading_comma = False
         self.format_sql = True
+        self.format_rewrite_sql = False
         self.lint_select: str | None = None
         self.lint_ignore: str | None = None
         self.lint_strict = False

execsql/data/execsql.conf.template

@@ -369,6 +369,9 @@
 #leading_comma=No
 # Reformat SQL with sqlglot (needs the [formatter] extra). No = metacommands only.
 #sql=Yes
+# Also let sqlglot rewrite SQL text: x::int as CAST(x AS INT), BTRIM as TRIM,
+# an alias with AS. No = a statement it would rewrite is kept as written.
+#rewrite_sql=No
 
 
 [lint]

execsql/format.py

@@ -16,6 +16,7 @@ import io
 import re
 from collections.abc import Iterator
 from pathlib import Path
+from types import ModuleType
 
 __all__ = ["collect_paths", "format_file", "open_dollar_quote", "parse_keyword", "run_formatter"]
 
@@ -509,10 +510,47 @@ def _is_comment_line(line: str, in_block: bool) -> tuple[bool, bool]:
     return False, False
 
 
+def _statement_sources(sqlglot: ModuleType, sql: str) -> list[str]:
+    """The text of each statement in *sql*, split at the semicolons sqlglot's tokenizer sees.
+
+    Comments before a statement belong to it; a semicolon inside a string or
+    a quoted name is not a split.  A part holding no tokens (``;;``) is not a
+    statement, matching the ``None`` sqlglot's parser returns for it.
+    """
+    sources: list[str] = []
+    start = 0
+    has_tokens = False
+    for token in sqlglot.tokenize(sql, read="postgres"):
+        if token.token_type.name == "SEMICOLON":
+            if has_tokens:
+                sources.append(sql[start : token.start])
+            start, has_tokens = token.end + 1, False
+        else:
+            has_tokens = True
+    if has_tokens:
+        sources.append(sql[start:])
+    return sources
+
+
+def _layout_tokens(sqlglot: ModuleType, sql: str) -> list[str]:
+    """*sql*'s tokens 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.
+    """
+    return [
+        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")
+    ]
+
+
 def _sqlglot_format(
     sql_lines: list[str],
     sql_indent: int = 4,
     leading_comma: bool = False,  # noqa: ARG001 — leading-comma layout is applied as a textual post-pass on the assembled output; sqlglot's own `leading_comma=True` is non-idempotent under inline comments.
+    rewrite_sql: bool = False,
 ) -> list[str]:
     """Format a list of SQL-only lines (no comment-only lines) via sqlglot.
 
@@ -521,6 +559,12 @@ def _sqlglot_format(
     ``format_file``. sqlglot's own ``leading_comma=True`` reshuffles inline
     comments and is therefore non-idempotent on SQL with mid-statement
     comments, which is the dominant real-world case.
+
+    sqlglot also rewrites SQL into its preferred form (``x::int`` ->
+    ``CAST(x AS INT)``, ``BTRIM`` -> ``TRIM``, an alias gains ``AS``), and
+    which rewrites it makes changes between its releases (#72).  Unless
+    *rewrite_sql*, a statement whose tokens would change beyond keyword case
+    is kept as written.
     """
     sqlglot = _require_sqlglot()
     import sqlglot.errors as sqlglot_errors
@@ -551,24 +595,28 @@ def _sqlglot_format(
             # understood the whole statement, so ask it: input that does not
             # 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):
+                return sql_lines
             statements: list[str] = []
-            for node in ast:
-                if node is None:
-                    continue
+            for i, node in enumerate(nodes):
                 # For Command nodes (psql backslash commands, ERROR:, etc.)
                 # use unpretty output to avoid mangling.
                 if type(node).__name__ == "Command":
-                    statements.append(node.sql(dialect="postgres"))
+                    generated = node.sql(dialect="postgres")
                 else:
-                    statements.append(
-                        node.sql(
-                            dialect="postgres",
-                            pretty=True,
-                            pad=sql_indent,
-                            indent=sql_indent,
-                            max_text_width=120,
-                        ),
+                    generated = node.sql(
+                        dialect="postgres",
+                        pretty=True,
+                        pad=sql_indent,
+                        indent=sql_indent,
+                        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
+                statements.append(generated)
         stmts = [s for s in statements if s]
         if not stmts:
             return sql_lines
@@ -613,7 +661,6 @@ def _sqlglot_format(
         if set(_sql_literal_texts(protected)) - set(_sql_literal_texts(joined)):
             return sql_lines
 
-        joined = re.sub(r"\bINTO TEMPORARY\b(?!\s+TABLE)", "INTO TEMPORARY TABLE", joined)
         restored = _restore_estrings(joined, estrings)
         if restored is None:
             return sql_lines
@@ -701,6 +748,7 @@ def _format_preserving_comments(
     lines: list[str],
     sql_indent: int = 4,
     leading_comma: bool = False,
+    rewrite_sql: bool = False,
 ) -> list[str]:
     """Format SQL with interleaved comments via marker-based round-tripping.
 
@@ -744,8 +792,12 @@ def _format_preserving_comments(
             pending_markers.append(mid)
         else:
             # SQL line — prepend any pending markers as inline comments
+            # After the line's indentation, not before it: a statement that
+            # comes back as written (unparsable, or kept by layout-only) has
+            # its indentation read from this line once the marker is removed.
             prefix = " ".join(f"/* {m} */" for m in pending_markers)
-            processed.append(f"{prefix} {line}" if prefix else line)
+            body = line.lstrip()
+            processed.append(f"{line[: len(line) - len(body)]}{prefix} {body}" if prefix else line)
             for m in pending_markers:
                 anchor_sql[m] = stripped
                 anchor_line[m] = len(processed) - 1
@@ -760,7 +812,7 @@ def _format_preserving_comments(
     anchor_depth: dict[str, int] = {m: in_depths[i] for m, i in anchor_line.items()}
 
     # ---- Step 2: format through sqlglot ---------------------------------
-    formatted = _sqlglot_format(processed, sql_indent=sql_indent, leading_comma=leading_comma)
+    formatted = _sqlglot_format(processed, sql_indent=sql_indent, leading_comma=leading_comma, rewrite_sql=rewrite_sql)
 
     # ---- Step 3: restore surviving markers to comment lines -------------
     found_markers: set[str] = set()
@@ -908,6 +960,7 @@ def format_sql_block(
     indent: int,
     use_sql: bool,
     leading_comma: bool = False,
+    rewrite_sql: bool = False,
 ) -> list[str]:
     """Re-indent a SQL block to the current depth, optionally formatting via sqlglot."""
     if not lines:
@@ -940,7 +993,12 @@ def format_sql_block(
     # which preserves both comments AND sqlglot formatting.  When all
     # comments are between statements, the simpler segmentation works.
     if _has_mid_statement_comments(rebased):
-        formatted_lines = _format_preserving_comments(rebased, sql_indent=indent, leading_comma=leading_comma)
+        formatted_lines = _format_preserving_comments(
+            rebased,
+            sql_indent=indent,
+            leading_comma=leading_comma,
+            rewrite_sql=rewrite_sql,
+        )
         return [target_prefix + line if line.strip() else "" for line in formatted_lines]
 
     result: list[str] = []
@@ -954,7 +1012,7 @@ def format_sql_block(
         if seg_is_comment:
             result.extend(seg)
         else:
-            result.extend(_sqlglot_format(seg, sql_indent=indent, leading_comma=leading_comma))
+            result.extend(_sqlglot_format(seg, sql_indent=indent, leading_comma=leading_comma, rewrite_sql=rewrite_sql))
         seg.clear()
 
     for line in rebased:
@@ -1076,8 +1134,19 @@ def _apply_leading_comma(text: str) -> str:
     return "\n".join(lines)
 
 
-def format_file(source: str, indent: int = 4, use_sql: bool = True, leading_comma: bool = False) -> str:
-    """Format the source text of an execsql script and return the result."""
+def format_file(
+    source: str,
+    indent: int = 4,
+    use_sql: bool = True,
+    leading_comma: bool = False,
+    rewrite_sql: bool = False,
+) -> str:
+    """Format the source text of an execsql script and return the result.
+
+    SQL is laid out by sqlglot.  A statement sqlglot would also rewrite
+    (``x::int`` as ``CAST(x AS INT)``, ``BTRIM`` as ``TRIM``, an alias with
+    ``AS``) is kept as written unless *rewrite_sql*.
+    """
     # Normalize any leading-comma SQL in the source to trailing commas so
     # that sqlglot always sees the same comma shape regardless of how
     # the user saved the file. The post-pass at the bottom of this
@@ -1124,7 +1193,16 @@ def format_file(source: str, indent: int = 4, use_sql: bool = True, leading_comm
             # `sql_acc_contains_dollar_quote` catches the case where the region
             # already closed (`... $$;`) so `in_dollar_quote` is False at flush.
             safe_for_sqlglot = use_sql and not in_dollar_quote and not sql_acc_contains_dollar_quote
-            output.extend(format_sql_block(sql_acc, depth, indent, safe_for_sqlglot, leading_comma=leading_comma))
+            output.extend(
+                format_sql_block(
+                    sql_acc,
+                    depth,
+                    indent,
+                    safe_for_sqlglot,
+                    leading_comma=leading_comma,
+                    rewrite_sql=rewrite_sql,
+                ),
+            )
             sql_acc.clear()
         in_sql_statement = False
         sql_acc_contains_dollar_quote = False
@@ -1243,6 +1321,7 @@ def run_formatter(
     no_sql: bool = False,
     indent: int = 4,
     leading_comma: bool = False,
+    rewrite_sql: bool = False,
     encoding: str = "utf-8",
     diff: bool = False,
 ) -> int:
@@ -1290,7 +1369,13 @@ def run_formatter(
             any_errors = True
             continue
 
-        formatted = format_file(source, indent=indent, use_sql=use_sql, leading_comma=leading_comma)
+        formatted = format_file(
+            source,
+            indent=indent,
+            use_sql=use_sql,
+            leading_comma=leading_comma,
+            rewrite_sql=rewrite_sql,
+        )
 
         if diff:
             if formatted != source:

{execsql2-2.25.0.dist-info → execsql2-2.26.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: execsql2
-Version: 2.25.0
+Version: 2.26.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
@@ -58,7 +58,7 @@ Requires-Dist: psycopg[binary]<4,>=3.1; extra == 'all'
 Requires-Dist: pymysql>=1.1; extra == 'all'
 Requires-Dist: pyodbc>=5.0; extra == 'all'
 Requires-Dist: pyyaml>=6.0; extra == 'all'
-Requires-Dist: sqlglot>=25.0; extra == 'all'
+Requires-Dist: sqlglot<30.22,>=30.21.0; extra == 'all'
 Requires-Dist: tables>=3.10; extra == 'all'
 Requires-Dist: tkintermapview>=1.29; extra == 'all'
 Requires-Dist: xlrd>=2.0; extra == 'all'
@@ -92,7 +92,7 @@ Requires-Dist: pre-commit>=3.5.0; extra == 'dev'
 Requires-Dist: pytest-cov>=5.0.0; extra == 'dev'
 Requires-Dist: pyyaml>=6.0; extra == 'dev'
 Requires-Dist: ruff>=0.4; extra == 'dev'
-Requires-Dist: sqlglot>=25.0; extra == 'dev'
+Requires-Dist: sqlglot<30.22,>=30.21.0; extra == 'dev'
 Requires-Dist: tables>=3.10; extra == 'dev'
 Requires-Dist: tox-uv>=1.13.1; extra == 'dev'
 Requires-Dist: twine>=6.1.0; extra == 'dev'
@@ -112,7 +112,7 @@ Requires-Dist: pyyaml>=6.0; extra == 'formats'
 Requires-Dist: tables>=3.10; extra == 'formats'
 Requires-Dist: xlrd>=2.0; extra == 'formats'
 Provides-Extra: formatter
-Requires-Dist: sqlglot>=25.0; extra == 'formatter'
+Requires-Dist: sqlglot<30.22,>=30.21.0; extra == 'formatter'
 Provides-Extra: map
 Requires-Dist: tkintermapview>=1.29; extra == 'map'
 Provides-Extra: mssql
@@ -451,7 +451,7 @@ execsql format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.25.0
+    rev: v2.26.0
     hooks:
       - id: execsql-format
       - id: execsql-lint

{execsql2-2.25.0.dist-info → execsql2-2.26.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 execsql/__init__.py,sha256=ZeVnpEWu8M2bn3qLmVM72NhWRueUGNbsX8UAPTermo0,901
 execsql/__main__.py,sha256=HdbK-SAhyUmfB6xINY5AzxdMSxGzWSGEG_2dv42Jn64,315
 execsql/api.py,sha256=UJJSlFHySuINeoExaMXqhl00hVSPH1s7G4m8T0NX_xI,26484
-execsql/config.py,sha256=f9UMX5LECVL6KnvvTmIIAMrqOfYe_elQxjW1TOSt4fA,38040
+execsql/config.py,sha256=GUKE3sLGExMMhMkmxi8eXXBWmN74E0vqnt1eTBPRsG4,38166
 execsql/config_validation.py,sha256=a4ZszyJFGTNgs1jkvXE3yMCaYFtF1Uqih2ojMDVh1v8,10556
 execsql/exceptions.py,sha256=aHavdblmP7m5ZLxyyKKmPSwwbdmP962j4ShP1Gd9r64,9651
-execsql/format.py,sha256=rpe-eB7V9J2z7Itr_MFtdUeU2-sR8F6B7a3vYmHXKd0,54253
+execsql/format.py,sha256=_KNFGTnEihO0Bn-E8k0QNLijAS4NDE8Ee1ldL7_MKZc,57430
 execsql/interactive.py,sha256=7vm7NAlcarBJJOIffcLOcJqH9ZCInvHB_CmC2sQsXf8,8241
 execsql/manifest.py,sha256=ibceEZtH2FqsUiujbTGy5D3W0WgO4tFCs7bjIHVdep4,8062
 execsql/models.py,sha256=yXR9FMCSCRonfyiuWlYwqLBMLzWQcvFQOjGHogM8Veg,15556
@@ -19,18 +19,18 @@ execsql/cli/application.py,sha256=qKjkhDMWB7fEjEbqOLZ3pNFw80piBnRSeW_DfZg-9MA,12
 execsql/cli/dispatch.py,sha256=ew10mZNXsFHwiNd_etvpSQYD3T8CiexXkjC3Ja94C4w,2697
 execsql/cli/dsn.py,sha256=uBspf8DXCn2pXmT1Ug1c4IG7IgR5IFGKp9138puaubo,3289
 execsql/cli/help.py,sha256=Edr3d2ahKv387a6WGgyJi5vKIFe39tGPgTv1GKp3itE,10848
-execsql/cli/lint.py,sha256=7t4HXMqPCxHR6PoRxna0X3myu9hlxuK1rbPn5h2tX1Y,43390
+execsql/cli/lint.py,sha256=ZW-FhAjLSuqVNndfP_LX0YfZNswUCkyFAvk3aNPjHpU,46256
 execsql/cli/options.py,sha256=Srhf1gEOB5yy_7PxkTKBv07xK8Qzw8H-z7PUUnItpwE,2916
 execsql/cli/run.py,sha256=5f0SX6QyNl8Ur2MwuW2GaN1OqVpWbEI8CQV3k-hBwH8,41987
 execsql/cli/commands/__init__.py,sha256=wN5sbhKs11S8EZOTBd_GPP6TPjhYfiQkrI48Sy8n6U0,521
 execsql/cli/commands/config.py,sha256=V7CGGkhSCqeJIlAXxAYyG_xNhnsORiwqth2XWEVPzss,8213
-execsql/cli/commands/format.py,sha256=2pftY7nl8FexJ5tnvncxRG-7UjQ_NO0mHxmqAOKd-Nw,3948
+execsql/cli/commands/format.py,sha256=4BY2EUExt32DOv871SZW3kimK4x9qaUsElhu3B49yqc,4412
 execsql/cli/commands/init.py,sha256=kmuFgGz8sv_1KfiNh190E3A23evqkgYZeBRTU6vdjbs,5465
 execsql/cli/commands/lint.py,sha256=Lba5IDsXtiUbQ6DkhC9fdLnoSpfoaewoAWF-ei3h59s,8189
 execsql/cli/commands/listing.py,sha256=gWnjkgcw7uF-DJw3cMZbttOKdplDwAMlhmaBoI5drVw,2511
 execsql/cli/commands/run.py,sha256=sGFDku66CazJrorr0mmrhUI3QDvQVSMEYlU8G1Pd5fQ,16492
 execsql/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-execsql/data/execsql.conf.template,sha256=fTxA6Y01D-7BFABPgnJbEfPD5SSQ-l1xnaptMEBXuzc,12326
+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
@@ -118,23 +118,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.25.0.data/data/execsql2_extras/README.md,sha256=7SG9FbBpdqkgQTTt1aBTbCgymBZyV0rLrQMQrendzxs,5032
-execsql2-2.25.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.25.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
-execsql2-2.25.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.25.0.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
-execsql2-2.25.0.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
-execsql2-2.25.0.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
-execsql2-2.25.0.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
-execsql2-2.25.0.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
-execsql2-2.25.0.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
-execsql2-2.25.0.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
-execsql2-2.25.0.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
-execsql2-2.25.0.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
-execsql2-2.25.0.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
-execsql2-2.25.0.dist-info/METADATA,sha256=8-U51LILehuLSC5E0zYP_tYCuJEtff0DkTsMSQ4RvHg,25703
-execsql2-2.25.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-execsql2-2.25.0.dist-info/entry_points.txt,sha256=jOf53-4IVGjEZeNYUOF1GGaiPNfVZcNKxP3vDFKEyMA,58
-execsql2-2.25.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.25.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
-execsql2-2.25.0.dist-info/RECORD,,
+execsql2-2.26.0.data/data/execsql2_extras/README.md,sha256=7SG9FbBpdqkgQTTt1aBTbCgymBZyV0rLrQMQrendzxs,5032
+execsql2-2.26.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.26.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
+execsql2-2.26.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.26.0.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
+execsql2-2.26.0.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
+execsql2-2.26.0.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
+execsql2-2.26.0.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
+execsql2-2.26.0.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
+execsql2-2.26.0.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
+execsql2-2.26.0.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
+execsql2-2.26.0.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
+execsql2-2.26.0.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
+execsql2-2.26.0.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
+execsql2-2.26.0.dist-info/METADATA,sha256=wku-RCrtWs60aSWHySUNMZlygyEnGKgw6IL6l2pRLj0,25733
+execsql2-2.26.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+execsql2-2.26.0.dist-info/entry_points.txt,sha256=jOf53-4IVGjEZeNYUOF1GGaiPNfVZcNKxP3vDFKEyMA,58
+execsql2-2.26.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.26.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
+execsql2-2.26.0.dist-info/RECORD,,