velocity-python 0.0.64__tar.gz → 0.0.66__tar.gz

{velocity_python-0.0.64 → velocity_python-0.0.66}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.64
+Version: 0.0.66
 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
@@ -20,6 +20,7 @@ Provides-Extra: sqlserver
 Requires-Dist: python-tds; extra == "sqlserver"
 Provides-Extra: postgres
 Requires-Dist: psycopg2-binary; extra == "postgres"
+Dynamic: license-file
 
 # Velocity.DB
 

{velocity_python-0.0.64 → velocity_python-0.0.66}/pyproject.toml

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

{velocity_python-0.0.64 → velocity_python-0.0.66}/src/velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.64"
+__version__ = version = "0.0.66"
 
 from . import aws
 from . import db

{velocity_python-0.0.64 → velocity_python-0.0.66}/src/velocity/db/core/engine.py

@@ -57,6 +57,8 @@ class Engine:
         May also be used to decorate a class, in which case all methods are wrapped in a transaction if they accept `tx`.
         With no arguments, returns a new Transaction directly.
         """
+        # print("Transaction", func_or_cls.__name__, type(func_or_cls))
+
         if func_or_cls is None:
             return Transaction(self)
 
@@ -64,15 +66,21 @@ class Engine:
             return classmethod(self.transaction(func_or_cls.__func__))
 
         if inspect.isfunction(func_or_cls) or inspect.ismethod(func_or_cls):
+            names = list(inspect.signature(func_or_cls).parameters.keys())
+            # print(func_or_cls.__name__, names)
+            if "_tx" in names:
+                raise NameError(
+                    f"In function {func_or_cls.__name__}, '_tx' is not allowed as a parameter."
+                )
 
             @wraps(func_or_cls)
             def new_function(*args, **kwds):
                 tx = None
                 names = list(inspect.signature(func_or_cls).parameters.keys())
-                if "_tx" in names:
-                    raise NameError(
-                        f"In function {func_or_cls.__name__}, '_tx' is not allowed as a parameter."
-                    )
+
+                # print("inside", func_or_cls.__name__)
+                # print(names)
+                # print(args, kwds)
 
                 if "tx" not in names:
                     # The function doesn't even declare a `tx` parameter, so run normally.
@@ -91,33 +99,31 @@ class Engine:
                     if len(args) > pos:
                         if isinstance(args[pos], Transaction):
                             tx = args[pos]
-                        else:
-                            raise TypeError(
-                                f"In function {func_or_cls.__name__}, positional argument `tx` must be a Transaction object."
-                            )
+
                 if tx:
                     return self.exec_function(func_or_cls, tx, *args, **kwds)
+
                 with Transaction(self) as local_tx:
                     pos = names.index("tx")
-                    args = list(args)
-                    args.insert(pos, local_tx)
-                    args = tuple(args)
-                    return self.exec_function(func_or_cls, local_tx, *args, **kwds)
+                    new_args = args[:pos] + (local_tx,) + args[pos:]
+                    return self.exec_function(func_or_cls, local_tx, *new_args, **kwds)
 
             return new_function
 
         if inspect.isclass(func_or_cls):
 
-            class NewCls(func_or_cls):
-                pass
+            NewCls = type(func_or_cls.__name__, (func_or_cls,), {})
+
+            for attr_name in dir(func_or_cls):
+                # Optionally skip special methods
+                if attr_name.startswith("__") and attr_name.endswith("__"):
+                    continue
+
+                attr = getattr(func_or_cls, attr_name)
+
+                if callable(attr):
+                    setattr(NewCls, attr_name, self.transaction(attr))
 
-            for attr_name, attr_value in func_or_cls.__dict__.items():
-                if (
-                    isinstance(attr_value, classmethod)
-                    or inspect.isfunction(attr_value)
-                    or inspect.ismethod(attr_value)
-                ):
-                    setattr(NewCls, attr_name, self.transaction(attr_value))
             return NewCls
 
         return Transaction(self)

{velocity_python-0.0.64 → velocity_python-0.0.66}/src/velocity/db/servers/tablehelper.py

@@ -144,6 +144,11 @@ class TableHelper:
         Extracts the 'bare' column name from an expression, ignoring function calls, operators, etc.
         """
         expr = sql_expression.replace('"', "")
+
+        # Remove any alias part (e.g., "as num_donors").
+        # This regex removes any trailing alias defined using "as".
+        expr = re.sub(r"(?i)\s+as\s+\w+$", "", expr).strip()
+
         expr = self.remove_operator(expr)
         if not self.are_parentheses_balanced(expr):
             raise ValueError(f"Unbalanced parentheses in expression: {expr}")

{velocity_python-0.0.64 → velocity_python-0.0.66}/src/velocity_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.64
+Version: 0.0.66
 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
@@ -20,6 +20,7 @@ Provides-Extra: sqlserver
 Requires-Dist: python-tds; extra == "sqlserver"
 Provides-Extra: postgres
 Requires-Dist: psycopg2-binary; extra == "postgres"
+Dynamic: license-file
 
 # Velocity.DB