execsql2 2.15.1__tar.gz → 2.15.2__tar.gz

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

@@ -13,6 +13,24 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.15.2] - 2026-04-14
+
+### Changed
+
+- `DT_Integer`, `DT_Float`, and `DT_Decimal` data type matchers now use pre-compiled regex class attributes instead of recompiling on every call — reduces overhead during large imports.
+- `DT_Boolean` match tuples are now cached and only rebuilt when the `boolean_words`/`boolean_int` config changes, instead of on every `_is_match()`/`_from_data()` call.
+- SQLite and DuckDB adapter methods (`table_exists`, `table_columns`, `view_exists`, `schema_exists`) now use the `_cursor()` context manager to prevent cursor leaks on exceptions.
+
+### Fixed
+
+- `DT_Text.data_type_name` corrected from `"character"` to `"text"` — error messages now correctly identify the text data type instead of showing "character".
+- `DT_Varchar._from_data()` now converts non-string data to string and enforces the 255-character length limit. Previously, non-string values passed through without conversion or length check.
+- `WriteHooks.write_err()` no longer crashes on empty string input.
+- `CondAstNode.eval()` now raises `CondParserError` for unknown node types instead of silently returning `None`.
+- `NumericAstNode.eval()` now raises `NumericParserError` on division by zero instead of an unhandled `ZeroDivisionError`.
+
+______________________________________________________________________
+
 ## [2.15.1] - 2026-04-14
 
 ### Added

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.15.1
+Version: 2.15.2
 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

{execsql2-2.15.1 → execsql2-2.15.2}/docs/about/divergence.md

@@ -248,6 +248,11 @@ These are behavioral changes driven by security or correctness issues in the ups
 | Empty-column check precedence                       | `DataTable` and `Database.populate_table()` had an operator precedence bug in the extra-column emptiness check — a redundant `and conf.del_empty_cols` caused incorrect short-circuit evaluation. Inherited from upstream.                                                                             |
 | SQLite import string processing                     | `SQLiteDatabase.populate_table()` applied `trim_strings`, `replace_newlines`, and `empty_strings` after copying row data, so processing never reached the INSERT. Fixed to process before extraction. Inherited from upstream.                                                                         |
 | `$CURRENT_DATABASE`/`$CURRENT_DBMS` stale after USE | These variables were only set at startup and on CONNECT, not refreshed when `USE` switched the active database. Now set in `set_static_system_vars()` so they update on any connection change.                                                                                                         |
+| `DT_Text.data_type_name` wrong                      | Was `"character"` (same as `DT_Character`), making error messages indistinguishable. Corrected to `"text"`. Inherited from upstream.                                                                                                                                                                   |
+| `DT_Varchar` non-string data unchecked              | `_from_data()` only enforced the 255-char limit for `str` inputs; non-string values passed through without conversion or length check. Inherited from upstream.                                                                                                                                        |
+| `WriteHooks.write_err()` crash on empty string      | `strval[-1]` raised `IndexError` on empty input. Fixed to use `str.endswith()`. Inherited from upstream.                                                                                                                                                                                               |
+| `NumericParser` division by zero                    | `NumericAstNode.eval()` raised unhandled `ZeroDivisionError`. Now raises `NumericParserError` with a clear message. Inherited from upstream.                                                                                                                                                           |
+| `CondAstNode.eval()` could return `None`            | Missing fallthrough for unknown node types silently returned `None`. Now raises `CondParserError`. Inherited from upstream.                                                                                                                                                                            |
 
 ______________________________________________________________________
 

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.15.1"
+version = "2.15.2"
 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" }
@@ -162,7 +162,7 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.bumpversion]
-current_version = "2.15.1"
+current_version = "2.15.2"
 commit = true
 commit_args = "--no-verify"
 tag = true

{execsql2-2.15.1 → execsql2-2.15.2}/src/execsql/config.py

@@ -569,7 +569,7 @@ class WriteHooks:
 
     def write_err(self, strval: str) -> None:
         """Write an error string to the error-output hook, or to sys.stderr if unset."""
-        if strval[-1] != "\n":
+        if not strval.endswith("\n"):
             strval += "\n"
         if self.err_func:
             self.err_func(strval)

{execsql2-2.15.1 → execsql2-2.15.2}/src/execsql/db/duckdb.py

@@ -81,11 +81,10 @@ class DuckDBDatabase(Database):
     def schema_exists(self, schema_name: str) -> bool:
         """Return True if the named schema exists in the current DuckDB catalog."""
         # In DuckDB, the 'schemata' view is not limited to the current database.
-        curs = self.cursor()
-        curs.execute(
-            "SELECT schema_name FROM information_schema.schemata WHERE schema_name = ? and catalog_name = ?;",
-            (schema_name, self.catalog_name),
-        )
-        rows = curs.fetchall()
-        curs.close()
+        with self._cursor() as curs:
+            curs.execute(
+                "SELECT schema_name FROM information_schema.schemata WHERE schema_name = ? and catalog_name = ?;",
+                (schema_name, self.catalog_name),
+            )
+            rows = curs.fetchall()
         return len(rows) > 0

{execsql2-2.15.1 → execsql2-2.15.2}/src/execsql/db/sqlite.py

@@ -82,21 +82,21 @@ class SQLiteDatabase(Database):
 
     def table_exists(self, table_name: str, schema_name: str | None = None) -> bool:
         """Return True if the named table exists in the SQLite database."""
-        curs = self.cursor()
-        sql = "select name from sqlite_master where type='table' and name=?;"
-        try:
-            curs.execute(sql, (table_name,))
-        except ErrInfo:
-            raise
-        except Exception as e:
-            self.rollback()
-            raise ErrInfo(
-                type="db",
-                command_text=sql,
-                exception_msg=exception_desc(),
-                other_msg=f'Failed test for existence of SQLite table "{table_name}";',
-            ) from e
-        rows = curs.fetchall()
+        with self._cursor() as curs:
+            sql = "select name from sqlite_master where type='table' and name=?;"
+            try:
+                curs.execute(sql, (table_name,))
+            except ErrInfo:
+                raise
+            except Exception as e:
+                self.rollback()
+                raise ErrInfo(
+                    type="db",
+                    command_text=sql,
+                    exception_msg=exception_desc(),
+                    other_msg=f'Failed test for existence of SQLite table "{table_name}";',
+                ) from e
+            rows = curs.fetchall()
         return len(rows) > 0
 
     def column_exists(
@@ -111,40 +111,40 @@ class SQLiteDatabase(Database):
 
     def table_columns(self, table_name: str, schema_name: str | None = None) -> list[str]:
         """Return a list of column names for the given SQLite table."""
-        curs = self.cursor()
-        quoted_tbl = self.quote_identifier(table_name)
-        sql = f"select * from {quoted_tbl} where 1=0;"
-        try:
-            curs.execute(sql)
-        except ErrInfo:
-            raise
-        except Exception as e:
-            self.rollback()
-            raise ErrInfo(
-                type="db",
-                command_text=sql,
-                exception_msg=exception_desc(),
-                other_msg=f"Failed to get column names for table {table_name} of {self.name()}",
-            ) from e
-        return [d[0] for d in curs.description]
+        with self._cursor() as curs:
+            quoted_tbl = self.quote_identifier(table_name)
+            sql = f"select * from {quoted_tbl} where 1=0;"
+            try:
+                curs.execute(sql)
+            except ErrInfo:
+                raise
+            except Exception as e:
+                self.rollback()
+                raise ErrInfo(
+                    type="db",
+                    command_text=sql,
+                    exception_msg=exception_desc(),
+                    other_msg=f"Failed to get column names for table {table_name} of {self.name()}",
+                ) from e
+            return [d[0] for d in curs.description]
 
     def view_exists(self, view_name: str) -> bool:
         """Return True if the named view exists in the SQLite database."""
-        curs = self.cursor()
-        sql = "select name from sqlite_master where type='view' and name=?;"
-        try:
-            curs.execute(sql, (view_name,))
-        except ErrInfo:
-            raise
-        except Exception as e:
-            self.rollback()
-            raise ErrInfo(
-                type="db",
-                command_text=sql,
-                exception_msg=exception_desc(),
-                other_msg=f'Failed test for existence of SQLite view "{view_name}";',
-            ) from e
-        rows = curs.fetchall()
+        with self._cursor() as curs:
+            sql = "select name from sqlite_master where type='view' and name=?;"
+            try:
+                curs.execute(sql, (view_name,))
+            except ErrInfo:
+                raise
+            except Exception as e:
+                self.rollback()
+                raise ErrInfo(
+                    type="db",
+                    command_text=sql,
+                    exception_msg=exception_desc(),
+                    other_msg=f'Failed test for existence of SQLite view "{view_name}";',
+                ) from e
+            rows = curs.fetchall()
         return len(rows) > 0
 
     def schema_exists(self, schema_name: str) -> bool:

{execsql2-2.15.1 → execsql2-2.15.2}/src/execsql/parser.py

@@ -151,8 +151,6 @@ class CondAstNode(CondTokens):
 
     def eval(self) -> bool:
         """Evaluate this subtree and return a boolean result."""
-        # Evaluates the subtrees and/or conditional value for this node,
-        # returning True or False.
         if self.type == self.CONDITIONAL:
             exec_fn = self.left[0].exec_fn
             cmdargs = self.left[1]
@@ -168,6 +166,7 @@ class CondAstNode(CondTokens):
             if lcond:
                 return True
             return self.right.eval()
+        raise CondParserError(f"Unknown conditional node type: {self.type}")
 
 
 # AST for numeric expressions
@@ -200,6 +199,8 @@ class NumericAstNode(NumTokens):
             if self.type == self.MUL:
                 return lnum * rnum
             elif self.type == self.DIV:
+                if rnum == 0:
+                    raise NumericParserError("Division by zero.")
                 return lnum / rnum
             elif self.type == self.ADD:
                 return lnum + rnum

{execsql2-2.15.1 → execsql2-2.15.2}/src/execsql/types.py

@@ -296,14 +296,24 @@ class DT_Boolean(DataType):
     data_type_name = "boolean"
     data_type = bool
 
+    def __init__(self) -> None:
+        """Initialise with empty match caches; populated on first use."""
+        self.true: tuple = ()
+        self.false: tuple = ()
+        self.bool_repr: tuple = ()
+        self._cache_key: tuple | None = None
+
     def __repr__(self) -> str:
         return "DT_Boolean()"
 
-    def set_bool_matches(self) -> None:
-        """Populate the true/false match tuples from the current configuration."""
+    def _ensure_bool_matches(self) -> None:
+        """Rebuild true/false match tuples only when the config has changed."""
         import execsql.state as _state
 
         conf = _state.conf
+        key = (conf.boolean_words, conf.boolean_int)
+        if key == self._cache_key:
+            return
         self.true = ("yes", "true")
         self.false = ("no", "false")
         if not conf.boolean_words:
@@ -313,6 +323,7 @@ class DT_Boolean(DataType):
             self.true += ("1",)
             self.false += ("0",)
         self.bool_repr = self.true + self.false
+        self._cache_key = key
 
     def _is_match(self, data: object) -> bool:
         import execsql.state as _state
@@ -320,7 +331,7 @@ class DT_Boolean(DataType):
         conf = _state.conf
         if data is None:
             return False
-        self.set_bool_matches()
+        self._ensure_bool_matches()
         return bool(
             isinstance(data, bool)
             or conf.boolean_int
@@ -336,7 +347,7 @@ class DT_Boolean(DataType):
         conf = _state.conf
         if data is None:
             raise DataTypeError(self.data_type_name, self._CONV_ERR % "NULL")
-        self.set_bool_matches()
+        self._ensure_bool_matches()
         if isinstance(data, bool):
             return data
         elif conf.boolean_int and type(data) is int and data in (0, 1):
@@ -352,6 +363,7 @@ class DT_Integer(DataType):
 
     data_type_name = "integer"
     data_type = int
+    _INT_RX = re.compile(r"^\s*[+-]?\d+\s*$")
 
     def __repr__(self) -> str:
         return "DT_Integer()"
@@ -367,7 +379,7 @@ class DT_Integer(DataType):
         elif isinstance(data, str):
             if leading_zero_num(data):
                 return False
-            if not re.match(r"^\s*[+-]?\d+\s*$", data):
+            if not self._INT_RX.match(data):
                 return False
             try:
                 i = int(data)
@@ -387,7 +399,7 @@ class DT_Integer(DataType):
                 return int(data)
             else:
                 raise DataTypeError(self.data_type_name, self._CONV_ERR % data)
-        if isinstance(data, str) and not re.match(r"^\s*[+-]?\d+\s*$", data):
+        if isinstance(data, str) and not self._INT_RX.match(data):
             raise DataTypeError(self.data_type_name, self._CONV_ERR % data)
         try:
             i = int(data)
@@ -439,6 +451,7 @@ class DT_Float(DataType):
 
     data_type_name = "float"
     data_type = float
+    _FLOAT_RX = re.compile(r"^[+-]?(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?$")
 
     def __repr__(self) -> str:
         return "DT_Float()"
@@ -450,7 +463,7 @@ class DT_Float(DataType):
             return True
         if leading_zero_num(data):
             return False
-        if isinstance(data, str) and not re.match(r"^[+-]?(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?$", data):
+        if isinstance(data, str) and not self._FLOAT_RX.match(data):
             return False
         try:
             float(data)
@@ -465,7 +478,7 @@ class DT_Float(DataType):
             return data
         if leading_zero_num(data):
             raise DataTypeError(self.data_type_name, self._CONV_ERR % data)
-        if isinstance(data, str) and not re.match(r"^[+-]?(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?$", data):
+        if isinstance(data, str) and not self._FLOAT_RX.match(data):
             raise DataTypeError(self.data_type_name, self._CONV_ERR % data)
         try:
             i = float(data)
@@ -480,6 +493,7 @@ class DT_Decimal(DataType):
     data_type_name = "decimal"
     data_type = Decimal
     precspec = True
+    _DECIMAL_RX = re.compile(r"^[+-]?(\d+(\.\d*)?|\.\d+)$")
 
     def __repr__(self) -> str:
         return "DT_Decimal()"
@@ -504,7 +518,7 @@ class DT_Decimal(DataType):
             self.set_scale_prec(data)
             return data
         elif isinstance(data, str):
-            if not re.match(r"^[+-]?(\d+(\.\d*)?|\.\d+)$", data):
+            if not self._DECIMAL_RX.match(data):
                 raise DataTypeError(self.data_type_name, self._CONV_ERR % data)
             try:
                 dec = Decimal(data)
@@ -565,21 +579,20 @@ class DT_Varchar(DataType):
         # This varchar data type is the same as the character data type.
         if data is None:
             raise DataTypeError(self.data_type_name, self._CONV_ERR % "NULL")
-        data_type = str
-        if isinstance(data, str):
+        if not isinstance(data, str):
             try:
-                data = data_type(data)
+                data = str(data)
             except ValueError as e:
                 raise DataTypeError(self.data_type_name, self._CONV_ERR % data) from e
-            if len(data) > 255:
-                raise DataTypeError(self.data_type_name, self._CONV_ERR % data)
+        if len(data) > 255:
+            raise DataTypeError(self.data_type_name, self._CONV_ERR % data)
         return data
 
 
 class DT_Text(DataType):
     """Unbounded text string data type."""
 
-    data_type_name = "character"
+    data_type_name = "text"
 
     def __repr__(self) -> str:
         return "DT_Text()"

{execsql2-2.15.1 → execsql2-2.15.2}/tests/test_parser.py

@@ -299,7 +299,7 @@ class TestNumericParserEdgeCases:
         return NumericParser(expr).parse().eval()
 
     def test_division_by_zero(self):
-        with pytest.raises(ZeroDivisionError):
+        with pytest.raises(NumericParserError, match="Division by zero"):
             self._eval("1 / 0")
 
     def test_unmatched_open_paren(self):
@@ -338,7 +338,7 @@ class TestNumericParserEdgeCases:
         assert self._eval(expr) == 50
 
     def test_float_division_by_zero(self):
-        with pytest.raises(ZeroDivisionError):
+        with pytest.raises(NumericParserError, match="Division by zero"):
             self._eval("1.0 / 0.0")
 
     def test_unmatched_close_paren(self):

{execsql2-2.15.1 → execsql2-2.15.2}/uv.lock

@@ -648,7 +648,7 @@ wheels = [
 
 [[package]]
 name = "execsql2"
-version = "2.15.1"
+version = "2.15.2"
 source = { editable = "." }
 dependencies = [
     { name = "python-dateutil" },