execsql2 2.12.7__tar.gz → 2.13.1__tar.gz

{execsql2-2.12.7 → execsql2-2.13.1}/CHANGELOG.md

@@ -13,6 +13,30 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.13.1] - 2026-04-04
+
+### Changed
+
+- Bump pg-upsert minimum to >=1.20.0.
+
+______________________________________________________________________
+
+## [2.13.0] - 2026-04-04
+
+### Added
+
+- New `IMPORT … FROM JSON` metacommand — imports a JSON array of objects or newline-delimited JSON (NDJSON) file into a database table. Nested objects are flattened with dot-separated column names; nested arrays are stored as JSON strings. Missing keys across records become NULL.
+- `SHELL … CONTINUE` now sets `$SYSTEM_CMD_PID` substitution variable with the PID of the background process.
+
+### Fixed
+
+- `Mailer`, `WriteableZipfile`, `ZipWriter` now support context manager protocol (`with` statement) for reliable resource cleanup. `__del__` methods are guarded against exceptions during interpreter shutdown.
+- `FileWriter` and `FileControl` `__del__` methods no longer raise during interpreter shutdown.
+- Raw/base64 binary export now uses `with open(…)` context managers instead of bare `open()`.
+- HTML export append mode now cleans up temporary files if the final rename fails.
+
+______________________________________________________________________
+
 ## [2.12.7] - 2026-04-03
 
 ### Fixed

{execsql2-2.12.7 → execsql2-2.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.12.7
+Version: 2.13.1
 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.2; extra == 'all'
+Requires-Dist: pg-upsert>=1.20.0; 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.2; extra == 'upsert'
+Requires-Dist: pg-upsert>=1.20.0; 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.7 → execsql2-2.13.1}/README.md

@@ -124,7 +124,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.7 → execsql2-2.13.1}/docs/about/divergence.md

@@ -48,6 +48,7 @@ ______________________________________________________________________
 | `CONFIG SHOW_PROGRESS` | Enable the Rich progress bar for IMPORT operations at runtime.                                                                                                                                                                   |
 | `CONFIG LOG_SQL`       | Enable SQL query audit logging — writes executed SQL to the log file.                                                                                                                                                            |
 | `PG_UPSERT`            | QA-checked, FK-dependency-ordered upserts from staging to base schema on PostgreSQL. Integrates [pg-upsert](https://pg-upsert.readthedocs.io/) as an optional dependency. Three modes: full pipeline, QA-only, and schema check. |
+| `IMPORT … FROM JSON`   | Import a JSON file (array of objects or NDJSON) into a database table. Nested objects are flattened with dot-separated column names; arrays are stored as JSON strings.                                                          |
 
 ### Conditional Tests
 
@@ -162,6 +163,7 @@ All 33 mutable runtime globals in `state.py` have been consolidated into a `Runt
 
 ### Substitution Variables
 
+- **`$SYSTEM_CMD_PID`** — New system variable set to the PID of the background process when `SHELL … CONTINUE` is used.
 - **Cycle detection** — `substitute_vars()` raises an error after 100 iterations to prevent infinite loops when variables reference each other cyclically. Upstream had no protection.
 - **O(1) substitution** — Variable substitution uses a single combined regex and dict lookup instead of O(V) per-variable regex passes. Behavior is identical; performance is improved.
 - **Lazy `$RANDOM`/`$UUID`** — These system variables are now computed on first access rather than generated unconditionally for every statement. Behavior is identical when referenced; scripts that never reference them skip the computation entirely.

{execsql2-2.12.7 → execsql2-2.13.1}/docs/reference/metacommands.md

@@ -1747,6 +1747,14 @@ The syntax for importing data from a data file in [Feather](https://arrow.apache
 IMPORT TO [NEW|REPLACEMENT] <table_name> FROM FEATHER <file_name>
 ```
 
+The syntax for importing data from a [JSON](https://www.json.org/) file is:
+
+```
+IMPORT TO [NEW|REPLACEMENT] <table_name> FROM JSON <file_name>
+```
+
+The JSON file must contain either a JSON array of objects (`[{…}, …]`) or newline-delimited JSON (NDJSON, one object per line). Nested objects are flattened with dot-separated column names (e.g., an object `{"address": {"city": "Portland"}}` produces column `address.city`). Nested arrays within objects are stored as JSON strings. Records with different keys produce a superset of columns — missing keys become NULL.
+
 Column names in the input must be valid for the DBMS in use.
 
 If the "WITH QUOTE \<quote_char\> DELIMITER \<delim_char\>" clause is not used with text files, *execsql* will scan the text file to determine the quote and delimiter characters that are used in the file. By default, the first 100 lines of the file will be scanned. You can control the number of lines scanned with the "-s" option on *execsql*'s command line and with the *scan_lines* setting in a [configuration file](configuration.md#scan_lines). If the "WITH\..." clause is used, the file will not be scanned to identify the quote and delimiter characters regardless of the setting of the "-s" option.
@@ -1766,7 +1774,7 @@ If neither the NEW or REPLACEMENT keywords are used, the table must exist, must
 
 If a table is scanned to determine data types, any column that is completely empty (all null) will be created with the text data type. This provides the greatest flexibility for subsequent addition of data to the table. However, if that column ought to have a different data type, and a WHERE clause is applied to that column assuming a different data type, the DBMS may report an error because of incomparable data types.
 
-When data are imported from Parquet or Feather data formats, and either the NEW or REPLACEMENT keywords are used, these data will be scanned to identify data types to use in the table-creation statement, regardless of the data types identified in the input file.
+When data are imported from Parquet, Feather, or JSON data formats, and either the NEW or REPLACEMENT keywords are used, these data will be scanned to identify data types to use in the table-creation statement, regardless of the data types identified in the input file.
 
 The handling of Boolean data types when data are imported depends on the capabilities of the DBMS in use. See the relevant section of the [SQL syntax notes](../guides/sql_syntax.md#boolean_data_types).
 
@@ -2800,7 +2808,7 @@ On non-POSIX operating systems (specifically, Windows), any backslashes in the c
 
 The command line that is run will be automatically [logged](../guides/logging.md#logging) in `execsql.log`.
 
-The exit status of the command that is invoked will be stored in the [system variable](substitution_vars.md#system_vars) \$SYSTEM_CMD_EXIT_STATUS if the CONTINUE keyword has not been used.
+The exit status of the command that is invoked will be stored in the [system variable](substitution_vars.md#system_vars) \$SYSTEM_CMD_EXIT_STATUS if the CONTINUE keyword has not been used. When the CONTINUE keyword is used, the process ID of the background process is stored in \$SYSTEM_CMD_PID.
 
 
 ## TIMER

{execsql2-2.12.7 → execsql2-2.13.1}/docs/reference/substitution_vars.md

@@ -196,7 +196,10 @@ $STARTING_SCRIPT_REVTIME
 :   The date and time of the script specified on the command line when execsql is run.
 
 $SYSTEM_CMD_EXIT_STATUS
-:   The exit status of the command executed by the [SYSTEM_CMD](metacommands.md#system_cmd) metacommand. The value is "0" (zero) prior to the first use of the SYSTEM_CMD metacommand.
+:   The exit status of the command executed by the [SYSTEM_CMD](metacommands.md#system_cmd) metacommand. The value is "0" (zero) prior to the first use of the SYSTEM_CMD metacommand. Not set when the CONTINUE keyword is used.
+
+$SYSTEM_CMD_PID
+:   The process ID (PID) of the background process launched by `SHELL … CONTINUE`. Only set when the CONTINUE keyword is used.
 
 $TIMER
 :   The elapsed time of the script timer. If the [TIMER ON](metacommands.md#timer) command has never been used, this value will be zero. If the timer has been started but not stopped, this value will be the elapsed time since the timer was started. If the timer has been started and stopped, this value will be the elapsed time when the timer was stopped.

{execsql2-2.12.7 → execsql2-2.13.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.12.7"
+version = "2.13.1"
 description = "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."
 readme = { file = "README.md", content-type = "text/markdown" }
 license = { file = "LICENSE.txt" }
@@ -58,7 +58,7 @@ odbc = ["pyodbc"]
 # Feature bundles
 formats = ["odfpy", "xlrd", "openpyxl", "Jinja2", "polars", "tables", "PyYAML"]
 auth = ["keyring"]
-upsert = ["pg-upsert>=1.18.2"]
+upsert = ["pg-upsert>=1.20.0"]
 # Convenience groups
 all-db = [
     "psycopg2-binary",
@@ -161,7 +161,7 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.bumpversion]
-current_version = "2.12.7"
+current_version = "2.13.1"
 commit = true
 commit_args = "--no-verify"
 tag = true

{execsql2-2.12.7 → execsql2-2.13.1}/src/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(

{execsql2-2.12.7 → execsql2-2.13.1}/src/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()

{execsql2-2.12.7 → execsql2-2.13.1}/src/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

execsql2-2.13.1/src/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)

{execsql2-2.12.7 → execsql2-2.13.1}/src/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",

{execsql2-2.12.7 → execsql2-2.13.1}/src/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
     # ------------------------------------------------------------------

{execsql2-2.12.7 → execsql2-2.13.1}/src/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",

{execsql2-2.12.7 → execsql2-2.13.1}/src/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)

{execsql2-2.12.7 → execsql2-2.13.1}/src/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:

{execsql2-2.12.7 → execsql2-2.13.1}/src/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():

{execsql2-2.12.7 → execsql2-2.13.1}/src/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