execsql2 2.12.6__py3-none-any.whl → 2.13.0__py3-none-any.whl

execsql/exporters/html.py

@@ -154,8 +154,16 @@ def export_html(
             finally:
                 t.close()
                 f.close()
-            os.unlink(outfile)
-            os.rename(tempfname, outfile)
+            try:
+                os.unlink(outfile)
+                os.rename(tempfname, outfile)
+            except OSError:
+                # Clean up temp file if rename fails.
+                try:
+                    os.unlink(tempfname)
+                except OSError:
+                    pass
+                raise
 
 
 def export_cgi_html(

execsql/exporters/raw.py

@@ -29,21 +29,30 @@ def write_query_raw(
     if zipfile is None:
         filewriter_close(outfile)
         mode = "wb" if not append else "ab"
-        of = open(outfile, mode)  # noqa: SIM115
+        with open(outfile, mode) as of:
+            for row in rowsource:
+                for col in row:
+                    if isinstance(col, bytearray):
+                        of.write(col)
+                    else:
+                        if isinstance(col, str):
+                            of.write(bytes(col, db_encoding))
+                        else:
+                            of.write(bytes(str(col), db_encoding))
     else:
         of = ZipWriter(zipfile, outfile, append)
-    try:
-        for row in rowsource:
-            for col in row:
-                if isinstance(col, bytearray):
-                    of.write(col)
-                else:
-                    if isinstance(col, str):
-                        of.write(bytes(col, db_encoding))
+        try:
+            for row in rowsource:
+                for col in row:
+                    if isinstance(col, bytearray):
+                        of.write(col)
                     else:
-                        of.write(bytes(str(col), db_encoding))
-    finally:
-        of.close()
+                        if isinstance(col, str):
+                            of.write(bytes(col, db_encoding))
+                        else:
+                            of.write(bytes(str(col), db_encoding))
+        finally:
+            of.close()
 
 
 def write_query_b64(outfile: str, rowsource: Any, append: bool = False, zipfile: str | None = None) -> None:
@@ -51,12 +60,15 @@ def write_query_b64(outfile: str, rowsource: Any, append: bool = False, zipfile:
     if zipfile is None:
         filewriter_close(outfile)
         mode = "wb" if not append else "ab"
-        of = open(outfile, mode)  # noqa: SIM115
+        with open(outfile, mode) as of:
+            for row in rowsource:
+                for col in row:
+                    of.write(base64.standard_b64decode(col))
     else:
         of = ZipWriter(zipfile, outfile, append)
-    try:
-        for row in rowsource:
-            for col in row:
-                of.write(base64.standard_b64decode(col))
-    finally:
-        of.close()
+        try:
+            for row in rowsource:
+                for col in row:
+                    of.write(base64.standard_b64decode(col))
+        finally:
+            of.close()

execsql/exporters/zip.py

@@ -32,8 +32,18 @@ class WriteableZipfile:
         self.zf = zipfile.ZipFile(zipfile_name, mode=zmode, compression=comp, compresslevel=9)
         self.current_handle = None
 
-    def __del__(self) -> None:
+    def __enter__(self) -> WriteableZipfile:
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb) -> None:
         self.close()
+        return None
+
+    def __del__(self) -> None:
+        try:
+            self.close()
+        except Exception:
+            pass  # Best-effort cleanup at interpreter shutdown.
 
     def member_file(self, member_filename: str) -> None:
         """Create a new member entry in the archive and open it for writing."""
@@ -97,11 +107,19 @@ class ZipWriter:
         self.zwriter = WriteableZipfile(self.zip_fname, append)
         self.member = self.zwriter.member_file(member_fname)
 
+    def __enter__(self) -> ZipWriter:
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb) -> None:
+        self.close()
+        return None
+
     def write(self, str_data: str) -> None:
         """Write a string to the current zip member."""
         self.zwriter.write(str_data)
 
     def close(self) -> None:
         """Close the zip member and finalise the archive."""
-        self.zwriter.close()
-        self.zwriter = None
+        if self.zwriter is not None:
+            self.zwriter.close()
+            self.zwriter = None

execsql/importers/json.py

@@ -0,0 +1,142 @@
+from __future__ import annotations
+
+"""
+JSON import for execsql.
+
+Provides :func:`import_json`, used by ``IMPORT … FORMAT json``.
+Supports JSON arrays of objects (``[{…}, …]``) and newline-delimited
+JSON (NDJSON, one object per line).  Nested objects are flattened with
+dot-separated keys; nested arrays and non-object values are serialized
+as JSON strings so every column maps to a scalar database value.
+"""
+
+import json
+from pathlib import Path
+from typing import Any
+
+from execsql.db.base import Database
+from execsql.exceptions import ErrInfo
+from execsql.importers.base import import_data_table
+
+__all__ = ["import_json"]
+
+
+def _flatten(obj: Any, prefix: str = "", sep: str = ".") -> dict[str, Any]:
+    """Recursively flatten a nested dict.
+
+    Nested dicts produce dot-separated keys.  All other compound values
+    (lists, nested lists-of-dicts) are serialized as JSON strings so the
+    result is always ``{str: scalar}``.
+    """
+    items: dict[str, Any] = {}
+    if isinstance(obj, dict):
+        for key, value in obj.items():
+            new_key = f"{prefix}{sep}{key}" if prefix else key
+            if isinstance(value, dict):
+                items.update(_flatten(value, new_key, sep))
+            elif isinstance(value, list):
+                # Serialize arrays as JSON strings — tables are flat.
+                items[new_key] = json.dumps(value, default=str)
+            else:
+                items[new_key] = value
+    return items
+
+
+def _parse_json_file(filename: str, encoding: str) -> list[dict[str, Any]]:
+    """Read a JSON file and return a list of flat dicts.
+
+    Accepts either a JSON array of objects or newline-delimited JSON
+    (NDJSON).
+    """
+    text = Path(filename).read_text(encoding=encoding)
+    stripped = text.strip()
+
+    if stripped.startswith("["):
+        # Standard JSON array.
+        raw = json.loads(stripped)
+        if not isinstance(raw, list):
+            raise ErrInfo(type="error", other_msg="JSON file root is not an array of objects.")
+        records = raw
+    elif stripped.startswith("{"):
+        # Try NDJSON (one object per line) or a single object.
+        records = []
+        for lineno, line in enumerate(stripped.splitlines(), 1):
+            line = line.strip()
+            if not line:
+                continue
+            try:
+                obj = json.loads(line)
+            except json.JSONDecodeError as exc:
+                raise ErrInfo(
+                    type="error",
+                    other_msg=f"Invalid JSON on line {lineno}: {exc}",
+                ) from exc
+            if not isinstance(obj, dict):
+                raise ErrInfo(
+                    type="error",
+                    other_msg=f"Line {lineno} is not a JSON object.",
+                )
+            records.append(obj)
+    else:
+        raise ErrInfo(
+            type="error",
+            other_msg="JSON import expects a file starting with '[' (array) or '{' (object/NDJSON).",
+        )
+
+    if not records:
+        raise ErrInfo(type="error", other_msg="JSON file contains no records.")
+
+    # Validate that all records are dicts.
+    for i, rec in enumerate(records):
+        if not isinstance(rec, dict):
+            raise ErrInfo(
+                type="error",
+                other_msg=f"Record {i} in JSON file is not an object (got {type(rec).__name__}).",
+            )
+
+    return [_flatten(rec) for rec in records]
+
+
+def import_json(
+    db: Database,
+    schemaname: str | None,
+    tablename: str,
+    filename: str,
+    is_new: Any,
+    encoding: str | None = None,
+) -> None:
+    """Import a JSON file into a database table.
+
+    Objects are flattened so that nested keys become dot-separated column
+    names (e.g. ``address.city``).  Arrays within objects are stored as
+    JSON strings.
+    """
+    from execsql.utils.errors import exception_desc
+
+    import execsql.state as _state
+
+    enc = encoding if encoding else _state.conf.import_encoding
+
+    try:
+        flat_records = _parse_json_file(filename, enc)
+    except ErrInfo:
+        raise
+    except Exception as e:
+        raise ErrInfo(
+            "exception",
+            exception_msg=exception_desc(),
+            other_msg=f"Can't parse JSON file {filename}",
+        ) from e
+
+    # Build a union of all keys across records (preserving first-seen order).
+    seen: dict[str, None] = {}
+    for rec in flat_records:
+        for key in rec:
+            if key not in seen:
+                seen[key] = None
+    hdrs = list(seen)
+
+    # Build row data aligned to hdrs — missing keys become None.
+    data = [[rec.get(h) for h in hdrs] for rec in flat_records]
+
+    import_data_table(db, schemaname, tablename, is_new, hdrs, data)

execsql/metacommands/__init__.py

@@ -118,6 +118,7 @@ from execsql.metacommands.io import (
     x_import_xls_pattern,
     x_import_parquet,
     x_import_feather,
+    x_import_json,
     x_import_row_buffer,
     x_show_progress,
     x_export_row_buffer,
@@ -325,6 +326,7 @@ __all__ = [
     "x_import_xls_pattern",
     "x_import_parquet",
     "x_import_feather",
+    "x_import_json",
     "x_import_row_buffer",
     "x_show_progress",
     "x_export_row_buffer",

execsql/metacommands/dispatch.py

@@ -118,6 +118,7 @@ from execsql.metacommands.io import (
     x_import,
     x_import_feather,
     x_import_file,
+    x_import_json,
     x_import_ods,
     x_import_ods_pattern,
     x_import_parquet,
@@ -540,6 +541,17 @@ def build_dispatch_table() -> MetaCommandList:
         x_import_feather,
     )
 
+    # ------------------------------------------------------------------
+    # IMPORT JSON
+    # ------------------------------------------------------------------
+    mcl.add(
+        ins_table_rxs(
+            r"^\s*IMPORT\s+TO\s+(?:(?P<new>NEW|REPLACEMENT)\s+)?",
+            ins_fn_rxs(r"\s+FROM\s+JSON\s+", r"\s*$"),
+        ),
+        x_import_json,
+    )
+
     # ------------------------------------------------------------------
     # PROMPT ACTION
     # ------------------------------------------------------------------

execsql/metacommands/io.py

@@ -34,6 +34,7 @@ from execsql.metacommands.io_import import (  # noqa: F401
     x_import,
     x_import_feather,
     x_import_file,
+    x_import_json,
     x_import_ods,
     x_import_ods_pattern,
     x_import_parquet,
@@ -88,6 +89,7 @@ __all__ = [
     "x_import",
     "x_import_feather",
     "x_import_file",
+    "x_import_json",
     "x_import_ods",
     "x_import_ods_pattern",
     "x_import_parquet",

execsql/metacommands/io_import.py

@@ -14,6 +14,7 @@ import execsql.state as _state
 from execsql.exceptions import ErrInfo
 from execsql.importers.csv import importfile, importtable
 from execsql.importers.feather import import_feather, import_parquet
+from execsql.importers.json import import_json
 from execsql.importers.ods import OdsFile, importods
 from execsql.exporters.xls import XlsFile, XlsxFile
 from execsql.importers.xls import importxls
@@ -388,6 +389,41 @@ def x_import_feather(**kwargs: Any) -> None:
     return None
 
 
+def x_import_json(**kwargs: Any) -> None:
+    newstr = kwargs["new"]
+    if newstr:
+        is_new = 1 + ["new", "replacement"].index(newstr.lower())
+    else:
+        is_new = 0
+    schemaname = kwargs["schema"]
+    tablename = kwargs["table"]
+    filename = kwargs["filename"]
+    if len(filename) > 1 and filename[0] == "~" and filename[1] == os.sep:
+        filename = str(Path.home() / filename[2:])
+    if not Path(filename).exists():
+        raise ErrInfo(
+            type="cmd",
+            command_text=kwargs["metacommandline"],
+            other_msg=f"Input file {filename} does not exist",
+        )
+    enc = kwargs.get("encoding")
+    from execsql.metacommands.conditions import file_size_date
+
+    sz, dt = file_size_date(filename)
+    _state.exec_log.log_status_info(f"IMPORTing from JSON file {filename} ({sz}, {dt})")
+    try:
+        import_json(_state.dbs.current(), schemaname, tablename, filename, is_new, encoding=enc)
+    except ErrInfo:
+        raise
+    except Exception as e:
+        raise ErrInfo(
+            "exception",
+            exception_msg=exception_desc(),
+            other_msg=f"Can't import data from JSON file {filename}",
+        ) from e
+    return None
+
+
 def x_import_row_buffer(**kwargs: Any) -> None:
     rows = kwargs["rows"]
     _state.conf.import_row_buffer = int(rows)

execsql/metacommands/system.py

@@ -51,7 +51,8 @@ def x_system_cmd(**kwargs: Any) -> None:
         returncode = subprocess.call(cmdargs)
         _state.subvars.add_substitution("$SYSTEM_CMD_EXIT_STATUS", str(returncode))
     else:
-        subprocess.Popen(cmdargs)
+        proc = subprocess.Popen(cmdargs)
+        _state.subvars.add_substitution("$SYSTEM_CMD_PID", str(proc.pid))
     return None
 
 
@@ -62,8 +63,8 @@ def x_email(**kwargs: Any) -> None:
     msg = kwargs["msg"]
     msg_file = kwargs["msg_file"]
     att_file = kwargs["att_file"]
-    m = Mailer()
-    m.sendmail(from_addr, to_addr, subject, msg, msg_file, att_file)
+    with Mailer() as m:
+        m.sendmail(from_addr, to_addr, subject, msg, msg_file, att_file)
 
 
 def x_timer(**kwargs: Any) -> None:

execsql/utils/fileio.py

@@ -119,7 +119,10 @@ class FileWriter(multiprocessing.Process):
             self.close_after_write = False
 
         def __del__(self) -> None:
-            self.close()
+            try:
+                self.close()
+            except Exception:
+                pass  # Best-effort cleanup at interpreter shutdown.
 
         def write_queue(self) -> None:
             while len(self.output_queue) > 0:
@@ -215,7 +218,10 @@ class FileWriter(multiprocessing.Process):
         )
 
     def __del__(self) -> None:
-        self.close_all()
+        try:
+            self.close_all()
+        except Exception:
+            pass  # Best-effort cleanup at interpreter shutdown.
 
     def close_all(self) -> None:
         for fc in getattr(self, "files", {}).values():

execsql/utils/mail.py

@@ -28,9 +28,24 @@ class Mailer:
     def __repr__(self) -> str:
         return "Mailer()"
 
-    def __del__(self) -> None:
+    def __enter__(self) -> Mailer:
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb) -> None:
+        self.close()
+        return None
+
+    def close(self) -> None:
         if hasattr(self, "smtpconn"):
-            self.smtpconn.quit()
+            try:
+                self.smtpconn.quit()
+            except Exception:
+                pass  # Best-effort; connection may already be closed.
+            finally:
+                del self.smtpconn
+
+    def __del__(self) -> None:
+        self.close()
 
     def __init__(self) -> None:
         conf = _state.conf
@@ -134,5 +149,6 @@ class MailSpec:
             content_filename = _state.subvars.substitute_all(content_filename)
             attach_filename = _state.commandliststack[-1].localvars.substitute_all(self.attach_filename)
             attach_filename = _state.subvars.substitute_all(attach_filename)
-            Mailer().sendmail(send_from, send_to, subject, msg_content, content_filename, attach_filename)
+            with Mailer() as m:
+                m.sendmail(send_from, send_to, subject, msg_content, content_filename, attach_filename)
         return None

{execsql2-2.12.6.dist-info → execsql2-2.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.12.6
+Version: 2.13.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
@@ -51,7 +51,7 @@ Requires-Dist: keyring; extra == 'all'
 Requires-Dist: odfpy; extra == 'all'
 Requires-Dist: openpyxl; extra == 'all'
 Requires-Dist: oracledb; extra == 'all'
-Requires-Dist: pg-upsert>=1.18.0; extra == 'all'
+Requires-Dist: pg-upsert>=1.18.2; extra == 'all'
 Requires-Dist: polars; extra == 'all'
 Requires-Dist: psycopg2-binary; extra == 'all'
 Requires-Dist: pymysql; extra == 'all'
@@ -109,7 +109,7 @@ Requires-Dist: oracledb; extra == 'oracle'
 Provides-Extra: postgres
 Requires-Dist: psycopg2-binary; extra == 'postgres'
 Provides-Extra: upsert
-Requires-Dist: pg-upsert>=1.18.0; extra == 'upsert'
+Requires-Dist: pg-upsert>=1.18.2; extra == 'upsert'
 Description-Content-Type: text/markdown
 
 > [!NOTE]
@@ -238,7 +238,7 @@ Run `execsql --help` for the full option list, or `execsql -m` to list all metac
 
 # Features
 
-- Import data from CSV, TSV, Excel, OpenDocument, Feather, or Parquet files into a database table.
+- Import data from CSV, TSV, JSON, Excel, OpenDocument, Feather, or Parquet files into a database table.
 - Export query results in 20+ formats including CSV, TSV, JSON, YAML, XML, HTML, Markdown, LaTeX, XLSX, OpenDocument, Feather, Parquet, HDF5, DuckDB, SQLite, plain text, and Jinja2 templates.
 - Copy data between databases, including across different DBMS types.
 - Conditionally execute SQL and metacommands using `IF`/`ELSE`/`ENDIF` based on data values, DBMS type, or user input.

{execsql2-2.12.6.dist-info → execsql2-2.13.0.dist-info}/RECORD

@@ -33,7 +33,7 @@ execsql/exporters/base.py,sha256=W9USFyk_2eztjJ51X6CJh7-chE1i3cSx-STOtbHXCNI,637
 execsql/exporters/delimited.py,sha256=URvEQo1IRF_tfdVHL3uBwEonihC-XfDm0f1argQPf4M,32088
 execsql/exporters/duckdb.py,sha256=Wc9I5uiV4MzmVQzCX-vgVHQUL7U3ZWdOkFVFWBv5SXM,2911
 execsql/exporters/feather.py,sha256=w2qZAnewzeiRMnmPXECvkgD-6KtyxaiQwjokRT7Awrc,4167
-execsql/exporters/html.py,sha256=ISQBOr7AJ5koKlebXSvWqzEvl1nXriCRGeKmk-bzkrc,9335
+execsql/exporters/html.py,sha256=2FhC1pe60w7PYkFfesY3YrbULcBED_7QdXceRDuwzH8,9583
 execsql/exporters/json.py,sha256=yljlRBbmvDVSTQUe0EdfdqTTRpD5sHfn7-jQ457ydvc,4139
 execsql/exporters/latex.py,sha256=w_B83_5vKPe8uYxCWGdqvxwJeq0mw5zzKYDiAb7dbN0,4503
 execsql/exporters/markdown.py,sha256=_ZX3dikbtAb6qZxYeWxDZAPF0-cNKTPR7or5kTbD2ZU,4436
@@ -41,7 +41,7 @@ execsql/exporters/ods.py,sha256=jl2qVHUeCLLv8xrkZfG3jgXbaglQ3rggCHziv7tNQOI,1887
 execsql/exporters/parquet.py,sha256=186vUTH1oVAQ0s_qayLzEQVsKKu3ijAkhYEI6tysXkg,1095
 execsql/exporters/pretty.py,sha256=9isA8f6xUz-3-JhMJimibnvtybVrT1cnoAjGnzsPEGI,3423
 execsql/exporters/protocol.py,sha256=BxATgz0xKHbB2FpZBeNg7wZfIiCohhD1awlr3JCec0c,4372
-execsql/exporters/raw.py,sha256=jNzfVqUgpKSIO7BsOVwBi4CcfCV5ooZLLq_kEXa4W_I,1918
+execsql/exporters/raw.py,sha256=hqO5XEv_Ab9KiphPvZ9sZEdxWTg-kyn8PH9V3qFksyo,2488
 execsql/exporters/sqlite.py,sha256=XA0ALLvy-r6Pz1lpOFkWWbvpSP9Hm1tHHiuo_BvPVDk,2686
 execsql/exporters/templates.py,sha256=T9nk7vJrlxiPGfOWGc79xqqDxK3TCYu0wXq48U02npw,5564
 execsql/exporters/values.py,sha256=HIyud31aux_dbCphfKHEGeZB9fkIPE5PoGXQz817XIE,2520
@@ -49,7 +49,7 @@ execsql/exporters/xls.py,sha256=nPROgxL8XK2oiBVoqN2L-o0j_jynRIMokwB8NpvOBt0,1062
 execsql/exporters/xlsx.py,sha256=Gm8ns_KeqSMu2DONSSJ1DcwPBEjYwpbU7frmX0g5L7c,11487
 execsql/exporters/xml.py,sha256=lqcOM8uKDoCayU42BPSLNH1_2DIHU5D3LtQItREU90c,2564
 execsql/exporters/yaml.py,sha256=1Vuc6uMDuLTkCuXCfXWKz4gLkkAVdEXkLs4gEB_67Xo,3110
-execsql/exporters/zip.py,sha256=9-hExltQorONNThiMfxPDYHqHsbTeq9zM9zmtG4oFb8,4410
+execsql/exporters/zip.py,sha256=kr0X6VLE_ULGVQtMzfqZZSUmc1Qupxg9HbMOAvnTQvI,4890
 execsql/gui/__init__.py,sha256=oCb-cyhLZzVpWJ4WU5HbqEDBrV-lm0ytEwxemrOZyqs,2048
 execsql/gui/base.py,sha256=sfNRkDrf7FhIgMRUOdyZpRLS1Xk9RqNhrV0A1RP6PXU,6068
 execsql/gui/console.py,sha256=TuGzm7XFxa8iWrofGLwx5DuVIlr3wqqyP_pSnAJ1S3s,14271
@@ -59,23 +59,24 @@ execsql/importers/__init__.py,sha256=dDsxSVeQYXBvm9yGqN3QswyGbLWTwt08pvUuRJgZhl4
 execsql/importers/base.py,sha256=FGVz3ntN6xHL99rQixlQj3tAf570K_oU83UtbYE1lJg,4124
 execsql/importers/csv.py,sha256=Mu848WNzuhVO1ade-WurPyxqGOuVNRO8UwRF3-bav_I,4845
 execsql/importers/feather.py,sha256=g2B69d2uv9vmnXcmjFyTVsMP40LYEzFYkhk3gD26mGw,1900
+execsql/importers/json.py,sha256=Z7QJZQ9fyqaxFxjfqcfZoaoW2GSZt-DMqW5LZiEfyNs,4684
 execsql/importers/ods.py,sha256=MJsdsjropzCvxAA3DDZfAL_AnmZ4yij7DnrjGyDJqHQ,2843
 execsql/importers/xls.py,sha256=e0Zfe47ZiCpA1Ae3XDJ1ko3sCiH3-8U6XLKi6NvD0jQ,3683
-execsql/metacommands/__init__.py,sha256=jrp5PvAZyQYvZ0a_qYNxjv1ZqxDlGYE_P3dyqRTgVSM,11394
+execsql/metacommands/__init__.py,sha256=3Kz-VasFS9B-C-UdHOjr3RMXjheMeYHe6qYBwp5e7wE,11434
 execsql/metacommands/conditions.py,sha256=Fzrk83-pWbFOoKahYdQW7CZjQeh3zByDUbfgpTM_bjQ,29259
 execsql/metacommands/connect.py,sha256=Nsm0D91i3RX-R2rzQQ-Br-gULaI6Uvdn9fqb7DOAVfE,14804
 execsql/metacommands/control.py,sha256=PAZFK1ck5SDSm5QdFV1ctif3KpEiyYWIXdDceRWgQ6k,8513
 execsql/metacommands/data.py,sha256=tRQBGTAuW-eJ2tBNWaoZI9OjTyNNyHJISo7gOdL-sm8,11370
 execsql/metacommands/debug.py,sha256=pnT24dfvfOx8xFu86mO5czfVCGKbcvgBLyXnqaMWO4w,8184
-execsql/metacommands/dispatch.py,sha256=2Ec7dJmOFstbY3tEuFoTODV8yaHpR-Sfa-ZydOmvIxo,85205
-execsql/metacommands/io.py,sha256=Duh60caM4go9JczbGYNMKKYpcMimwPzF6EQ_tshKxdE,2971
+execsql/metacommands/dispatch.py,sha256=LYmTuSfC0nFKgAPWRK8n8Qf8sbrRtRmbh6ntosOjQEo,85587
+execsql/metacommands/io.py,sha256=vlGBje5sgnqeilooMdhJDgSRIhysHy5_7LrKtik9Xjs,3011
 execsql/metacommands/io_export.py,sha256=7lkCSnPhXy9FVau9_hT1u68NOVdG2DsWmvUh9hM1QWI,18359
 execsql/metacommands/io_fileops.py,sha256=RrcJTh_cgj7bJ-bezjo0yNl-fN3CoWV-aZ71z1KHYZs,9803
-execsql/metacommands/io_import.py,sha256=wyxJJdlW07P5ZIhweejhXyyGANAvEhY5uMjKZ200Jyc,12983
+execsql/metacommands/io_import.py,sha256=fzShl_m74DWt2_SmxlxWQe00H53hDIrOYZtvvqKBhSM,14231
 execsql/metacommands/io_write.py,sha256=NpL2aYGfBpbqmPpYsqniYltYfd_SCA1EQz3_4qSdNbo,8279
 execsql/metacommands/prompt.py,sha256=xd3mAkdbn4AE4hUPuSfN5DgZGUZmk-Db23iL-JJPwXs,36918
 execsql/metacommands/script_ext.py,sha256=TUgAldB2LSJAwZrCvDDi804hQ1d9BDQD2GDqHNPVOcM,2280
-execsql/metacommands/system.py,sha256=sUR5kLL7idTVg8WXIMdd-Kv7nkERIiaeL0beWsz8NyY,7293
+execsql/metacommands/system.py,sha256=AeyxbMLZVOi2nThbHiZ2F_UAIrZ1r4kjI3G80TtnSD4,7385
 execsql/metacommands/upsert.py,sha256=P2935aQHDZPiVwnXi0fGQ7Guxrm-Sy_YunyuSqVSegI,15880
 execsql/script/__init__.py,sha256=HbVQmQEVn4gBtzwy5_nlbDGuRnbWd4dI4nG-q1KyBxs,3498
 execsql/script/control.py,sha256=s-1eZdGARM6H1FwZ6VDdO_f50j7bvvRtTHesfUm9tbc,6144
@@ -86,31 +87,31 @@ execsql/utils/auth.py,sha256=onXzNkNZQZxGC5w7eey06sjvAIAX_Lf9g7nUJtcsel0,7009
 execsql/utils/crypto.py,sha256=2OnBWwn9bCBGc1ZkyRv16TvhottoCNYtXqgbE3mG3Sg,2960
 execsql/utils/datetime.py,sha256=V_itd5vVvUPjT86P_z_hh4mlerMDGhDzI5MwPMDBaI4,7715
 execsql/utils/errors.py,sha256=YKhYD27-3timuZavc2vIrRIfHa71vzih-KVPsAKgvkU,8163
-execsql/utils/fileio.py,sha256=F6M4osE0Mb2ycTcvwwcYnhBXH1L36v6d7Oxdab6J16s,24110
+execsql/utils/fileio.py,sha256=RGaMUe-e0xIw32OeprNJCezh0Jr9gQimQNqOXBEaJ2M,24338
 execsql/utils/gui.py,sha256=UFtwrXPNqNvZCJFCbumZ1aG2d9B-vyaJXIG83fDHteo,18409
-execsql/utils/mail.py,sha256=75A1cMnEfyP0_QMMWuSLv8hrcIjc9cGBCrttLpr2TXQ,5372
+execsql/utils/mail.py,sha256=Sd7vWj-dz3w0XDSFU9PM8gmy41pojk-Vsgbfven2DMk,5786
 execsql/utils/numeric.py,sha256=xh02ANSRk3nUpQ-rtm66ILoMqoi7HtzCoRMIOT9U8QI,1570
 execsql/utils/regex.py,sha256=diEzTZqU_HHwVMadPAvN1Vgzhl7I03eVaEFGCXyGGL8,3770
 execsql/utils/strings.py,sha256=5Dvzrk-9SIw2lpxXZQkiJbNyo1sy7iXXAtSULlZ0KG8,8488
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.12.6.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.12.6.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.12.6.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.12.6.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
-execsql2-2.12.6.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.12.6.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
-execsql2-2.12.6.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
-execsql2-2.12.6.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
-execsql2-2.12.6.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
-execsql2-2.12.6.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
-execsql2-2.12.6.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
-execsql2-2.12.6.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
-execsql2-2.12.6.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
-execsql2-2.12.6.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
-execsql2-2.12.6.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
-execsql2-2.12.6.dist-info/METADATA,sha256=QM1G8hAxmsNAj05cWEcly_22msjrWAEkNFinUGaH9Fc,17560
-execsql2-2.12.6.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.12.6.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.12.6.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.12.6.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
-execsql2-2.12.6.dist-info/RECORD,,
+execsql2-2.13.0.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.13.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.13.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
+execsql2-2.13.0.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
+execsql2-2.13.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.13.0.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
+execsql2-2.13.0.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
+execsql2-2.13.0.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
+execsql2-2.13.0.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
+execsql2-2.13.0.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
+execsql2-2.13.0.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
+execsql2-2.13.0.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
+execsql2-2.13.0.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
+execsql2-2.13.0.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
+execsql2-2.13.0.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
+execsql2-2.13.0.dist-info/METADATA,sha256=vzxeVjRXdmJJWziI9LKFzkkLK8G_JIQxmSbyGD9wWks,17566
+execsql2-2.13.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+execsql2-2.13.0.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.13.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.13.0.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
+execsql2-2.13.0.dist-info/RECORD,,