deev 2.0.1__tar.gz → 2.0.2__tar.gz

{deev-2.0.1/src/deev.egg-info → deev-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deev
-Version: 2.0.1
+Version: 2.0.2
 Summary: ..an entity framework for Python.
 Author-email: Shaun Wilson <mrshaunwilson@msn.com>
 License-Expression: MIT

{deev-2.0.1 → deev-2.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "deev"
-version = "2.0.1"
+version = "2.0.2"
 description = "..an entity framework for Python."
 keywords = ["DB", "database", "entity framework", "mapper", "sqlite", "mysql", "mongodb", "clickhouse"]
 authors = [

{deev-2.0.1 → deev-2.0.2}/src/deev/__init__.py

@@ -21,8 +21,8 @@ from .translation import hydrate, splat
 from .utils import connect
 
 
-__version__ = '2.0.1'
-__commit__ = 'e40c4fd'
+__version__ = '2.0.2'
+__commit__ = 'a337fba'
 __all__ = [
     '__version__',
     '__commit__',

{deev-2.0.1 → deev-2.0.2}/src/deev/clickhouse/async_clickhouse_table_adapter.py

@@ -45,7 +45,6 @@ class AsyncClickHouseTableAdapter(AsyncDbTableAdapter[TEntity]):
     __logger: logging.Logger
     __dbtype_mapper: DbTypeMapper
     __table_name: str | None
-    __transaction_state: int
 
     def __init__(
         self,
@@ -59,7 +58,6 @@ class AsyncClickHouseTableAdapter(AsyncDbTableAdapter[TEntity]):
         self.__create_table = create_table is True
         self.__initialized = False
         self.__table_name = table_name
-        self.__transaction_state = 0
         self.__is_sync_replicas_enabled = sync_replicas is True and getattr(self.__context, 'is_replicated', False) is True
         self.__logger = hanaro.get_logger()
 

{deev-2.0.1 → deev-2.0.2}/src/deev/clickhouse/async_clickhouse_transaction_context.py

@@ -94,8 +94,12 @@ class AsyncClickHouseTransactionContext(AsyncDbTransactionContext):
         For ClickHouse: all TLC keywords return None (scrubbed) since ClickHouse
         has no transaction support. Depth tracking is for diagnostics/consistency.
         """
-        if self.__transaction_depth < 0:
-            raise DbError('Cannot use a transaction context that has been exited.')
+        if self.__transaction_depth == -1:
+            raise DbError('Cannot use a transaction context that has exited.')
+        elif self.__transaction_depth == -2:
+            raise DbError('Cannot use a transaction context that has been committed.')
+        elif self.__transaction_depth == -3:
+            raise DbError('Cannot use a transaction context that has been rolled back.')
 
         sql_upper = sql.lstrip().upper()
         prefix = sql_upper[:4]
@@ -119,12 +123,12 @@ class AsyncClickHouseTransactionContext(AsyncDbTransactionContext):
                 self.__savepoints.clear()
                 self.__transaction_name = None
                 self.__ambient_transaction_id.set(None)
+                self.__transaction_depth = -2
             return None
 
         elif prefix == 'ROLL':
             if self.__transaction_depth == 0:
                 raise DbError('Cannot rollback, no transaction.')
-            self.__transaction_depth = 0
             name = extract_rollback_name(sql)
 
             if name:
@@ -141,7 +145,7 @@ class AsyncClickHouseTransactionContext(AsyncDbTransactionContext):
             else:
                 pass  # full rollback, depth reset below
 
-            self.__transaction_depth = 0
+            self.__transaction_depth = -3
             self.__savepoints.clear()
             self.__transaction_name = None
             self.__ambient_transaction_id.set(None)
@@ -250,8 +254,8 @@ class AsyncClickHouseTransactionContext(AsyncDbTransactionContext):
         except Exception:
             return cursor.rowcount
 
-    async def execute_script(self, sql: str, raw: str | None = None) -> None:
-        if raw is not None:
+    async def execute_script(self, sql: str, raw: bool = False) -> None:
+        if raw is True:
             await self.execute(sql, raw=True)
             return
         lines = sql.split('\n')

{deev-2.0.1 → deev-2.0.2}/src/deev/clickhouse/clickhouse_table_adapter.py

@@ -41,7 +41,6 @@ class ClickHouseTableAdapter(Generic[TEntity]):
     __initialized: bool
     __logger: logging.Logger
     __table_name: str | None
-    __transaction_state: int
 
     def __init__(
         self,
@@ -55,7 +54,6 @@ class ClickHouseTableAdapter(Generic[TEntity]):
         self.__create_table = create_table is True
         self.__initialized = False
         self.__table_name = table_name
-        self.__transaction_state = 0
         self.__is_sync_replicas_enabled = sync_replicas is True and getattr(self.__context, 'is_replicated', False) is True
         self.__logger = hanaro.get_logger()
 

{deev-2.0.1 → deev-2.0.2}/src/deev/clickhouse/clickhouse_transaction_context.py

@@ -91,8 +91,12 @@ class ClickHouseTransactionContext(DbTransactionContext):
         For ClickHouse: all TLC keywords return None (scrubbed) since ClickHouse
         has no transaction support. Depth tracking is for diagnostics/consistency.
         """
-        if self.__transaction_depth < 0:
-            raise DbError('Cannot use a transaction context that has been exited.')
+        if self.__transaction_depth == -1:
+            raise DbError('Cannot use a transaction context that has exited.')
+        elif self.__transaction_depth == -2:
+            raise DbError('Cannot use a transaction context that has been committed.')
+        elif self.__transaction_depth == -3:
+            raise DbError('Cannot use a transaction context that has been rolled back.')
 
         sql_upper = sql.lstrip().upper()
         prefix = sql_upper[:4]
@@ -116,12 +120,12 @@ class ClickHouseTransactionContext(DbTransactionContext):
                 self.__savepoints.clear()
                 self.__transaction_name = None
                 self.__ambient_transaction_id.set(None)
+                self.__transaction_depth = -2
             return None
 
         elif prefix == 'ROLL':
             if self.__transaction_depth == 0:
                 raise DbError('Cannot rollback, no transaction.')
-            self.__transaction_depth = 0
             name = extract_rollback_name(sql)
 
             if name:
@@ -138,7 +142,7 @@ class ClickHouseTransactionContext(DbTransactionContext):
             else:
                 pass  # full rollback, depth reset below
 
-            self.__transaction_depth = 0
+            self.__transaction_depth = -3
             self.__savepoints.clear()
             self.__transaction_name = None
             self.__ambient_transaction_id.set(None)
@@ -242,8 +246,8 @@ class ClickHouseTransactionContext(DbTransactionContext):
         except Exception:
             return cursor.rowcount
 
-    def execute_script(self, sql: str, raw: str | None = None) -> None:
-        if raw is not None:
+    def execute_script(self, sql: str, raw: bool = False) -> None:
+        if raw is True:
             self.execute(sql, raw=True)
             return
         lines = sql.split('\n')

{deev-2.0.1 → deev-2.0.2}/src/deev/common/async_db_transaction_context.py

@@ -64,7 +64,7 @@ class AsyncDbTransactionContext(Protocol):
     async def execute(self, sql: str, parameters: DbParameters | None = ..., raw: bool = ...) -> AsyncDbCursor:
         ...
 
-    async def execute_script(self, sql: str) -> None:
+    async def execute_script(self, sql: str, raw: bool = ...) -> None:
         ...
 
     async def execute_nonquery(self, sql: str, parameters: DbParameters | None = ...) -> None:

{deev-2.0.1 → deev-2.0.2}/src/deev/common/db_migrator.py

@@ -161,7 +161,6 @@ class DbMigrator:
                 if migration_func is not None:
                     with begin_transaction(self.__connectionstring) as db_transaction:
                         migration_func(db_transaction)
-                        db_transaction.commit()
                         # NOTE: callee (migration_func) is responsible for calling commit (or rollback)
                     migrations_table.delete(id=applied_migrations.get(migration_name, 0))
                     migrations_table.commit()

{deev-2.0.1 → deev-2.0.2}/src/deev/common/db_transaction_context.py

@@ -58,7 +58,7 @@ class DbTransactionContext(Protocol):
     def execute(self, sql: str, parameters: DbParameters | None = ...) -> DbCursor:
         ...
 
-    def execute_script(self, sql: str) -> None:
+    def execute_script(self, sql: str, raw: bool = ...) -> None:
         ...
 
     def execute_nonquery(self, sql: str, parameters: DbParameters | None = ...) -> None:

{deev-2.0.1 → deev-2.0.2}/src/deev/common/tlc_parser.py

@@ -17,6 +17,11 @@ _BEGIN_PATTERN = re.compile(
     re.IGNORECASE,
 )
 
+_START_PATTERN = re.compile(
+    r'^START\s+TRANSACTION\s+(\S+)',
+    re.IGNORECASE,
+)
+
 _SAVEPOINT_PATTERN = re.compile(
     r'^(?:SAVEPOINT|SAVE\s+(?:TRANSACTION|TRAN))\s+(\S+)',
     re.IGNORECASE,
@@ -24,14 +29,35 @@ _SAVEPOINT_PATTERN = re.compile(
 
 # Handles: ROLLBACK name, ROLLBACK TO name, ROLLBACK TO SAVEPOINT name,
 #          ROLLBACK TRANSACTION name, ROLLBACK TO TRANSACTION name, etc.
-# Uses a multi-step parser instead of a single regex to avoid
-# backtracking issues with optional keyword groups.
-
+# All valid syntaxes are enumerated as explicit alternations so the regex
+# engine never backtracks into capturing bare keywords as names.
 _ROLLBACK_TO_PREFIX = re.compile(
     r'^ROLLBACK\s+TO\s',
     re.IGNORECASE,
 )
 
+# Each alternative requires a name; alternatives that match return the
+# captured group. Nothing else matches, so bare keywords return None.
+_ROLLBACK_PATTERN = re.compile(
+    r'^ROLLBACK\s+'
+    r'(?:'
+    r'TO\s+SAVEPOINT\s+TRAN(?=\s|$)\s+(\S+)'             # ROLLBACK TO SAVEPOINT TRAN name
+    r'|TO\s+SAVEPOINT\s+TRANSACTION\s+(\S+)'              # ROLLBACK TO SAVEPOINT TRANSACTION name
+    r'|TO\s+SAVEPOINT\s+(\S+)'                             # ROLLBACK TO SAVEPOINT name
+    r'|TO\s+TRANSACTION\s+(\S+)'                           # ROLLBACK TO TRANSACTION name
+    r'|TO\s+TRAN(?=\s|$)\s+(\S+)'                          # ROLLBACK TO TRAN name
+    r'|TO\s+(?!SAVEPOINT\s*$|TRAN\s*$|TRANSACTION\s*$)(\S+)'  # ROLLBACK TO name
+    r'|TRANSACTION\s+(\S+)'                                # ROLLBACK TRANSACTION name
+    r'|TRAN(?=\s|$)\s+(\S+)'                               # ROLLBACK TRAN name
+    # Reject bare keywords and TO-prefixed bare keywords
+    r'|(?!SAVEPOINT\s*$|TRANSACTION\s*$|TRAN\s*$'
+    r'|TO\s+(?:SAVEPOINT|TRAN|TRANSACTION)\s*$'           # TO SAVEPOINT, TO TRAN, TO TRANSACTION
+    r'|TO\s*$)'                                            # bare TO
+    r'\s*(\S+)'                                            # ROLLBACK name
+    r')',
+    re.IGNORECASE,
+)
+
 
 def extract_begin_name(sql: str) -> str | None:
     """Extract the transaction name from a ``BEGIN [TRANSACTION|TRAN] name`` statement.
@@ -43,6 +69,16 @@ def extract_begin_name(sql: str) -> str | None:
     return m.group(1) if m else None
 
 
+def extract_start_name(sql: str) -> str | None:
+    """Extract the transaction name from a ``START TRANSACTION name`` statement.
+
+    Returns the name exactly as written in the original SQL, or ``None`` if no
+    name is present.
+    """
+    m = _START_PATTERN.match(sql.lstrip())
+    return m.group(1) if m else None
+
+
 def extract_savepoint_name(sql: str) -> str | None:
     """Extract the savepoint name from a ``SAVEPOINT name`` or ``SAVE [TRANSACTION|TRAN] name`` statement.
 
@@ -59,27 +95,13 @@ def extract_rollback_name(sql: str) -> str | None:
     Returns the name exactly as written in the original SQL, or ``None`` if no
     name is present.
     """
-    s = sql.lstrip()
-    if not s.upper().startswith('ROLLBACK'):
+    m = _ROLLBACK_PATTERN.match(sql.lstrip())
+    if m is None:
         return None
-    rest = s[8:].lstrip()
-
-    # Skip optional "TO"
-    if rest.upper().startswith('TO '):
-        rest = rest[3:].lstrip()
-
-    # Skip optional "SAVEPOINT"
-    if rest.upper().startswith('SAVEPOINT'):
-        rest = rest[9:].lstrip()
-    # Skip optional "TRANSACTION" or "TRAN"
-    if rest.upper().startswith('TRANSACTION'):
-        rest = rest[11:].lstrip()
-    elif rest.upper().startswith('TRAN '):
-        rest = rest[5:].lstrip()
-
-    # Extract name
-    name = rest.split()[0] if rest else None
-    return name
+    for group in m.groups():
+        if group is not None:
+            return group
+    return None
 
 
 def is_rollback_to(sql: str) -> bool:
@@ -93,6 +115,7 @@ def is_rollback_to(sql: str) -> bool:
 
 __all__ = [
     'extract_begin_name',
+    'extract_start_name',
     'extract_savepoint_name',
     'extract_rollback_name',
     'is_rollback_to'

{deev-2.0.1 → deev-2.0.2}/src/deev/mongodb/async_mongo_table_adapter.py

@@ -41,7 +41,6 @@ class AsyncMongoTableAdapter(AsyncDbTableAdapter[TEntity]):
     __initialized: bool
     __dbtype_mapper: DbTypeMapper
     __table_name: str | None
-    __transaction_state: int
 
     def __init__(
         self,
@@ -55,7 +54,6 @@ class AsyncMongoTableAdapter(AsyncDbTableAdapter[TEntity]):
         self.__create_table = create_table is True
         self.__initialized = False
         self.__table_name = table_name
-        self.__transaction_state = 0
 
         self.__database_name = self.__context.mongo_database_name  # type: ignore[missing-attribute, union-attr]
 

{deev-2.0.1 → deev-2.0.2}/src/deev/mongodb/async_mongo_transaction_context.py

@@ -109,8 +109,12 @@ class AsyncMongoTransactionContext(AsyncDbTransactionContext):
         For MongoDB: all TLC keywords return None (scrubbed) since MongoDB has
         no SQL transaction syntax. Side effects happen via mongo_session.
         """
-        if self.__transaction_depth < 0:
-            raise DbError('Cannot use a transaction context that has been exited.')
+        if self.__transaction_depth == -1:
+            raise DbError('Cannot use a transaction context that has exited.')
+        elif self.__transaction_depth == -2:
+            raise DbError('Cannot use a transaction context that has been committed.')
+        elif self.__transaction_depth == -3:
+            raise DbError('Cannot use a transaction context that has been rolled back.')
 
         sql_upper = sql.lstrip().upper()
         prefix = sql_upper[:4]
@@ -136,14 +140,14 @@ class AsyncMongoTransactionContext(AsyncDbTransactionContext):
                 self.__savepoints.clear()
                 self.__transaction_name = None
                 self.__ambient_transaction_id.set(None)
-            if not self.__delegate_mode and self.__transaction_depth == 0:
+                self.__transaction_depth = -2
+            if not self.__delegate_mode and self.__transaction_depth == -2:
                 await self.mongo_session.commit_transaction()
             return None
 
         elif prefix == 'ROLL':
             if self.__transaction_depth == 0:
                 raise DbError('Cannot rollback, no transaction.')
-            self.__transaction_depth = 0
             name = extract_rollback_name(sql)
 
             if name:
@@ -160,7 +164,7 @@ class AsyncMongoTransactionContext(AsyncDbTransactionContext):
             else:
                 pass  # full rollback, depth reset below
 
-            self.__transaction_depth = 0
+            self.__transaction_depth = -3
             self.__savepoints.clear()
             self.__transaction_name = None
             self.__ambient_transaction_id.set(None)
@@ -282,8 +286,8 @@ class AsyncMongoTransactionContext(AsyncDbTransactionContext):
         except Exception:
             return cursor.rowcount
 
-    async def execute_script(self, sql: str, raw: str | None = None) -> None:
-        if raw is not None:
+    async def execute_script(self, sql: str, raw: bool = False) -> None:
+        if raw is True:
             await self.execute(sql, raw=True)
             return
         lines = sql.split('\n')

{deev-2.0.1 → deev-2.0.2}/src/deev/mongodb/mongo_table_adapter.py

@@ -40,7 +40,6 @@ class MongoTableAdapter(Generic[TEntity]):
     __initialized: bool
     __dbtype_mapper: DbTypeMapper
     __table_name: str | None
-    __transaction_state: int
 
     def __init__(
         self,
@@ -54,7 +53,6 @@ class MongoTableAdapter(Generic[TEntity]):
         self.__create_table = create_table is True
         self.__initialized = False
         self.__table_name = table_name
-        self.__transaction_state = 0
 
         self.__database_name = self.__context.mongo_database_name  # type: ignore[missing-attribute, union-attr]
 

{deev-2.0.1 → deev-2.0.2}/src/deev/mongodb/mongo_transaction_context.py

@@ -111,8 +111,12 @@ class MongoTransactionContext(DbTransactionContext):
         For MongoDB: all TLC keywords return None (scrubbed) since MongoDB has
         no SQL transaction syntax. Side effects happen via mongo_session.
         """
-        if self.__transaction_depth < 0:
-            raise DbError('Cannot use a transaction context that has been exited.')
+        if self.__transaction_depth == -1:
+            raise DbError('Cannot use a transaction context that has exited.')
+        elif self.__transaction_depth == -2:
+            raise DbError('Cannot use a transaction context that has been committed.')
+        elif self.__transaction_depth == -3:
+            raise DbError('Cannot use a transaction context that has been rolled back.')
 
         sql_upper = sql.lstrip().upper()
         prefix = sql_upper[:4]
@@ -138,14 +142,14 @@ class MongoTransactionContext(DbTransactionContext):
                 self.__savepoints.clear()
                 self.__transaction_name = None
                 self.__ambient_transaction_id.set(None)
-            if not self.__delegate_mode and self.__transaction_depth == 0:
+                self.__transaction_depth = -2
+            if not self.__delegate_mode and self.__transaction_depth == -2:
                 self.mongo_session.commit_transaction()
             return None
 
         elif prefix == 'ROLL':
             if self.__transaction_depth == 0:
                 raise DbError('Cannot rollback, no transaction.')
-            self.__transaction_depth = 0
             name = extract_rollback_name(sql)
 
             if name:
@@ -162,7 +166,7 @@ class MongoTransactionContext(DbTransactionContext):
             else:
                 pass  # full rollback, depth reset below
 
-            self.__transaction_depth = 0
+            self.__transaction_depth = -3
             self.__savepoints.clear()
             self.__transaction_name = None
             self.__ambient_transaction_id.set(None)
@@ -281,8 +285,8 @@ class MongoTransactionContext(DbTransactionContext):
         except Exception:
             return cursor.rowcount
 
-    def execute_script(self, sql: str, raw: str | None = None) -> None:
-        if raw is not None:
+    def execute_script(self, sql: str, raw: bool = False) -> None:
+        if raw is True:
             self.execute(sql, raw=True)
             return
         lines = sql.split('\n')

{deev-2.0.1 → deev-2.0.2}/src/deev/mysql/async_mysql_proxy_cursor.py

@@ -39,16 +39,14 @@ class AsyncMySQLProxyCursor(AsyncDbCursor):
         return self.__cursor.rowcount
 
     async def execute(self, operation: str, parameters: DbParameters | None = None) -> None:
-        operation = operation.replace(self.__sql_arg_expect, self.__sql_arg_subst)
-        self.__logger.debug(f'execute({operation!r}, {parameters!r})')
-        if parameters is None:
+        if parameters is None or len(parameters) == 0:
             await self.__cursor.execute(operation)
         else:
+            operation = operation.replace(self.__sql_arg_expect, self.__sql_arg_subst)
             await self.__cursor.execute(operation, parameters)  # type: ignore[arg-type]
 
     async def executemany(self, operation: str, seq_of_parameters: Sequence[DbParameters]) -> None:
         operation = operation.replace(self.__sql_arg_expect, self.__sql_arg_subst)
-        self.__logger.debug(f'execute({operation!r}, {seq_of_parameters!r})')
         await self.__cursor.executemany(operation, seq_of_parameters)  # type: ignore[arg-type]
 
     async def fetchone(self) -> tuple[Any, ...] | None:

{deev-2.0.1 → deev-2.0.2}/src/deev/mysql/async_mysql_table_adapter.py

@@ -38,7 +38,6 @@ class AsyncMySQLTableAdapter(AsyncDbTableAdapter[TEntity]):
     __entity_spec: EntitySpec
     __initialized: bool
     __table_name: str | None
-    __transaction_state: int
 
     def __init__(
         self,
@@ -52,7 +51,6 @@ class AsyncMySQLTableAdapter(AsyncDbTableAdapter[TEntity]):
         self.__create_table = create_table is True
         self.__initialized = False
         self.__table_name = table_name
-        self.__transaction_state = 0
 
     async def __deferred_init(self) -> None:
         if not self.__initialized:

{deev-2.0.1 → deev-2.0.2}/src/deev/mysql/async_mysql_transaction_context.py

@@ -95,8 +95,12 @@ class AsyncMySQLTransactionContext(AsyncDbTransactionContext):
 
         MySQL-specific: strips name from START TRANSACTION (MySQL doesn't support named transactions).
         """
-        if self.__transaction_depth < 0:
-            raise DbError('Cannot use a transaction context that has been exited.')
+        if self.__transaction_depth == -1:
+            raise DbError('Cannot use a transaction context that has exited.')
+        elif self.__transaction_depth == -2:
+            raise DbError('Cannot use a transaction context that has been committed.')
+        elif self.__transaction_depth == -3:
+            raise DbError('Cannot use a transaction context that has been rolled back.')
 
         sql_upper = sql.lstrip().upper()
         prefix = sql_upper[:4]
@@ -123,7 +127,7 @@ class AsyncMySQLTransactionContext(AsyncDbTransactionContext):
                 self.__savepoints.clear()
                 self.__transaction_name = None
                 self.__ambient_transaction_id.set(None)
-            if self.__transaction_depth == 0:
+                self.__transaction_depth = -2
                 return 'COMMIT'
             else:
                 return None
@@ -131,7 +135,6 @@ class AsyncMySQLTransactionContext(AsyncDbTransactionContext):
         elif prefix == 'ROLL':
             if self.__transaction_depth == 0:
                 raise DbError('Cannot rollback, no transaction.')
-            self.__transaction_depth = 0
             name = extract_rollback_name(sql)
 
             if name:
@@ -140,7 +143,7 @@ class AsyncMySQLTransactionContext(AsyncDbTransactionContext):
                         sp = self.__savepoints.pop()
                         if sp == name:
                             break
-                    return 'ROLLBACK TRANSACTION'
+                    return f'ROLLBACK TO SAVEPOINT {name}'
                 elif name == self.__transaction_name:
                     pass  # full rollback, depth reset below
                 else:
@@ -148,7 +151,7 @@ class AsyncMySQLTransactionContext(AsyncDbTransactionContext):
             else:
                 pass  # full rollback, depth reset below
 
-            self.__transaction_depth = 0
+            self.__transaction_depth = -3
             self.__savepoints.clear()
             self.__transaction_name = None
             self.__ambient_transaction_id.set(None)
@@ -242,8 +245,8 @@ class AsyncMySQLTransactionContext(AsyncDbTransactionContext):
         except mysql.connector.ProgrammingError:
             return cursor.rowcount
 
-    async def execute_script(self, sql: str, raw: str | None = None) -> None:
-        if raw is not None:
+    async def execute_script(self, sql: str, raw: bool = False) -> None:
+        if raw is True:
             await self.execute(sql, raw=True)
             return
         lines = sql.split('\n')

{deev-2.0.1 → deev-2.0.2}/src/deev/mysql/mysql_proxy_cursor.py

@@ -41,16 +41,14 @@ class MySQLProxyCursor(DbCursor):
         return self.__cursor.rowcount
 
     def execute(self, operation: str, parameters: DbParameters | None = None) -> None:
-        operation = operation.replace(self.__sql_arg_expect, self.__sql_arg_subst)
-        self.__logger.debug(f'execute({operation!r}, {parameters!r})')
-        if parameters is None:
+        if parameters is None or len(parameters) == 0:
             self.__cursor.execute(operation)
         else:
+            operation = operation.replace(self.__sql_arg_expect, self.__sql_arg_subst)
             self.__cursor.execute(operation, parameters)  # type: ignore[arg-type]
 
     def executemany(self, operation: str, seq_of_parameters: Sequence[DbParameters]) -> None:
         operation = operation.replace(self.__sql_arg_expect, self.__sql_arg_subst)
-        self.__logger.debug(f'execute({operation!r}, {seq_of_parameters!r})')
         self.__cursor.executemany(operation, seq_of_parameters)
 
     def fetchone(self) -> tuple[Any, ...] | None:

{deev-2.0.1 → deev-2.0.2}/src/deev/mysql/mysql_table_adapter.py

@@ -40,7 +40,6 @@ class MySQLTableAdapter(Generic[TEntity]):
     __initialized: bool
     __dbtype_mapper: DbTypeMapper
     __table_name: str | None
-    __transaction_state: int
 
     def __init__(
         self,
@@ -54,7 +53,6 @@ class MySQLTableAdapter(Generic[TEntity]):
         self.__create_table = create_table is True
         self.__initialized = False
         self.__table_name = table_name
-        self.__transaction_state = 0
 
     def __deferred_init(self) -> None:
         if not self.__initialized:

{deev-2.0.1 → deev-2.0.2}/src/deev/mysql/mysql_transaction_context.py

@@ -17,7 +17,7 @@ from ..common.db_cursor import DbCursor
 from ..common.db_error import DbError
 from ..common.db_parameters import DbParameters
 from ..common.db_transaction_context import DbTransactionContext
-from ..common.tlc_parser import extract_begin_name, extract_rollback_name, extract_savepoint_name
+from ..common.tlc_parser import extract_begin_name, extract_rollback_name, extract_savepoint_name, extract_start_name
 from .mysql_proxy_connection import MySQLProxyConnection
 
 
@@ -84,8 +84,12 @@ class MySQLTransactionContext(DbTransactionContext):
 
         MySQL-specific: strips name from START TRANSACTION (MySQL doesn't support named transactions).
         """
-        if self.__transaction_depth < 0:
-            raise DbError('Cannot use a transaction context that has been exited.')
+        if self.__transaction_depth == -1:
+            raise DbError('Cannot use a transaction context that has exited.')
+        elif self.__transaction_depth == -2:
+            raise DbError('Cannot use a transaction context that has been committed.')
+        elif self.__transaction_depth == -3:
+            raise DbError('Cannot use a transaction context that has been rolled back.')
 
         sql_upper = sql.lstrip().upper()
         prefix = sql_upper[:4]
@@ -94,7 +98,12 @@ class MySQLTransactionContext(DbTransactionContext):
             if self.__transaction_depth > 0:
                 return None
             self.__transaction_depth += 1
-            self.__transaction_name = extract_begin_name(sql)
+            if prefix == 'STAR':
+                self.__transaction_name = extract_start_name(sql)
+            elif sql_upper.startswith('BEGIN WORK') or sql_upper.startswith('BEGIN '):
+                self.__transaction_name = None
+            else:
+                self.__transaction_name = extract_begin_name(sql)
             self.__ambient_transaction_id.set(self.__transaction_name or self.__transaction_id)
             return 'START TRANSACTION'
 
@@ -112,7 +121,7 @@ class MySQLTransactionContext(DbTransactionContext):
                 self.__savepoints.clear()
                 self.__transaction_name = None
                 self.__ambient_transaction_id.set(None)
-            if self.__transaction_depth == 0:
+                self.__transaction_depth = -2
                 return 'COMMIT'
             else:
                 return None
@@ -120,7 +129,6 @@ class MySQLTransactionContext(DbTransactionContext):
         elif prefix == 'ROLL':
             if self.__transaction_depth == 0:
                 raise DbError('Cannot rollback, no transaction.')
-            self.__transaction_depth = 0
             name = extract_rollback_name(sql)
 
             if name:
@@ -129,7 +137,7 @@ class MySQLTransactionContext(DbTransactionContext):
                         sp = self.__savepoints.pop()
                         if sp == name:
                             break
-                    return 'ROLLBACK'
+                    return f'ROLLBACK TO SAVEPOINT {name}'
                 elif name == self.__transaction_name:
                     pass  # full rollback, depth reset below
                 else:
@@ -137,7 +145,7 @@ class MySQLTransactionContext(DbTransactionContext):
             else:
                 pass  # full rollback, depth reset below
 
-            self.__transaction_depth = 0
+            self.__transaction_depth = -3
             self.__savepoints.clear()
             self.__transaction_name = None
             self.__ambient_transaction_id.set(None)
@@ -234,8 +242,8 @@ class MySQLTransactionContext(DbTransactionContext):
         except mysql.connector.ProgrammingError:
             return cursor.rowcount
 
-    def execute_script(self, sql: str, raw: str | None = None) -> None:
-        if raw is not None:
+    def execute_script(self, sql: str, raw: bool = False) -> None:
+        if raw is True:
             self.execute(sql, raw=True)
             return
         lines = sql.split('\n')

{deev-2.0.1 → deev-2.0.2}/src/deev/sqlite/async_sqlite_transaction_context.py

@@ -126,7 +126,7 @@ class AsyncSQLiteTransactionContext(AsyncDbTransactionContext):
     async def execute_scalar(self, sql: str, parameters: DbParameters | None = None) -> Any:
         return self.__get_inner_ctx().execute_scalar(sql, parameters)
 
-    async def execute_script(self, sql: str, raw: str | None = None) -> None:
+    async def execute_script(self, sql: str, raw: bool = False) -> None:
         self.__get_inner_ctx().execute_script(sql, raw)
 
     async def rollback(self, name: str | None = None) -> None:

{deev-2.0.1 → deev-2.0.2}/src/deev/sqlite/sqlite_proxy_cursor.py

@@ -45,17 +45,14 @@ class SQLiteProxyCursor(DbCursor):
         return self.__cursor.rowcount
 
     def execute(self, operation: str, parameters: DbParameters | None = None) -> None:
-        if parameters is not None:
-            operation = operation.replace(self.__sql_arg_expect, self.__sql_arg_subst)
-        self.__logger.debug(f'execute({operation!r}, {parameters!r})')
-        if parameters is None:
+        if parameters is None or len(parameters) == 0:
             self.__cursor.execute(operation)
         else:
+            operation = operation.replace(self.__sql_arg_expect, self.__sql_arg_subst)
             self.__cursor.execute(operation, parameters)  # type: ignore[arg-type]
 
     def executemany(self, operation: str, seq_of_parameters: Sequence[DbParameters]) -> None:
         operation = operation.replace(self.__sql_arg_expect, self.__sql_arg_subst)
-        self.__logger.debug(f'execute({operation!r}, {seq_of_parameters!r})')
         self.__cursor.executemany(operation, seq_of_parameters)
 
     def fetchone(self) -> tuple[Any, ...] | None:

{deev-2.0.1 → deev-2.0.2}/src/deev/sqlite/sqlite_table_adapter.py

@@ -39,7 +39,6 @@ class SQLiteTableAdapter(Generic[TEntity]):
     __initialized: bool
     __dbtype_mapper: DbTypeMapper
     __entity_spec: EntitySpec
-    __transaction_state: int
     __table_name: str | None
 
     def __init__(
@@ -54,7 +53,6 @@ class SQLiteTableAdapter(Generic[TEntity]):
         self.__create_table = create_table is True
         self.__initialized = False
         self.__table_name = table_name
-        self.__transaction_state = 0
 
     def __deferred_init(self) -> None:
         if not self.__initialized:

{deev-2.0.1 → deev-2.0.2}/src/deev/sqlite/sqlite_transaction_context.py

@@ -82,8 +82,12 @@ class SQLiteTransactionContext(DbTransactionContext):
           - None if scrubbed because the DBMS does not support it.
           - Raises DbError if operation is invalid.
         """
-        if self.__transaction_depth < 0:
-            raise DbError('Cannot use a transaction context that has been exited.')
+        if self.__transaction_depth == -1:
+            raise DbError('Cannot use a transaction context that has exited.')
+        elif self.__transaction_depth == -2:
+            raise DbError('Cannot use a transaction context that has been committed.')
+        elif self.__transaction_depth == -3:
+            raise DbError('Cannot use a transaction context that has been rolled back.')
 
         sql_upper = sql.lstrip().upper()
         prefix = sql_upper[:4]
@@ -111,7 +115,7 @@ class SQLiteTransactionContext(DbTransactionContext):
                 self.__savepoints.clear()
                 self.__transaction_name = None
                 self.__ambient_transaction_id.set(None)
-            if self.__transaction_depth == 0:
+                self.__transaction_depth = -2
                 return 'COMMIT'
             else:
                 return None
@@ -122,8 +126,6 @@ class SQLiteTransactionContext(DbTransactionContext):
             name = extract_rollback_name(sql)
             is_savepoint_rollback = is_rollback_to(sql)
 
-            is_full_rollback = False
-
             if name:
                 if name in self.__savepoints:
                     while self.__savepoints:
@@ -131,21 +133,20 @@ class SQLiteTransactionContext(DbTransactionContext):
                         if sp == name:
                             break
                 elif name == self.__transaction_name:
-                    is_full_rollback = True
+                    pass  # full rollback, depth reset below
                 else:
                     raise DbError('Invalid Transaction Name')
             else:
-                is_full_rollback = True
+                pass  # full rollback, depth reset below
 
-            if is_full_rollback:
-                self.__transaction_depth = 0
+            if is_savepoint_rollback:
+                return 'ROLLBACK TO SAVEPOINT ' + (name or '')
+            else:
+                self.__transaction_depth = -3
                 self.__savepoints.clear()
                 self.__transaction_name = None
                 self.__ambient_transaction_id.set(None)
-
-            if is_savepoint_rollback:
-                return 'ROLLBACK TO SAVEPOINT ' + (name or '')
-            return 'ROLLBACK TRANSACTION'
+                return 'ROLLBACK TRANSACTION'
 
         return sql
 
@@ -239,8 +240,8 @@ class SQLiteTransactionContext(DbTransactionContext):
         except sqlite3.ProgrammingError:
             return cursor.rowcount
 
-    def execute_script(self, sql: str, raw: str | None = None) -> None:
-        if raw is not None:
+    def execute_script(self, sql: str, raw: bool = False) -> None:
+        if raw is True:
             self.execute(sql, raw=True)
             return
         lines = sql.split('\n')

{deev-2.0.1 → deev-2.0.2}/src/deev/utils.py

@@ -235,7 +235,7 @@ def resolve_mongodb_auth_source(connectionstring: ConnectionString) -> str:
     import pymongo
     from pymongo import errors as _pymongo_errors
 
-    cache_key = f"{connectionstring.server}:{connectionstring.database}:{connectionstring.user}"
+    cache_key = f'{connectionstring.server}:{connectionstring.database}:{connectionstring.user}'
     cached = _MONGODB_AUTH_SOURCE_CACHE.get(cache_key)
     if cached is not None:
         return cached

{deev-2.0.1 → deev-2.0.2/src/deev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deev
-Version: 2.0.1
+Version: 2.0.2
 Summary: ..an entity framework for Python.
 Author-email: Shaun Wilson <mrshaunwilson@msn.com>
 License-Expression: MIT