execsql2 2.29.0__py3-none-any.whl → 2.30.0__py3-none-any.whl

execsql/utils/fileio.py

@@ -34,7 +34,6 @@ import threading
 import time
 import weakref
 from collections.abc import Callable
-from encodings.aliases import aliases as codec_dict
 from typing import Any, NamedTuple, cast
 
 from execsql.exceptions import ErrInfo
@@ -47,14 +46,11 @@ __all__ = [
     "EncodedFile",
     "Logger",
     "TempFileMgr",
-    "list_encodings",
     "filewriter_filestatus",
     "filewriter_write",
     "filewriter_open_as_new",
     "filewriter_close",
     "filewriter_close_all_after_write",
-    "filewriter_closeall",
-    "filewriter_shutdown",
     "filewriter_end",
     "redact",
     "register_secret",
@@ -216,9 +212,8 @@ class FileWriter(threading.Thread):
         CMD_OPEN_AS_NEW,
         CMD_CLOSE_ALL_AFTER_WRITE,
         CMD_CLOSED_STATUS,
-        CMD_PING,
         CMD_OPEN_FAILURES,
-    ) = range(10)
+    ) = range(9)
 
     class FileControl:
         STATUS_OPEN, STATUS_WAITING, STATUS_UNOPENED, STATUS_CLOSED, STATUS_OPENFAILURE, STATUS_WRITEFAILURE = range(6)
@@ -375,7 +370,6 @@ class FileWriter(threading.Thread):
             self.open_as_new,
             self.close_all_after_write,
             self.closed_status,
-            self.ping,
             self.open_failures,
         )
 
@@ -417,10 +411,6 @@ class FileWriter(threading.Thread):
             if fc.status != self.FileControl.STATUS_CLOSED and fc.status not in fc.FAILED:
                 self._on_file(fc, fc.clean_close)
 
-    def ping(self, token: object) -> None:
-        """Echo *token* back on the return queue — used to synchronize callers."""
-        self.return_msg_queue.put(token)
-
     def retry_waiting(self) -> None:
         """Re-attempt opening every file still waiting on a lock.
 
@@ -526,7 +516,7 @@ class FileWriter(threading.Thread):
         the rest, so one bad command cannot stop the thread (and with it
         every later write, to any file).
         """
-        filename = argtuple[0] if command != self.CMD_PING and argtuple and isinstance(argtuple[0], str) else ""
+        filename = argtuple[0] if argtuple and isinstance(argtuple[0], str) else ""
         lost = LostOutput(filename, 0, str(exc), "writer")
         if command == self.CMD_OPEN_FAILURES:
             self.return_msg_queue.put([lost])
@@ -535,7 +525,6 @@ class FileWriter(threading.Thread):
         replies: dict[int, Any] = {
             self.CMD_GET_STATUS: self.FileControl.STATUS_CLOSED,
             self.CMD_CLOSED_STATUS: self.FileControl.STATUS_CLOSED,
-            self.CMD_PING: argtuple[0] if argtuple else None,
         }
         if command in replies:
             self.return_msg_queue.put(replies[command])
@@ -745,20 +734,6 @@ def _lost_output_message(lost: LostOutput, open_timeout: int) -> str:
     return f"{cause}; {lost.dropped} line(s) of output to it were discarded" if lost.dropped else cause
 
 
-def filewriter_closeall() -> None:
-    fw = _active_writer()
-    if fw is None:
-        return
-    fw.input_queue.put((FileWriter.CMD_CLOSE_ALL, ()))
-
-
-def filewriter_shutdown() -> None:
-    fw = _active_writer()
-    if fw is None:
-        return
-    fw.input_queue.put((FileWriter.CMD_SHUTDOWN, ()))
-
-
 def filewriter_end(writer: FileWriter | None = None) -> None:
     """Close every file and stop *writer*, or the active run's writer if omitted.
 
@@ -894,6 +869,8 @@ class Logger:
         self.server_name = server_name
         self.cmdline_options = cmdline_options
         self._redaction_values: list[str] = []
+        # Of those, the -a / --var values: masked in the log, not in the manifest.
+        self._argument_values: set[str] = set()
         if log_file_name:
             self.log_file_name = log_file_name
         else:
@@ -956,9 +933,9 @@ class Logger:
         )
         self.writelog(self._redact(msg) or "")
         if server_name:
-            msg = f"run_db_server\t{self.run_id}\t{server_name}\t{db_name}\n"
+            msg = f"run_db_server\t{self.run_id}\t{self._redact(server_name)}\t{self._redact(db_name)}\n"
         else:
-            msg = f"run_db_file\t{self.run_id}\t{db_name}\n"
+            msg = f"run_db_file\t{self.run_id}\t{self._redact(db_name)}\n"
         self.writelog(msg)
         self.seq_no = 0
         atexit.register(self.close)
@@ -974,20 +951,41 @@ class Logger:
 
         return _datetime.datetime.now().isoformat(timespec="seconds")
 
-    def add_redaction_value(self, value: str | None) -> None:
+    def add_redaction_value(self, value: str | None, *, argument: bool = False) -> None:
+        """Mask *value* in every later log record.
+
+        *argument* marks an ``-a`` / ``--var`` value: it may be a secret, so
+        the log masks it, but it is just as often part of a path, so the
+        ``--manifest`` JSON (``redact(..., arguments=False)``) does not.  A
+        value registered both ways is a secret.
+        """
         if value is None:
             return
         value = str(value)
-        if not value or value in self._redaction_values:
+        if not value:
+            return
+        if not argument:
+            self._argument_values.discard(value)
+        if value in self._redaction_values:
             return
         self._redaction_values.append(value)
+        if argument:
+            self._argument_values.add(value)
+
+    def _redact(self, msg: str | None, *, arguments: bool = True) -> str | None:
+        """*msg* with registered secrets and common secret shapes replaced by ``***``.
 
-    def _redact(self, msg: str | None) -> str | None:
+        Every record applies it to its free-text fields (messages, names,
+        paths), never to a whole line: a registered value can be as short as
+        a ``-a 2024`` argument, which would otherwise mask timestamps and
+        sequence numbers.
+        """
         if msg is None:
             return None
         redacted = str(msg)
         for value in sorted(self._redaction_values, key=len, reverse=True):
-            redacted = redacted.replace(value, "***")
+            if arguments or value not in self._argument_values:
+                redacted = redacted.replace(value, "***")
         for pattern in self._COMMON_SECRET_PATTERNS:
             if pattern.pattern.startswith("(?i)(://"):
                 redacted = pattern.sub(r"\1***\3", redacted)
@@ -1026,12 +1024,13 @@ class Logger:
 
     def log_db_connect(self, db: Any) -> None:
         self.seq_no += 1
-        msg = f"connect\t{self.run_id}\t{self.seq_no}\t{self._ts()}\t{db.name()}\n"
+        msg = f"connect\t{self.run_id}\t{self.seq_no}\t{self._ts()}\t{self._redact(db.name())}\n"
         self.writelog(msg)
 
     def log_action_export(self, line_no: int, query_name: str, export_file_name: str) -> None:
         self.seq_no += 1
-        msg = f"action\t{self.run_id}\t{self.seq_no}\t{self._ts()}\texport\t{line_no}\tQuery {query_name} exported to {export_file_name}\n"
+        description = self._redact(f"Query {query_name} exported to {export_file_name}")
+        msg = f"action\t{self.run_id}\t{self.seq_no}\t{self._ts()}\texport\t{line_no}\t{description}\n"
         self.writelog(msg)
 
     def log_status_exception(self, msg: str | None) -> None:
@@ -1087,7 +1086,7 @@ class Logger:
         self.exit_type = "halt"
         self.exit_scriptfile = script_file_name
         self.exit_lno = line_no
-        self.exit_description = msg
+        self.exit_description = None if not msg else msg.replace("\n", "")
 
     def log_exit_interrupted(self) -> None:
         # Save values to be used by exit() function triggered on program exit
@@ -1121,9 +1120,9 @@ class Logger:
         wmsg = "exit\t{}\t{}\t{}({})\t{}\t{:.1f}s\n".format(
             self.run_id,
             self.exit_type,
-            self.exit_scriptfile or "",
+            self._redact(self.exit_scriptfile) or "",
             str(self.exit_lno or ""),
-            self.exit_description or "",
+            self._redact(self.exit_description) or "",  # a HALT MESSAGE can hold any variable's value
             elapsed,
         )
         self.writelog(wmsg)
@@ -1144,12 +1143,16 @@ def register_secret(value: str | None) -> None:
         add(value)
 
 
-def redact(text: str) -> str:
-    """*text* with the active run's registered secrets and common secret shapes replaced by ``***``."""
+def redact(text: str, *, arguments: bool = True) -> str:
+    """*text* with the active run's registered secrets and common secret shapes replaced by ``***``.
+
+    With *arguments* false, ``-a`` / ``--var`` values are left as they are
+    (see :meth:`Logger.add_redaction_value`).
+    """
     import execsql.state as _state
 
     redactor = getattr(_state.exec_log, "_redact", None)
-    return redactor(text) if redactor is not None else text
+    return (redactor(text, arguments=arguments) or "") if redactor is not None else text
 
 
 class TempFileMgr:
@@ -1188,10 +1191,3 @@ _live_tempfile_mgrs: weakref.WeakSet[TempFileMgr] = weakref.WeakSet()
 def _remove_all_temp_files() -> None:
     for mgr in list(_live_tempfile_mgrs):
         mgr.remove_all()
-
-
-def list_encodings() -> None:
-    enc = list(codec_dict.keys())
-    enc.sort()
-    msg = f"Encodings: {', '.join(enc)}\n"
-    print(msg)

execsql/utils/regex.py

@@ -16,7 +16,6 @@ import os
 
 __all__ = [
     "ins_rxs",
-    "ins_quoted_rx",
     "ins_schema_rxs",
     "ins_table_rxs",
     "ins_table_list_rxs",
@@ -42,10 +41,6 @@ def ins_rxs(rx_list: tuple[str, ...], fragment1: object, fragment2: object) -> t
     return tuple(rv)
 
 
-def ins_quoted_rx(fragment1: object, fragment2: object, rx: str) -> tuple[str, ...]:
-    return ins_rxs((rx, rf'"{rx}"'), fragment1, fragment2)
-
-
 def ins_schema_rxs(fragment1: object, fragment2: object, suffix: str | None = None) -> tuple[str, ...]:
     schema_exprs: tuple[str, ...] = (
         r'"(?P<schema>[A-Za-z0-9_\- ]+)"',

{execsql2-2.29.0.dist-info → execsql2-2.30.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: execsql2
-Version: 2.29.0
+Version: 2.30.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
@@ -83,7 +83,6 @@ Provides-Extra: auth-plaintext
 Requires-Dist: keyring>=25.0; extra == 'auth-plaintext'
 Requires-Dist: keyrings-alt>=5.0; extra == 'auth-plaintext'
 Provides-Extra: dev
-Requires-Dist: build>=1.2.2.post1; extra == 'dev'
 Requires-Dist: bump-my-version>=1.2.7; extra == 'dev'
 Requires-Dist: defusedxml>=0.7; extra == 'dev'
 Requires-Dist: jinja2>=3.1; extra == 'dev'
@@ -104,7 +103,6 @@ Requires-Dist: ruff>=0.4; 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'
 Requires-Dist: xlrd>=2.0; extra == 'dev'
 Requires-Dist: zensical==0.0.67; extra == 'dev'
 Provides-Extra: duckdb
@@ -466,7 +464,7 @@ execsql format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.29.0
+    rev: v2.30.0
     hooks:
       - id: execsql-format
       - id: execsql-lint

{execsql2-2.29.0.dist-info → execsql2-2.30.0.dist-info}/RECORD

@@ -1,34 +1,34 @@
 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=GUKE3sLGExMMhMkmxi8eXXBWmN74E0vqnt1eTBPRsG4,38166
+execsql/__main__.py,sha256=Nnh7_QgjYTTzd1Kog2thl7wzNpoxfnZ3YaurSOMzE_U,270
+execsql/api.py,sha256=xcnqVy1IN1mHuBT3SslHkpx1z4ica8ez8HL4bWOTltQ,26722
+execsql/config.py,sha256=-BbdMrWwdDDC7cMJqyYMxet2pMCA_aH3_VFkVx3-aq4,39149
 execsql/config_validation.py,sha256=a4ZszyJFGTNgs1jkvXE3yMCaYFtF1Uqih2ojMDVh1v8,10556
 execsql/exceptions.py,sha256=aHavdblmP7m5ZLxyyKKmPSwwbdmP962j4ShP1Gd9r64,9651
 execsql/format.py,sha256=z-KZ8VY1muz8S6iaErZX9E_7wE_VtjEcUB7e_KyhfyI,59565
 execsql/interactive.py,sha256=7vm7NAlcarBJJOIffcLOcJqH9ZCInvHB_CmC2sQsXf8,8241
-execsql/manifest.py,sha256=ibceEZtH2FqsUiujbTGy5D3W0WgO4tFCs7bjIHVdep4,8062
+execsql/manifest.py,sha256=eJp39R8bYuFuJiGaBbDsk_lua13uJHXPOdwWdUfE-CQ,9027
 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
-execsql/state.py,sha256=NDAtv38b2cmknz-jEgOaOeqZCc6GdxN6mz-KCqb9pqg,23263
-execsql/state.pyi,sha256=pEuTT4G6VNiwy4Ii7OUXc1RvzcQvjFkeFazSGEOprs0,4300
+execsql/state.py,sha256=rXhxx58dVFjhG58HGOXm3ewloVlvpcaYnW1rij4qjkM,23478
+execsql/state.pyi,sha256=ZDHZ1DPKYu4Qs4bcJT31XNv4GOt6O4s_zH4UHCowovw,4344
 execsql/types.py,sha256=zey_bc2AzbUduLoK-nps16qX2zazDYf_iapWkG_cbmA,33130
-execsql/cli/__init__.py,sha256=8wDwIAFq7AI9iSGuw-Xfky-izN_7oHjUegr_brEBot0,3197
-execsql/cli/application.py,sha256=qKjkhDMWB7fEjEbqOLZ3pNFw80piBnRSeW_DfZg-9MA,12448
+execsql/cli/__init__.py,sha256=FHg2lm2gt4L-XBnlVORn3qWHZ4739Ao-uwBIURfVIjg,2798
+execsql/cli/application.py,sha256=lrBmuTfe9nKc_btGFeT_58Ij__w8FOEZvMqfb4rjc-k,12542
 execsql/cli/dispatch.py,sha256=deyN2QQYvdzMSqGGa3CSMpaqdLNeMgc5Uke0mUbl764,2704
-execsql/cli/dsn.py,sha256=uBspf8DXCn2pXmT1Ug1c4IG7IgR5IFGKp9138puaubo,3289
+execsql/cli/dsn.py,sha256=vMabu01EEVAC5O3rpcyJnl4jWR2DQtjDeLLSg8CZqkM,3460
 execsql/cli/help.py,sha256=bEy6ssVjyIw73JD_UPLXnCtnCifdVCKJr_cydAAVxhk,8220
-execsql/cli/lint.py,sha256=8dZhwPrkc-_0WFd1D_qjBdKuql0SP5dpkdBRFd25xC8,47604
+execsql/cli/lint.py,sha256=5V_th4la5DkUwZrPVj7mFZcM96Oq2DzoUfjXLdWtfDc,48125
 execsql/cli/options.py,sha256=Srhf1gEOB5yy_7PxkTKBv07xK8Qzw8H-z7PUUnItpwE,2916
-execsql/cli/run.py,sha256=5f0SX6QyNl8Ur2MwuW2GaN1OqVpWbEI8CQV3k-hBwH8,41987
+execsql/cli/run.py,sha256=PHaYBD9VACnlH8Yko4SD2duYHV6G8u95DzMHa1LnB-E,42610
 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=3awfNmCc6kImeyXKZo1Jt1qXbEuWk86ZllqEOY5vxzw,4456
 execsql/cli/commands/init.py,sha256=kmuFgGz8sv_1KfiNh190E3A23evqkgYZeBRTU6vdjbs,5465
-execsql/cli/commands/lint.py,sha256=Lba5IDsXtiUbQ6DkhC9fdLnoSpfoaewoAWF-ei3h59s,8189
+execsql/cli/commands/lint.py,sha256=Lkj_LEeZsLCVzRS9KxJFvx6fHJyf5enmR9pu5VZh4Yw,8435
 execsql/cli/commands/listing.py,sha256=thtkJ-ILGd0SPs57oVIMkkCGpXsfS0hQxueMc2ccRVw,3514
-execsql/cli/commands/lsp.py,sha256=4Xng1xtoCxF6X0eQ8oC4KnV0ovEeGmlDb0tpdjJnskg,2483
+execsql/cli/commands/lsp.py,sha256=8xIrqA4dnapdlLqbGGb53YtFTnsX2YqpLYvrrl-Z6pE,4051
 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
@@ -37,7 +37,7 @@ execsql/db/__init__.py,sha256=jTbuafuKOqYtXFR1wvCOoKK5Lr3l1uErfaIbIr6UywI,1063
 execsql/db/access.py,sha256=xfBzcgP1qJovxSYwrpu0bdxqyJWqMoMP8i4FsaCTYXA,21306
 execsql/db/base.py,sha256=5f-1YxaaopRPnCPVs4OVOkYmWFtG1V71sk2XFoBUE_Y,42849
 execsql/db/dsn.py,sha256=CaISffisqO5IjSE-elEpwK9vXLaArp3ItpV8lvRTu-I,6920
-execsql/db/duckdb.py,sha256=2iVlbjQdOSAwhI2LxWEm7FYZxjjVcKiE8rT_3VJdRIo,7761
+execsql/db/duckdb.py,sha256=KC8Tqbnemg3wsYH_efnFmxtybPbMXElFDsoeq_FeVus,11143
 execsql/db/factory.py,sha256=cMptU3BL1Nsilo7LKLAI5RR-LiC9RTH-3UC9rHT2JLQ,5519
 execsql/db/firebird.py,sha256=CoNnzFtOFAkp8OJByXXXclitCPAAjM23eFJGfy3C7IE,10171
 execsql/db/mysql.py,sha256=PexKdOzqR7cpkD_nIjPDwSEK_Or8AkWvBh_TEqsIMhU,22231
@@ -70,7 +70,7 @@ execsql/exporters/xlsx.py,sha256=7sm-3KniYlB2K-n6xQmIoHbAvl2ryJhFWU95SEkR7e4,127
 execsql/exporters/xml.py,sha256=t1PSr3i8xvTCWzd9jaxxAy5NcRpl6sqjnZALafKCqpM,2575
 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/__init__.py,sha256=5qsg3aWsaC0HfTDrGeh_2x40QRuivGgzT7cKvaM7jS0,1269
 execsql/gui/base.py,sha256=DMTqHLlpZlGCsNKyrLlJPbaxvukC0n1YmR4aHEN3jPY,14983
 execsql/gui/console.py,sha256=dzdSl4NJNvRd9VvlwRCXHvfnXjQPimyTx7NcibcUZC8,18305
 execsql/gui/desktop.py,sha256=y-T317NzSs9kcA4-NZW-Dx2cZ4Bv1mPoCr7hwQCJYoo,59467
@@ -83,17 +83,19 @@ execsql/importers/json.py,sha256=fL47h09Zzx4Qw3TTQRQJbdPdD3qVMiU-kK9C7j1IQzg,553
 execsql/importers/ods.py,sha256=VsxIkr7opBamB0PbSFmMWt7G11w8lLUH1k_kRwz28zw,2847
 execsql/importers/xls.py,sha256=D7Ul42gIRYZZC5QxD35ft_wmqQv2f1jNMSbnqlzV0ZA,3851
 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=E9FfnAypzggO__QGWSlbfa6AhYE_1IMpIbyrwkEKx8s,8774
+execsql/lsp/_util.py,sha256=8CypObGywKZP1aRetq0ytNBqlMelIdJWduR1JnEuW1E,729
+execsql/lsp/cache.py,sha256=wAiZAzNdVseqRDJQ4aiKJF6WVHBV20tt9lQ7kvwlMeo,3149
+execsql/lsp/code_actions.py,sha256=5UH_W22MY00PMXCc_IV0xv4v1WnvUvKMu3QWnk7qf-w,8579
+execsql/lsp/completion.py,sha256=podEPbgDwGbvGdOWPQRuxsYpQ4f1mybuVgAkwwd7MGQ,7875
+execsql/lsp/diagnostics.py,sha256=jCqilTXgcRmCYmH4KrFjvDG6apBQwPOT0mX3lr7v7og,3076
+execsql/lsp/document.py,sha256=9Q3AG0ErAU3Uv-iQYxD8bOY2WM9DiZR8oX-weWX8u7A,12285
 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
-execsql/lsp/navigation.py,sha256=GYZKHUP7ozdQ_yVk0yL2h8qcF1uuT5IoT6n1wiasxIY,6587
+execsql/lsp/hover.py,sha256=JemZqJ8d7FHouMhW92jkfek14fL9rl6JBQU7JIXJHos,5038
+execsql/lsp/navigation.py,sha256=_f-zW82P4Wkelbsdedz_5l_ztFt-CFD8VSiVE5JaSAM,6436
 execsql/lsp/rename.py,sha256=fYk1gDSWWhqyoIGZO5hVIHPYYdGKNjgZS0mijFDFpac,3756
-execsql/lsp/server.py,sha256=R9QBhPyZONpTa9yfrmvxftVrOVyX5NXwoEqcBnKnq-M,16047
-execsql/metacommands/__init__.py,sha256=H_D1Z5kN6zfYtxatejQhQhQV1tlVZ7rcdFZ_9uhXu2Q,13010
+execsql/lsp/server.py,sha256=gTjk1agZbygdbcowa3jkL45WJ37sxhJ58oiLB7BM6Bw,19893
+execsql/metacommands/__init__.py,sha256=MO5cF84jHakrgYDR8C4-YzeMTLU6oCDeB7x-kUpoVws,12970
 execsql/metacommands/conditions.py,sha256=4DsMXr6vnfbtcKqgnxYV4UK4NmAfE_hpfgkFjlH0bjo,29844
 execsql/metacommands/connect.py,sha256=SPk4h9yiUgTD3w1gNOT_oYx8VShggsO357by5Hoy6OI,15344
 execsql/metacommands/control.py,sha256=9swW6X8jXDUpu5cHiAnQVx1ahFyWxlx7mjg4dqYfX5Y,9355
@@ -103,7 +105,7 @@ execsql/metacommands/dispatch.py,sha256=so0ebcnv66NhVDtA1Bt4GelD0hsC5w7gy7rItz2M
 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=JkuHBsZFDZvAW3wUJtdWwm4qGkpXObqkQNcZalhJVkE,12766
+execsql/metacommands/io_fileops.py,sha256=sLTyh8CA-1rdDFLwh3ciACCPuM8r7xJJgk6tQS6CmwI,12939
 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
@@ -115,7 +117,7 @@ execsql/script/__init__.py,sha256=I7hVO6wm3iOocxRRGEcFHhjdtL1moKbUYLB-wKbjPdk,32
 execsql/script/ast.py,sha256=WqCpFxhxrT2IIGvbArTp3QS0BZryRZAb7IL4ri3I6xg,20591
 execsql/script/control.py,sha256=WqLy-HLPqHG3vEzYpKMiIJsD7LpORjyQuUWzFzcGz4w,2327
 execsql/script/engine.py,sha256=wjXKwPIis-T2Y8rLnRXQ_ymUFdXff1MlI2IIYmxihKo,18448
-execsql/script/executor.py,sha256=lvMFjKe2h4fafhKNiuoXAYpDe8pLHHuYMiwPkLYJe9I,41527
+execsql/script/executor.py,sha256=p3Aj7Ab8HwZRnmYds_e6h6yhRzCCa9XXbdVDkpg6NaQ,40855
 execsql/script/parser.py,sha256=z73v6t6ZbPUKkRu-UOIL6q1cCRDeoRvG2aXXC8NpMvE,37162
 execsql/script/variables.py,sha256=Tb01aHqOdWZbkgj-oW0ky3KWNy5N34XLD-Fm2eShYZM,17462
 execsql/utils/__init__.py,sha256=0uR6JwVJQRX3vceByNBduCAf5dd5assKjeqJUWvpZoA,278
@@ -123,31 +125,31 @@ 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=NA-JXP4cyEZ8Y_KNOPLS_ebXTJhQ50gNMBSTTcnsLIc,12350
-execsql/utils/fileio.py,sha256=ADp8Iltf_zfv0PL0VRdO0BDIHkVpKVVh59_5zmkTfkw,47564
+execsql/utils/errors.py,sha256=yUyA61vlY8cNmC4-XR7hpACG_T6wUK82FF0AnRxDrBs,11693
+execsql/utils/fileio.py,sha256=IqIEhun9aOnr1oBCWK2z2VAPVo95bZ54cVglLW4rV9M,48208
 execsql/utils/gui.py,sha256=1iiupP9AsLdR6ST0gcLE143o6y6YGUFlNv_pdVPxfCE,23943
 execsql/utils/mail.py,sha256=4RiKtXa_sqij_YGdYmjQ3PG0u3G9qjs-9caQwBErtBw,7278
 execsql/utils/numeric.py,sha256=_7bi5R6pHjMCkOPne_Sh5nUj-B8e9g6WFmjptFHaunA,1573
-execsql/utils/regex.py,sha256=B3mSBhRRx_DpUnX_t9IoYd05KvWAebiLMCZqQAmEwcw,3885
+execsql/utils/regex.py,sha256=DGzPBl0Kt4--RbwPhoZI6Bm6N_CBUvI0DbqE4EF6qp8,3718
 execsql/utils/strings.py,sha256=UQNjpRCEFa1UO6feU-M-9e24wWAvizs_iu_4fFusLxo,8516
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.29.0.data/data/execsql2_extras/README.md,sha256=7SG9FbBpdqkgQTTt1aBTbCgymBZyV0rLrQMQrendzxs,5032
-execsql2-2.29.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.29.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
-execsql2-2.29.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.29.0.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
-execsql2-2.29.0.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
-execsql2-2.29.0.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
-execsql2-2.29.0.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
-execsql2-2.29.0.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
-execsql2-2.29.0.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
-execsql2-2.29.0.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
-execsql2-2.29.0.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
-execsql2-2.29.0.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
-execsql2-2.29.0.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
-execsql2-2.29.0.dist-info/METADATA,sha256=eqv9-m8EsFEa1OBzwYfK66_d6vGY2Fv5BTmKyy1ashY,27854
-execsql2-2.29.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-execsql2-2.29.0.dist-info/entry_points.txt,sha256=jOf53-4IVGjEZeNYUOF1GGaiPNfVZcNKxP3vDFKEyMA,58
-execsql2-2.29.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.29.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
-execsql2-2.29.0.dist-info/RECORD,,
+execsql2-2.30.0.data/data/execsql2_extras/README.md,sha256=7SG9FbBpdqkgQTTt1aBTbCgymBZyV0rLrQMQrendzxs,5032
+execsql2-2.30.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.30.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
+execsql2-2.30.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.30.0.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
+execsql2-2.30.0.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
+execsql2-2.30.0.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
+execsql2-2.30.0.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
+execsql2-2.30.0.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
+execsql2-2.30.0.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
+execsql2-2.30.0.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
+execsql2-2.30.0.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
+execsql2-2.30.0.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
+execsql2-2.30.0.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
+execsql2-2.30.0.dist-info/METADATA,sha256=FvWAXbU-34Ip_HUkL7e3-OQ4HJdZUBNGPtgZF8wWz6M,27760
+execsql2-2.30.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+execsql2-2.30.0.dist-info/entry_points.txt,sha256=jOf53-4IVGjEZeNYUOF1GGaiPNfVZcNKxP3vDFKEyMA,58
+execsql2-2.30.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.30.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
+execsql2-2.30.0.dist-info/RECORD,,