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

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

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

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

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

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

{velocity_python-0.0.68 → velocity_python-0.0.69}/src/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_python-0.0.68 → velocity_python-0.0.69}/src/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":

{velocity_python-0.0.68 → velocity_python-0.0.69}/src/velocity_python.egg-info/PKG-INFO

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