velocity-python 0.0.67__py3-none-any.whl → 0.0.69__py3-none-any.whl

velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.67"
+__version__ = version = "0.0.69"
 
 from . import aws
 from . import db

velocity/db/servers/postgres/sql.py

@@ -110,16 +110,13 @@ class SQL:
             "distinct" in c.lower() for c in columns
         ):  # Check if "distinct" exists in any entry
             distinct = True
-            columns = [
-                c.replace("distinct", "", 1).strip() if "distinct" in c.lower() else c
-                for c in columns
-            ]
+            columns = [re.sub(r"(?i)\bdistinct\b", "", c).strip() for c in columns]
 
         processed_columns = []
         for col in columns:
             processed_columns.append(
                 th.resolve_references(
-                    col, options={"alias_column": True, "alias_table": True}
+                    col, options={"alias_column": True, "alias_table": True, bypass_on_error=True}
                 )
             )
 

velocity/db/servers/tablehelper.py

@@ -90,14 +90,18 @@ class TableHelper:
         Resolves pointer syntax or table alias references.
         `options` can control whether to alias columns and/or tables.
         """
+        if not key:
+            raise Exception(f"Invalid key={key}")
         if options is None:
             options = {"alias_column": True, "alias_table": False, "alias_only": False}
-
         column = self.extract_column_name(key)
-        alias = self.get_table_alias("current_table")
-        if not key or not column:
-            raise Exception(f"Invalid key or column: key={key}, column={column}")
 
+        if not column:
+            if options.get("bypass_on_error"):
+                return key
+            raise Exception(f"Invalid column={column}")
+
+        alias = self.get_table_alias("current_table")
         if not self.has_pointer(column):
             # Standard column
             if options.get("alias_table") and alias != "A":
@@ -143,47 +147,56 @@ class TableHelper:
         """
         Extracts the 'bare' column name from a SQL expression.
 
-        This version intelligently detects window functions like ROW_NUMBER() OVER(ORDER BY x)
-        and returns the actual column used inside ORDER BY.
+        Supports:
+        - Aliases (AS ...)
+        - Window functions (OVER(... ORDER BY ...))
+        - CAST(... AS ...)
+        - CASE WHEN ... THEN ... ELSE ... END
+        - Nested function calls
+        - Grabs column from inside expressions (e.g. PLAID_ERROR from SUM(CASE...))
 
         Args:
-            sql_expression (str): Complex SQL expression (may include OVER, CAST, CASE, etc.)
+            sql_expression (str): SQL expression (SELECT column) string.
 
         Returns:
-            str or None: Inferred base column name, like "amount", "a.email", or "*"
+            str or None: Extracted column name or None if undetectable.
         """
-        import re
-
         expr = sql_expression.replace('"', "").strip()
 
-        # Step 1: Remove alias
+        # Remove trailing alias
         expr = re.sub(r"(?i)\s+as\s+\w+$", "", expr).strip()
 
-        # Step 2: Pull column from ORDER BY inside OVER()
-        over_match = re.search(r"(?i)OVER\s*\(\s*ORDER\s+BY\s+([^)\s]+)", expr)
+        # If OVER clause: extract column inside ORDER BY
+        over_match = re.search(r"(?i)OVER\s*\(\s*ORDER\s+BY\s+([^\s,)]+)", expr)
         if over_match:
-            column = over_match.group(1).strip(",")
-            return column
-
-        # Step 3: Strip CAST(x AS type)
-        expr = re.sub(r"(?i)CAST\s*\((.*?)\s+AS\s+[^\)]+\)", r"\1", expr)
-
-        # Step 4: Strip CASE WHEN ... THEN ... ELSE ... END
-        expr = re.sub(
-            r"(?i)CASE\s+WHEN\s+(.*?)\s+THEN\s+.*?\s+(ELSE\s+.*?)?END", r"\1", expr
-        )
+            return over_match.group(1)
+
+        # Remove CAST(... AS ...)
+        while re.search(r"(?i)CAST\s*\(([^()]+?)\s+AS\s+[^\)]+\)", expr):
+            expr = re.sub(r"(?i)CAST\s*\(([^()]+?)\s+AS\s+[^\)]+\)", r"\1", expr)
+
+        # Remove CASE WHEN ... THEN ... ELSE ... END, keep just the WHEN part
+        while re.search(
+            r"(?i)CASE\s+WHEN\s+(.+?)\s+THEN\s+.+?(?:\s+ELSE\s+.+?)?\s+END", expr
+        ):
+            expr = re.sub(
+                r"(?i)CASE\s+WHEN\s+(.+?)\s+THEN\s+.+?(?:\s+ELSE\s+.+?)?\s+END",
+                r"\1",
+                expr,
+            )
 
-        # Step 5: Remove nested function calls
-        while re.search(r"\b\w+\s*\([^()]*\)", expr):
-            expr = re.sub(r"\b\w+\s*\(([^()]*)\)", r"\1", expr)
+        # Unwrap function calls (SUM(...), MAX(...), etc.)
+        while re.search(r"\b\w+\s*\(([^()]+)\)", expr):
+            expr = re.sub(r"\b\w+\s*\(([^()]+)\)", r"\1", expr)
 
-        # Step 6: Keep only first expression if comma-separated
+        # If multiple columns, take the first
         if "," in expr:
             expr = expr.split(",")[0].strip()
 
-        # Step 7: Match column-like patterns
-        pattern = r"^([a-zA-Z_][\w]*\.\*|\*|[a-zA-Z_][\w]*(?:\.[a-zA-Z_][\w]*)?)$"
-        match = re.search(pattern, expr)
+        # Extract column name (basic or dotted like table.col or *)
+        match = re.search(
+            r"\b([a-zA-Z_][\w]*\.\*|\*|[a-zA-Z_][\w]*(?:\.[a-zA-Z_][\w]*)?)\b", expr
+        )
         return match.group(1) if match else None
 
     def are_parentheses_balanced(self, expression):

{velocity_python-0.0.67.dist-info → velocity_python-0.0.69.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.67
+Version: 0.0.69
 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.67.dist-info → velocity_python-0.0.69.dist-info}/RECORD

@@ -1,4 +1,4 @@
-velocity/__init__.py,sha256=sWlnhF2G6SCos7NBlC2zOtN-FNPGuLbB3yeepfiHMtY,88
+velocity/__init__.py,sha256=QBkdg_Y9sxtwoFe1Uoi69oz-y-W1UOps4xGyhXTemlA,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
@@ -24,11 +24,11 @@ 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=-sb9RAj8OUZTuoNQehc1ALxowk11gb3IUCxdaT6Aua4,10735
+velocity/db/servers/tablehelper.py,sha256=t_4Z0j3NT26dCe88ydAskipMoaQyrhgyrs_3hmQ6tDU,11161
 velocity/db/servers/postgres/__init__.py,sha256=SRqTRrhHkueEzGScG82KVveXC9mfNm6t4XylSCObkXQ,546
 velocity/db/servers/postgres/operators.py,sha256=A2T1qFwhzPl0fdXVhLZJhh5Qfx-qF8oZsDnxnq2n_V8,389
 velocity/db/servers/postgres/reserved.py,sha256=5tKLaqFV-HrWRj-nsrxl5KGbmeM3ukn_bPZK36XEu8M,3648
-velocity/db/servers/postgres/sql.py,sha256=mGPUrg0M5NGNkCHbMKdL0F01CEfCr883lJlB-qAG6bM,38147
+velocity/db/servers/postgres/sql.py,sha256=XdWT0xAwS3_MOroVAmmpasJQ16NaPCTidMZJOZs_odI,38095
 velocity/db/servers/postgres/types.py,sha256=Wa45ppVf_pdWul-jYWFRGMl6IdSq8dAp10SKnhL7osQ,3757
 velocity/misc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velocity/misc/db.py,sha256=MPgt-kkukKR_Wh_S_5W-MyDgaeoZ4YLoDJ54wU2ppm4,2830
@@ -41,8 +41,8 @@ velocity/misc/tools.py,sha256=_bGneHHA_BV-kUonzw5H3hdJ5AOJRCKfzhgpkFbGqIo,1502
 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.67.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
-velocity_python-0.0.67.dist-info/METADATA,sha256=7BQY5psmqQwrVwTGLl3pI2D_mPmcsqZFT9yd-zvpV5k,8541
-velocity_python-0.0.67.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-velocity_python-0.0.67.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
-velocity_python-0.0.67.dist-info/RECORD,,
+velocity_python-0.0.69.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
+velocity_python-0.0.69.dist-info/METADATA,sha256=-4YMKA00hQC2LXoDX2--HsUA-CWaksoBYl6RFZvoMtk,8541
+velocity_python-0.0.69.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+velocity_python-0.0.69.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
+velocity_python-0.0.69.dist-info/RECORD,,

{velocity_python-0.0.67.dist-info → velocity_python-0.0.69.dist-info}/WHEEL

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