velocity-python 0.0.109__py3-none-any.whl → 0.0.161__py3-none-any.whl

velocity/db/core/decorators.py

@@ -1,14 +1,30 @@
 import time
 import random
-import traceback
 from functools import wraps
 from velocity.db import exceptions
 
 
+_PRIMARY_KEY_PATTERNS = (
+    "primary key",
+    "key 'primary'",
+    'key "primary"',
+)
+
+
+def _is_primary_key_duplicate(error):
+    """Return True when the duplicate-key error is targeting the primary key."""
+
+    message = str(error or "")
+    lowered = message.lower()
+
+    if "sys_id" in lowered:
+        return True
+
+    return any(pattern in lowered for pattern in _PRIMARY_KEY_PATTERNS)
+
+
 def retry_on_dup_key(func):
-    """
-    Retries a function call if it raises DbDuplicateKeyError, up to max_retries.
-    """
+    """Retry when insert/update fails because the primary key already exists."""
 
     @wraps(func)
     def retry_decorator(self, *args, **kwds):
@@ -20,10 +36,12 @@ def retry_on_dup_key(func):
                 result = func(self, *args, **kwds)
                 self.tx.release_savepoint(sp, cursor=self.cursor())
                 return result
-            except exceptions.DbDuplicateKeyError:
+            except exceptions.DbDuplicateKeyError as error:
                 self.tx.rollback_savepoint(sp, cursor=self.cursor())
                 if "sys_id" in kwds.get("data", {}):
                     raise
+                if not _is_primary_key_duplicate(error):
+                    raise
                 retries += 1
                 if retries >= max_retries:
                     raise
@@ -35,9 +53,7 @@ def retry_on_dup_key(func):
 
 
 def reset_id_on_dup_key(func):
-    """
-    Wraps an INSERT/UPSERT to reset the sys_id sequence on duplicate key collisions.
-    """
+    """Retry sys_id sequence bump only when the primary key collides."""
 
     @wraps(func)
     def reset_decorator(self, *args, retries=0, **kwds):
@@ -46,10 +62,12 @@ def reset_id_on_dup_key(func):
             result = func(self, *args, **kwds)
             self.tx.release_savepoint(sp, cursor=self.cursor())
             return result
-        except exceptions.DbDuplicateKeyError:
+        except exceptions.DbDuplicateKeyError as error:
             self.tx.rollback_savepoint(sp, cursor=self.cursor())
             if "sys_id" in kwds.get("data", {}):
                 raise
+            if not _is_primary_key_duplicate(error):
+                raise
             if retries < 3:
                 backoff_time = (2**retries) * 0.01 + random.uniform(0, 0.02)
                 time.sleep(backoff_time)
@@ -100,7 +118,8 @@ def return_default(
 
 def create_missing(func):
     """
-    If the function call fails with DbColumnMissingError or DbTableMissingError, tries to create them and re-run.
+    If the function call fails with DbColumnMissingError or DbTableMissingError, 
+    tries to create them and re-run (only if schema is not locked).
     """
 
     @wraps(func)
@@ -110,8 +129,16 @@ def create_missing(func):
             result = func(self, *args, **kwds)
             self.tx.release_savepoint(sp, cursor=self.cursor())
             return result
-        except exceptions.DbColumnMissingError:
+        except exceptions.DbColumnMissingError as e:
             self.tx.rollback_savepoint(sp, cursor=self.cursor())
+            
+            # Check if schema is locked
+            if self.tx.engine.schema_locked:
+                raise exceptions.DbSchemaLockedError(
+                    f"Cannot create missing column: schema is locked. Original error: {e}"
+                ) from e
+                
+            # Existing logic for automatic creation
             data = {}
             if "pk" in kwds:
                 data.update(kwds["pk"])
@@ -120,10 +147,18 @@ def create_missing(func):
             for i, arg in enumerate(args):
                 if isinstance(arg, dict):
                     data.update(arg)
-            self.alter(data)
+            self.alter(data, mode="add")
             return func(self, *args, **kwds)
-        except exceptions.DbTableMissingError:
+        except exceptions.DbTableMissingError as e:
             self.tx.rollback_savepoint(sp, cursor=self.cursor())
+            
+            # Check if schema is locked
+            if self.tx.engine.schema_locked:
+                raise exceptions.DbSchemaLockedError(
+                    f"Cannot create missing table: schema is locked. Original error: {e}"
+                ) from e
+                
+            # Existing logic for automatic creation
             data = {}
             if "pk" in kwds:
                 data.update(kwds["pk"])