velocity-python 0.0.64__py3-none-any.whl → 0.0.66__py3-none-any.whl

velocity/__init__.py

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

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/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.dist-info → velocity_python-0.0.66.dist-info}/METADATA

@@ -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.dist-info → velocity_python-0.0.66.dist-info}/RECORD

@@ -1,4 +1,4 @@
-velocity/__init__.py,sha256=BV64vuHaj6lbPZ96w6YkJ_mgqq506ohvETaJVjBy-_s,88
+velocity/__init__.py,sha256=xyG5aYyKP5U2cxz1pPLUsDp9NpDJb92wzwYIorLV0Ro,88
 velocity/aws/__init__.py,sha256=GBTEr02whnCH3TG-BWCpUC3KfHY3uNxD21g0OvsVJnc,598
 velocity/aws/handlers/__init__.py,sha256=xnpFZJVlC2uoeeFW4zuPST8wA8ajaQDky5Y6iXZzi3A,172
 velocity/aws/handlers/context.py,sha256=UIjNR83y2NSIyK8HMPX8t5tpJHFNabiZvNgmmdQL3HA,1822
@@ -10,7 +10,7 @@ velocity/db/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 velocity/db/core/column.py,sha256=tAr8tL3a2nyaYpNHhGl508FrY_pGZTzyYgjAV5CEBv4,4092
 velocity/db/core/database.py,sha256=3zNGItklu9tZCKsbx2T2vCcU1so8AL9PPL0DLjvaz6s,3554
 velocity/db/core/decorators.py,sha256=ZwwNc6wGx7Qe7xPZGgeHuqqtXEeNqyDXB0M5ROY-40I,4612
-velocity/db/core/engine.py,sha256=Ykw_G78UeS59JZLRHqOrprfOv-uxm7HshA6V0cST6QE,13074
+velocity/db/core/engine.py,sha256=NVsS9HPu13Lzuz7UHjUdsCRuBe2cYVKwgAVf9SLc1E0,13123
 velocity/db/core/exceptions.py,sha256=MOWyA1mlMe8eWbFkEHK0Lp9czdplpRyqbAn2JfGmMrM,707
 velocity/db/core/result.py,sha256=OVqoMwlx3CHNNwr-JGWRx5I8u_YX6hlUpecx99UT5nE,6164
 velocity/db/core/row.py,sha256=aliLYTTFirgJsOvmUsANwJMyxaATuhpGpFJhcu_twwY,6709
@@ -24,7 +24,7 @@ velocity/db/servers/sqlite.py,sha256=X210a5pENT9PiVK7f16fxXzFwEsq8fSe58Vouv2xqlk
 velocity/db/servers/sqlite_reserved.py,sha256=-xmjl-Hgu6lKqkCAXq_6U8_aJX6gvaMgLMLdCt-Ej7o,3006
 velocity/db/servers/sqlserver.py,sha256=0uGLEWRXiUhrOVTpEA1zvaKq1mcfiaCDp9r7gX-N71g,29914
 velocity/db/servers/sqlserver_reserved.py,sha256=3LGQYU0qfvk6AbKety96gbzzfLbZ0dNHDPLxKGvvi4Q,4596
-velocity/db/servers/tablehelper.py,sha256=0QsQc73q2En3p0778DKAEiEo3ZtZowgFpAKZXwORjfw,9816
+velocity/db/servers/tablehelper.py,sha256=8oAbscs3TqCk-kc-RYzWRotYVmh0OG4l1E6RzQVNGU0,10004
 velocity/db/servers/postgres/__init__.py,sha256=n6Ti5USqXME8Df18iklC-D0eI1Hr0szZAeSS3xz5ycQ,464
 velocity/db/servers/postgres/operators.py,sha256=A2T1qFwhzPl0fdXVhLZJhh5Qfx-qF8oZsDnxnq2n_V8,389
 velocity/db/servers/postgres/reserved.py,sha256=5tKLaqFV-HrWRj-nsrxl5KGbmeM3ukn_bPZK36XEu8M,3648
@@ -40,8 +40,8 @@ velocity/misc/timer.py,sha256=cN3aS0t6HLlhYfF2Ir6ihJehxNrWf9ebaLzXUaWRKEA,1637
 velocity/misc/conv/__init__.py,sha256=MLYF58QHjzfDSxb1rdnmLnuEQCa3gnhzzZ30CwZVvQo,40
 velocity/misc/conv/iconv.py,sha256=d4_BucW8HTIkGNurJ7GWrtuptqUf-9t79ObzjJ5N76U,10603
 velocity/misc/conv/oconv.py,sha256=h5Lo05DqOQnxoD3y6Px_MQP_V-pBbWf8Hkgkb9Xp1jk,6032
-velocity_python-0.0.64.dist-info/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
-velocity_python-0.0.64.dist-info/METADATA,sha256=vAWChPbSU4kqhj3uwJP8mdpgT2SvwyHY84Dv_l8FQ6E,8519
-velocity_python-0.0.64.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-velocity_python-0.0.64.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
-velocity_python-0.0.64.dist-info/RECORD,,
+velocity_python-0.0.66.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
+velocity_python-0.0.66.dist-info/METADATA,sha256=JIZQIeJNIqNiJDj4WtkAhNGTIJzrg_9XrMYZ2FbuHFo,8541
+velocity_python-0.0.66.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+velocity_python-0.0.66.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
+velocity_python-0.0.66.dist-info/RECORD,,

{velocity_python-0.0.64.dist-info → velocity_python-0.0.66.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (77.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any