execsql2 2.15.2__tar.gz → 2.15.4__tar.gz

{execsql2-2.15.2 → execsql2-2.15.4}/CHANGELOG.md

@@ -13,6 +13,22 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.15.4] - 2026-04-15
+
+### Fixed
+
+- Fixed typo in `test_latin1_encoding` test data (`calf\xe9` → `calf\xe9`) that caused assertion failure on Windows CI.
+
+______________________________________________________________________
+
+## [2.15.3] - 2026-04-15
+
+### Added
+
+- New optional dependency extras `auth-plaintext` and `auth-encrypted` for headless Linux keyring backends. `pip install execsql2[auth-plaintext]` installs `keyring` + `keyrings.alt`; `pip install execsql2[auth-encrypted]` adds `pycryptodome` for the encrypted file backend.
+
+______________________________________________________________________
+
 ## [2.15.2] - 2026-04-14
 
 ### Changed

{execsql2-2.15.2 → execsql2-2.15.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.15.2
+Version: 2.15.4
 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
@@ -69,6 +69,13 @@ Requires-Dist: pymysql; extra == 'all-db'
 Requires-Dist: pyodbc; extra == 'all-db'
 Provides-Extra: auth
 Requires-Dist: keyring; extra == 'auth'
+Provides-Extra: auth-encrypted
+Requires-Dist: keyring; extra == 'auth-encrypted'
+Requires-Dist: keyrings-alt; extra == 'auth-encrypted'
+Requires-Dist: pycryptodome; extra == 'auth-encrypted'
+Provides-Extra: auth-plaintext
+Requires-Dist: keyring; extra == 'auth-plaintext'
+Requires-Dist: keyrings-alt; 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'
@@ -167,7 +174,9 @@ pip install execsql2[odbc]        # ODBC DSN (pyodbc)
 
 # Feature bundles
 pip install execsql2[formats]    # ODS, Excel, Jinja2, Feather, Parquet, HDF5
-pip install execsql2[auth]       # OS keyring integration
+pip install execsql2[auth]            # OS keyring integration
+pip install execsql2[auth-plaintext]  # Keyring + plaintext file backend (headless Linux)
+pip install execsql2[auth-encrypted]  # Keyring + encrypted file backend (headless Linux)
 
 # Convenience
 pip install execsql2[all-db]     # All database drivers

{execsql2-2.15.2 → execsql2-2.15.4}/README.md

@@ -52,7 +52,9 @@ pip install execsql2[odbc]        # ODBC DSN (pyodbc)
 
 # Feature bundles
 pip install execsql2[formats]    # ODS, Excel, Jinja2, Feather, Parquet, HDF5
-pip install execsql2[auth]       # OS keyring integration
+pip install execsql2[auth]            # OS keyring integration
+pip install execsql2[auth-plaintext]  # Keyring + plaintext file backend (headless Linux)
+pip install execsql2[auth-encrypted]  # Keyring + encrypted file backend (headless Linux)
 
 # Convenience
 pip install execsql2[all-db]     # All database drivers

{execsql2-2.15.2 → execsql2-2.15.4}/docs/reference/security.md

@@ -52,7 +52,7 @@ To disable keyring integration, set `use_keyring = No` in the `[connect]` sectio
 Passwords are stored encrypted on disk. Requires a master password the first time keyring is used per session.
 
 ```bash
-pip install keyrings.alt pycryptodome
+pip install execsql2[auth-encrypted]
 mkdir -p ~/.config/python_keyring
 cat > ~/.config/python_keyring/keyringrc.cfg << 'EOF'
 [backend]
@@ -67,7 +67,7 @@ The encrypted keyring file is stored at `~/.local/share/python_keyring/crypted_p
 Passwords are stored in plain text on disk. No master password is needed — execsql will never prompt for a password after the first successful entry.
 
 ```bash
-pip install keyrings.alt
+pip install execsql2[auth-plaintext]
 mkdir -p ~/.config/python_keyring
 cat > ~/.config/python_keyring/keyringrc.cfg << 'EOF'
 [backend]

{execsql2-2.15.2 → execsql2-2.15.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.15.2"
+version = "2.15.4"
 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" }
@@ -59,6 +59,8 @@ odbc = ["pyodbc"]
 # Feature bundles
 formats = ["odfpy", "xlrd", "openpyxl", "Jinja2", "polars", "tables", "PyYAML"]
 auth = ["keyring"]
+auth-plaintext = ["keyring", "keyrings.alt"]
+auth-encrypted = ["keyring", "keyrings.alt", "pycryptodome"]
 upsert = ["pg-upsert>=1.21.0"]
 # Convenience groups
 all-db = [
@@ -162,7 +164,7 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.bumpversion]
-current_version = "2.15.2"
+current_version = "2.15.4"
 commit = true
 commit_args = "--no-verify"
 tag = true
@@ -231,6 +233,8 @@ hel = "hel"
 fo = "fo"
 # odfpy package imports as 'odf', not 'of'
 odf = "odf"
+# Latin-1 test data: b"caf\xe9" decodes to "café"
+caf = "caf"
 
 [tool.tox]
 required = ["tox-uv"]

execsql2-2.15.4/tests/importers/test_csv_edge_cases.py

@@ -0,0 +1,209 @@
+"""
+Edge-case tests for CSV/delimited import.
+
+Covers scenarios not exercised by test_csv_importer.py:
+- Empty files
+- Header-only files (no data rows)
+- Files with BOM markers (UTF-8 BOM)
+- Inconsistent column counts across rows
+- Unicode/special characters in data
+- Very long field values
+- Files with only whitespace rows
+- Encoding parameter override
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from execsql.db.sqlite import SQLiteDatabase
+from execsql.exceptions import ErrInfo
+from execsql.importers.csv import importtable
+
+
+# ---------------------------------------------------------------------------
+# Extra conf attributes required by the importers
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture(autouse=True)
+def importer_conf(minimal_conf):
+    minimal_conf.del_empty_cols = False
+    minimal_conf.create_col_hdrs = False
+    minimal_conf.clean_col_hdrs = False
+    minimal_conf.trim_col_hdrs = "none"
+    minimal_conf.fold_col_hdrs = "no"
+    minimal_conf.dedup_col_hdrs = False
+    minimal_conf.import_encoding = "utf-8"
+    minimal_conf.import_common_cols_only = False
+    minimal_conf.quote_all_text = False
+    minimal_conf.scan_lines = 50
+    minimal_conf.empty_rows = True
+    minimal_conf.import_row_buffer = 1000
+    minimal_conf.import_progress_interval = 0
+    minimal_conf.show_progress = False
+    yield minimal_conf
+
+
+@pytest.fixture
+def db(tmp_path):
+    path = str(tmp_path / "test.db")
+    d = SQLiteDatabase(path)
+    yield d
+    d.close()
+
+
+# ===========================================================================
+# Empty and minimal files
+# ===========================================================================
+
+
+class TestEmptyAndMinimalFiles:
+    def test_header_only_no_data_rows(self, db, tmp_path):
+        """A CSV with headers but zero data rows should create a table with no rows."""
+        csv = tmp_path / "empty_data.csv"
+        csv.write_text("id,name,value\n", encoding="utf-8")
+        importtable(db, None, "empty_tbl", str(csv), is_new=1)
+        _, rows = db.select_data("SELECT * FROM empty_tbl;")
+        assert len(rows) == 0
+
+    def test_single_column_single_row(self, db, tmp_path):
+        csv = tmp_path / "single.csv"
+        csv.write_text("x\n42\n", encoding="utf-8")
+        importtable(db, None, "single_tbl", str(csv), is_new=1)
+        _, rows = db.select_data("SELECT x FROM single_tbl;")
+        assert len(rows) == 1
+
+    def test_nonexistent_file_raises(self, db, tmp_path):
+        with pytest.raises(ErrInfo, match="Non-existent file"):
+            importtable(db, None, "t", str(tmp_path / "ghost.csv"), is_new=1)
+
+
+# ===========================================================================
+# BOM handling
+# ===========================================================================
+
+
+class TestBOMHandling:
+    def test_utf8_bom_import(self, db, tmp_path):
+        """UTF-8 BOM should not corrupt the first column header."""
+        csv = tmp_path / "bom.csv"
+        csv.write_bytes(b"\xef\xbb\xbfid,name\n1,Alice\n2,Bob\n")
+        importtable(db, None, "bom_tbl", str(csv), is_new=1, encoding="utf-8-sig")
+        cols = db.table_columns("bom_tbl")
+        # First column should be 'id', not '\ufeffid'
+        assert cols[0] == "id"
+        _, rows = db.select_data("SELECT id FROM bom_tbl ORDER BY id;")
+        assert len(rows) == 2
+
+
+# ===========================================================================
+# Unicode and special characters
+# ===========================================================================
+
+
+class TestUnicodeData:
+    def test_unicode_values(self, db, tmp_path):
+        csv = tmp_path / "unicode.csv"
+        csv.write_text('id,name\n1,"café résumé"\n2,"日本語"\n', encoding="utf-8")
+        importtable(db, None, "uni_tbl", str(csv), is_new=1)
+        _, rows = db.select_data("SELECT name FROM uni_tbl ORDER BY id;")
+        assert rows[0][0] == "café résumé"
+        assert rows[1][0] == "日本語"
+
+    def test_embedded_commas_in_quoted_field(self, db, tmp_path):
+        csv = tmp_path / "commas.csv"
+        csv.write_text('id,description\n1,"hello, world"\n', encoding="utf-8")
+        importtable(db, None, "comma_tbl", str(csv), is_new=1)
+        _, rows = db.select_data("SELECT description FROM comma_tbl;")
+        assert rows[0][0] == "hello, world"
+
+    def test_embedded_newlines_in_quoted_field(self, db, tmp_path):
+        """Embedded newlines in quoted CSV fields are not preserved by the
+        execsql CSV reader — the newline is treated as a row break.  This test
+        documents the current behavior: the import succeeds but the value is
+        split across rows or truncated."""
+        csv = tmp_path / "newlines.csv"
+        csv.write_text('id,val\n1,"line1\nline2"\n', encoding="utf-8")
+        # The import should not crash — whether the newline is preserved
+        # depends on the parser path (csv module fast-path vs character parser).
+        try:
+            importtable(db, None, "nl_tbl", str(csv), is_new=1)
+        except ErrInfo:
+            pass  # Some parser paths may raise on the malformed row; that's acceptable
+
+    def test_embedded_quotes_doubled(self, db, tmp_path):
+        csv = tmp_path / "quotes.csv"
+        csv.write_text('id,description\n1,"he said ""hello"""\n', encoding="utf-8")
+        importtable(db, None, "qt_tbl", str(csv), is_new=1)
+        _, rows = db.select_data("SELECT description FROM qt_tbl;")
+        assert rows[0][0] == 'he said "hello"'
+
+
+# ===========================================================================
+# Long fields
+# ===========================================================================
+
+
+class TestLongFields:
+    def test_long_string_value(self, db, tmp_path):
+        """Values over 255 chars should be imported as TEXT type."""
+        long_val = "x" * 500
+        csv = tmp_path / "long.csv"
+        csv.write_text(f"id,data\n1,{long_val}\n", encoding="utf-8")
+        importtable(db, None, "long_tbl", str(csv), is_new=1)
+        _, rows = db.select_data("SELECT data FROM long_tbl;")
+        assert len(rows[0][0]) == 500
+
+
+# ===========================================================================
+# Encoding parameter
+# ===========================================================================
+
+
+class TestEncodingOverride:
+    def test_latin1_encoding(self, db, tmp_path):
+        csv = tmp_path / "latin1.csv"
+        csv.write_bytes(b"id,name\n1,caf\xe9\n")
+        importtable(db, None, "lat_tbl", str(csv), is_new=1, encoding="latin-1")
+        _, rows = db.select_data("SELECT name FROM lat_tbl;")
+        assert rows[0][0] == "café"
+
+
+# ===========================================================================
+# Junk header lines
+# ===========================================================================
+
+
+class TestJunkHeaderLines:
+    def test_skip_junk_lines(self, db, tmp_path):
+        csv = tmp_path / "junk.csv"
+        csv.write_text("Report Title\nGenerated: today\nid,name\n1,Alice\n", encoding="utf-8")
+        importtable(db, None, "junk_tbl", str(csv), is_new=1, junk_header_lines=2)
+        _, rows = db.select_data("SELECT name FROM junk_tbl;")
+        assert rows[0][0] == "Alice"
+
+
+# ===========================================================================
+# Append to existing table with type compatibility
+# ===========================================================================
+
+
+class TestAppendEdgeCases:
+    def test_append_with_null_values(self, db, tmp_path):
+        db.execute("CREATE TABLE t (id INTEGER, name TEXT);")
+        db.execute("INSERT INTO t VALUES (1, 'existing');")
+        db.commit()
+        csv = tmp_path / "nulls.csv"
+        csv.write_text("id,name\n2,\n", encoding="utf-8")
+        importtable(db, None, "t", str(csv), is_new=False)
+        _, rows = db.select_data("SELECT name FROM t WHERE id = 2;")
+        assert len(rows) == 1
+        # With empty_strings=True (default), empty CSV fields are imported as empty strings
+        assert rows[0][0] == "" or rows[0][0] is None
+
+    def test_append_nonexistent_table(self, db, tmp_path):
+        csv = tmp_path / "data.csv"
+        csv.write_text("x\n1\n", encoding="utf-8")
+        with pytest.raises(ErrInfo, match="Non-existent table"):
+            importtable(db, None, "no_such", str(csv), is_new=False)