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

velocity/db/core/result.py

@@ -1,5 +1,3 @@
-import datetime
-import decimal
 from velocity.misc.format import to_json
 
 
@@ -7,14 +5,14 @@ class Result:
     """
     Wraps a database cursor to provide various convenience transformations
     (dict, list, tuple, etc.) and helps iterate over query results.
-    
+
     Features:
     - Pre-fetches first row for immediate boolean evaluation
     - Boolean state changes as rows are consumed: bool(result) tells you if MORE rows are available
     - Supports __bool__, is_empty(), has_results() for checking remaining results
     - Efficient iteration without unnecessary fetchall() calls
     - Caches next row to maintain accurate state without redundant database calls
-    
+
     Boolean Behavior:
     - Initially: bool(result) = True if query returned any rows
     - After each row: bool(result) = True if more rows are available to fetch
@@ -29,15 +27,15 @@ class Result:
             description = getattr(cursor, "description", []) or []
             self._headers = []
             for col in description:
-                if hasattr(col, '__getitem__'):  # Tuple-like (col[0])
+                if hasattr(col, "__getitem__"):  # Tuple-like (col[0])
                     self._headers.append(col[0].lower())
-                elif hasattr(col, 'name'):  # Object with name attribute
+                elif hasattr(col, "name"):  # Object with name attribute
                     self._headers.append(col.name.lower())
                 else:
-                    self._headers.append(f'column_{len(self._headers)}')
+                    self._headers.append(f"column_{len(self._headers)}")
         except (AttributeError, TypeError, IndexError):
             self._headers = []
-            
+
         self.__as_strings = False
         self.__enumerate = False
         self.__count = -1
@@ -49,7 +47,7 @@ class Result:
         self._cached_first_row = None
         self._first_row_fetched = False
         self._exhausted = False
-        
+
         # Pre-fetch the first row to enable immediate boolean evaluation
         self._fetch_first_row()
 
@@ -60,14 +58,16 @@ class Result:
         """
         if self._first_row_fetched or not self._cursor:
             return
-            
+
         # Don't try to fetch from INSERT/UPDATE/DELETE operations
         # These operations don't return rows, only rowcount
-        if self.__sql and self.__sql.strip().upper().startswith(('INSERT', 'UPDATE', 'DELETE', 'TRUNCATE')):
+        if self.__sql and self.__sql.strip().upper().startswith(
+            ("INSERT", "UPDATE", "DELETE", "TRUNCATE")
+        ):
             self._exhausted = True
             self._first_row_fetched = True
             return
-            
+
         try:
             raw_row = self._cursor.fetchone()
             if raw_row:
@@ -109,7 +109,9 @@ class Result:
         Return True if there are more rows available to fetch.
         This is based on whether we have a cached row or the cursor isn't exhausted.
         """
-        return self._cached_first_row is not None or (not self._exhausted and self._cursor)
+        return self._cached_first_row is not None or (
+            not self._exhausted and self._cursor
+        )
 
     def __next__(self):
         """
@@ -127,7 +129,7 @@ class Result:
                 if not row:
                     self._exhausted = True
                     raise StopIteration
-                # Try to pre-fetch the next row to update our state  
+                # Try to pre-fetch the next row to update our state
                 self._try_cache_next_row()
             except Exception as e:
                 # Handle cursor errors (e.g., closed cursor)
@@ -154,7 +156,7 @@ class Result:
         """
         if not self._cursor or self._cached_first_row is not None:
             return
-            
+
         try:
             next_row = self._cursor.fetchone()
             if next_row:
@@ -214,18 +216,22 @@ class Result:
         """
         if not self.__columns and self._cursor and hasattr(self._cursor, "description"):
             for column in self._cursor.description:
-                data = {
-                    "type_name": "unknown"  # Default value
-                }
-                
+                data = {"type_name": "unknown"}  # Default value
+
                 # Try to get type information (PostgreSQL specific)
                 try:
-                    if hasattr(column, 'type_code') and self.__tx and hasattr(self.__tx, 'pg_types'):
-                        data["type_name"] = self.__tx.pg_types.get(column.type_code, "unknown")
+                    if (
+                        hasattr(column, "type_code")
+                        and self.__tx
+                        and hasattr(self.__tx, "pg_types")
+                    ):
+                        data["type_name"] = self.__tx.pg_types.get(
+                            column.type_code, "unknown"
+                        )
                 except (AttributeError, KeyError):
                     # Keep default value
                     pass
-                
+
                 # Get all other column attributes safely
                 for key in dir(column):
                     if not key.startswith("__"):
@@ -234,8 +240,8 @@ class Result:
                         except (AttributeError, TypeError):
                             # Skip attributes that can't be accessed
                             continue
-                            
-                column_name = getattr(column, 'name', f'column_{len(self.__columns)}')
+
+                column_name = getattr(column, "name", f"column_{len(self.__columns)}")
                 self.__columns[column_name] = data
         return self.__columns
 
@@ -343,7 +349,9 @@ class Result:
             return row
         except StopIteration:
             return default
-
+        
+    one_or_none = one
+    
     def get_table_data(self, headers=True):
         """
         Builds a two-dimensional list: first row is column headers, subsequent rows are data.

velocity/db/core/row.py

@@ -44,7 +44,12 @@ class Row:
     def __setitem__(self, key, val):
         if key in self.pk:
             raise Exception("Cannot update a primary key.")
-        self.table.upsert({key: val}, self.pk)
+        if hasattr(self.table, "updins"):
+            self.table.updins({key: val}, pk=self.pk)
+        elif hasattr(self.table, "upsert"):
+            self.table.upsert({key: val}, pk=self.pk)
+        else:
+            self.table.update({key: val}, pk=self.pk)
 
     def __delitem__(self, key):
         if key in self.pk:
@@ -97,7 +102,9 @@ class Row:
         except Exception as e:
             # Check if the error message indicates a missing column
             error_msg = str(e).lower()
-            if 'column' in error_msg and ('does not exist' in error_msg or 'not found' in error_msg):
+            if "column" in error_msg and (
+                "does not exist" in error_msg or "not found" in error_msg
+            ):
                 return failobj
             # Re-raise other exceptions
             raise
@@ -119,7 +126,12 @@ class Row:
         if kwds:
             data.update(kwds)
         if data:
-            self.table.upsert(data, self.pk)
+            if hasattr(self.table, "updins"):
+                self.table.updins(data, pk=self.pk)
+            elif hasattr(self.table, "upsert"):
+                self.table.upsert(data, pk=self.pk)
+            else:
+                self.table.update(data, pk=self.pk)
         return self
 
     def __cmp__(self, other):