velocity-python 0.0.67__tar.gz → 0.0.68__tar.gz

{velocity_python-0.0.67 → velocity_python-0.0.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.67
+Version: 0.0.68
 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 → velocity_python-0.0.68}/pyproject.toml

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

{velocity_python-0.0.67 → velocity_python-0.0.68}/src/velocity/__init__.py

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

{velocity_python-0.0.67 → velocity_python-0.0.68}/src/velocity/db/servers/tablehelper.py

@@ -143,47 +143,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 → velocity_python-0.0.68}/src/velocity_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.67
+Version: 0.0.68
 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