velocity-python 0.0.27__tar.gz → 0.0.29__tar.gz

{velocity-python-0.0.27 → velocity-python-0.0.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velocity-python
-Version: 0.0.27
+Version: 0.0.29
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Paul Perez <pperez@codeclubs.org>
 Project-URL: Homepage, https://codeclubs.org/projects/velocity

{velocity-python-0.0.27 → velocity-python-0.0.29}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "velocity-python"
-version = "0.0.27"
+version = "0.0.29"
 authors = [
   { name="Paul Perez", email="pperez@codeclubs.org" },
 ]

{velocity-python-0.0.27 → velocity-python-0.0.29}/src/velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.27"
+__version__ = version = "0.0.29"
 
 from . import aws
 from . import db

velocity-python-0.0.29/src/velocity/db/core/decorators.py

@@ -0,0 +1,100 @@
+from functools import wraps
+from velocity.db import exceptions
+
+
+def retry_on_dup_key(function):
+    # retry_on_dup_key is needed to skip past existing autogenerated ids when inserting
+    @wraps(function)
+    def retry_decorator(self, *args, **kwds):
+        sp = self.tx.create_savepoint(cursor=self.cursor)
+        while True:
+            try:
+                return function(self, *args, **kwds)
+            except exceptions.DbDuplicateKeyError:
+                self.tx.rollback_savepoint(sp, cursor=self.cursor)
+                continue
+
+    return retry_decorator
+
+
+def reset_id_on_dup_key(function):
+    # reset_id_on_dup_key sets sys_id to max(sys_id) + 1 when inserting
+    @wraps(function)
+    def reset_decorator(self, *args, **kwds):
+        sp = self.tx.create_savepoint(cursor=self.cursor)
+        try:
+            return function(self, *args, **kwds)
+        except exceptions.DbDuplicateKeyError:
+            self.tx.rollback_savepoint(sp, cursor=self.cursor)
+            self.set_sequence(self.max("sys_id") + 1)
+            return function(self, *args, **kwds)
+
+    return reset_decorator
+
+
+def return_default(
+    default=None,
+    exceptions=(
+        StopIteration,
+        exceptions.DbApplicationError,
+        exceptions.DbTableMissingError,
+        exceptions.DbColumnMissingError,
+        exceptions.DbTruncationError,
+        exceptions.DbObjectExistsError,
+    ),
+):
+    def decorator(f):
+        f.default = default
+        f.exceptions = exceptions
+
+        @wraps(f)
+        def return_default(self, *args, **kwds):
+            sp = self.tx.create_savepoint(cursor=self.cursor)
+            try:
+                result = f(self, *args, **kwds)
+                if result is None:
+                    result = default
+            except f.exceptions as e:
+                self.tx.rollback_savepoint(sp, cursor=self.cursor)
+                return f.default
+            self.tx.release_savepoint(sp, cursor=self.cursor)
+            return result
+
+        return return_default
+
+    return decorator
+
+
+def create_missing(function):
+    @wraps(function)
+    def create_missing_decorator(self, *args, **kwds):
+        sp = self.tx.create_savepoint(cursor=self.cursor)
+        try:
+            result = function(self, *args, **kwds)
+            self.tx.release_savepoint(sp, cursor=self.cursor)
+        except exceptions.DbColumnMissingError:
+            self.tx.rollback_savepoint(sp, cursor=self.cursor)
+            data = {}
+            if "pk" in kwds:
+                data.update(kwds["pk"])
+            if "data" in kwds:
+                data.update(kwds["data"])
+            for i in range(len(args)):
+                if args[i]:
+                    data.update(args[i])
+            self.alter(data)
+            result = function(self, *args, **kwds)
+        except exceptions.DbTableMissingError:
+            self.tx.rollback_savepoint(sp, cursor=self.cursor)
+            data = {}
+            if "pk" in kwds:
+                data.update(kwds["pk"])
+            if "data" in kwds:
+                data.update(kwds["data"])
+            for i in range(len(args)):
+                data.update(args[i])
+            self.create(data)
+            result = function(self, *args, **kwds)
+        return result
+
+    return create_missing_decorator

{velocity-python-0.0.27 → velocity-python-0.0.29}/src/velocity/db/core/row.py

@@ -1,10 +1,10 @@
 import pprint
 
+
 class Row(object):
     def __init__(self, table, key, lock=None):
         if isinstance(table, str):
-            raise Exception(
-                "table parameter of row class must `table` instance")
+            raise Exception("table parameter of row class must `table` instance")
         self.table = table
         if isinstance(key, (dict, Row)):
             pk = {}
@@ -37,7 +37,7 @@ class Row(object):
     def __setitem__(self, key, val):
         if key in self.pk:
             raise Exception("Can't update a primary key, idiot!")
-        self.table.merge({key: val}, self.pk)
+        self.table.upsert({key: val}, self.pk)
 
     def __delitem__(self, key):
         if key in self.pk:
@@ -90,7 +90,7 @@ class Row(object):
         if kwds:
             data.update(kwds)
         if data:
-            self.table.update(data, self.pk)
+            self.table.upsert(data, self.pk)
         return self
 
     def iterkeys(self):
@@ -105,7 +105,7 @@ class Row(object):
     def __cmp__(self, other):
         # zero == same (not less than or greater than other)
         diff = -1
-        if hasattr(other, 'keys'):
+        if hasattr(other, "keys"):
             k1 = list(self.keys())
             k2 = list(other.keys())
             if k1 == k2:
@@ -122,23 +122,34 @@ class Row(object):
     def copy(self, lock=None):
         old = self.to_dict()
         for key in list(old.keys()):
-            if 'sys_' in key:
+            if "sys_" in key:
                 old.pop(key)
         return self.table.new(old, lock=lock)
 
     # ================================================================
     # This stuff is not implemented
 
-    def pop(self): raise NotImplementedError
-    def popitem(self): raise NotImplementedError
+    def pop(self):
+        raise NotImplementedError
+
+    def popitem(self):
+        raise NotImplementedError
+
+    def __lt__(self, other):
+        raise NotImplementedError
 
-    def __lt__(self, other): raise NotImplementedError
-    def __gt__(self, other): raise NotImplementedError
-    def __le__(self, other): raise NotImplementedError
-    def __ge__(self, other): raise NotImplementedError
+    def __gt__(self, other):
+        raise NotImplementedError
+
+    def __le__(self, other):
+        raise NotImplementedError
+
+    def __ge__(self, other):
+        raise NotImplementedError
 
     @classmethod
-    def fromkeys(cls, iterable, value=None): raise NotImplementedError
+    def fromkeys(cls, iterable, value=None):
+        raise NotImplementedError
 
     def to_dict(self):
         return self.table.select(where=self.pk).as_dict().one()
@@ -154,14 +165,14 @@ class Row(object):
 
     @property
     def key_cols(self):
-        #result = self.execute(*self.sql.primary_keys(self.tablename))
+        # result = self.execute(*self.sql.primary_keys(self.tablename))
         # return [x[0] for x in result.as_tuple()]
-        return ['sys_id']
+        return ["sys_id"]
 
     def split(self):
         old = self.to_dict()
         for key in list(old.keys()):
-            if 'sys_' in key:
+            if "sys_" in key:
                 old.pop(key)
         return old, self.pk
 
@@ -177,8 +188,9 @@ class Row(object):
         fk = self.table.foreign_key_info(key)
         if not fk:
             raise Exception(
-                "Column `{}` is not a foreign key in `{}`".format(key, self.table.name))
-        return tx.row(fk['referenced_table_name'], value, lock=lock)
+                "Column `{}` is not a foreign key in `{}`".format(key, self.table.name)
+            )
+        return tx.Row(fk["referenced_table_name"], value, lock=lock)
 
     def match(self, other):
         for key in other:
@@ -187,7 +199,7 @@ class Row(object):
         return True
 
     def touch(self):
-        self['sys_modified'] = '@@CURRENT_TIMESTAMP'
+        self["sys_modified"] = "@@CURRENT_TIMESTAMP"
         return self
 
     delete = clear
@@ -196,14 +208,14 @@ class Row(object):
         self.table.select(where=self.pk, lock=True)
         return self
 
-
     def notBlank(self, key, failobj=None):
         data = self[key]
         if not data:
             return failobj
         return data
+
     getBlank = notBlank
 
     @property
     def sys_id(self):
-        return self.pk['sys_id']
+        return self.pk["sys_id"]