velocity-python 0.0.142__tar.gz → 0.0.144__tar.gz

{velocity_python-0.0.142 → velocity_python-0.0.144}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.142
+Version: 0.0.144
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.0.142 → velocity_python-0.0.144}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "velocity-python"
-version = "0.0.142"
+version = "0.0.144"
 authors = [
   { name="Velocity Team", email="info@codeclubs.org" },
 ]

{velocity_python-0.0.142 → velocity_python-0.0.144}/src/velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.142"
+__version__ = version = "0.0.144"
 
 from . import aws
 from . import db

{velocity_python-0.0.142 → velocity_python-0.0.144}/src/velocity/db/servers/postgres/sql.py

@@ -18,39 +18,6 @@ TableHelper.reserved = reserved_words
 TableHelper.operators = OPERATORS
 
 
-def _get_table_helper(tx, table):
-    """
-    Utility function to create a TableHelper instance.
-    Ensures consistent configuration across all SQL methods.
-    """
-    return TableHelper(tx, table)
-
-
-def _validate_table_name(table):
-    """Validate table name format."""
-    if not table or not isinstance(table, str):
-        raise ValueError("Table name must be a non-empty string")
-    # Add more validation as needed
-    return table.strip()
-
-
-def _handle_predicate_errors(predicates, operation="WHERE"):
-    """Process a list of predicates with error handling."""
-    sql_parts = []
-    vals = []
-
-    for pred, val in predicates:
-        sql_parts.append(pred)
-        if val is None:
-            pass
-        elif isinstance(val, tuple):
-            vals.extend(val)
-        else:
-            vals.append(val)
-
-    return sql_parts, vals
-
-
 system_fields = [
     "sys_id",
     "sys_created",
@@ -143,7 +110,7 @@ class SQL(BaseSQLDialect):
         vals = []
 
         # Create table helper instance
-        th = _get_table_helper(tx, table)
+        th = TableHelper(tx, table)
 
         # Handle columns and DISTINCT before aliasing
         if columns is None:
@@ -447,7 +414,7 @@ class SQL(BaseSQLDialect):
         if not isinstance(data, Mapping) or not data:
             raise ValueError("data must be a non-empty mapping of column-value pairs.")
 
-        th = _get_table_helper(tx, table)
+        th = TableHelper(tx, table)
         set_clauses = []
         vals = []
 
@@ -794,21 +761,36 @@ class SQL(BaseSQLDialect):
         return sql, tuple()
 
     @classmethod
-    def ensure_sys_modified_count(cls, name):
+    def ensure_sys_modified_count(cls, name, has_column=False):
         """Return SQL to backfill sys_modified_count and refresh the on_sys_modified trigger."""
         if "." in name:
-            fqtn = TableHelper.quote(name)
+            schema_name, table_name = name.split(".", 1)
         else:
-            fqtn = f"public.{TableHelper.quote(name)}"
-        schema, _ = fqtn.split(".")
-        trigger_name = f"on_update_row_{fqtn.replace('.', '_')}"
+            schema_name = cls.default_schema
+            table_name = name
+
+        schema_identifier = TableHelper.quote(schema_name)
+        table_identifier = TableHelper.quote(table_name)
+        fqtn = f"{schema_identifier}.{table_identifier}"
+
+        trigger_name = (
+            f"on_update_row_{schema_name}_{table_name}"
+            .replace(".", "_")
+            .replace('"', "")
+        )
+        trigger_identifier = TableHelper.quote(trigger_name)
         column_name = TableHelper.quote("sys_modified_count")
         
-        sql = [
-            f"ALTER TABLE {fqtn} ADD COLUMN {column_name} INTEGER NOT NULL DEFAULT 0;",
+        statements = []
+        if not has_column:
+            statements.append(
+                f"ALTER TABLE {fqtn} ADD COLUMN {column_name} INTEGER NOT NULL DEFAULT 0;"
+            )
+
+        statements.extend([
             f"UPDATE {fqtn} SET {column_name} = 0 WHERE {column_name} IS NULL;",
             f"""
-            CREATE OR REPLACE FUNCTION {schema}.on_sys_modified()
+            CREATE OR REPLACE FUNCTION {schema_identifier}.on_sys_modified()
               RETURNS TRIGGER AS
             $BODY$
             BEGIN
@@ -837,15 +819,17 @@ class SQL(BaseSQLDialect):
               LANGUAGE plpgsql VOLATILE
               COST 100;
         """,
-            f"DROP TRIGGER IF EXISTS {trigger_name} ON {fqtn};",
+            f"DROP TRIGGER IF EXISTS {trigger_identifier} ON {fqtn};",
             f"""
-            CREATE TRIGGER {trigger_name}
+            CREATE TRIGGER {trigger_identifier}
             BEFORE INSERT OR UPDATE ON {fqtn}
-            FOR EACH ROW EXECUTE PROCEDURE {schema}.on_sys_modified();
+            FOR EACH ROW EXECUTE PROCEDURE {schema_identifier}.on_sys_modified();
         """,
-            ]
+        ])
 
-        sql = sqlparse.format(" ".join(sql), reindent=True, keyword_case="upper")
+        sql = sqlparse.format(
+            " ".join(statements), reindent=True, keyword_case="upper"
+        )
         return sql, tuple()
 
     @classmethod

{velocity_python-0.0.142 → velocity_python-0.0.144}/src/velocity/db/servers/sqlserver/sql.py

@@ -485,7 +485,7 @@ END;
         return "\n".join(statements), tuple()
 
     @classmethod
-    def ensure_sys_modified_count(cls, name):
+    def ensure_sys_modified_count(cls, name, has_column=False):
         """Ensure sys_modified_count exists for SQL Server tables along with maintenance triggers."""
         if "." in name:
             schema, table_name = name.split(".", 1)
@@ -499,8 +499,13 @@ END;
         table_name_sql = table_name.replace("'", "''")
         trigger_prefix = re.sub(r"[^0-9A-Za-z_]+", "_", f"CC_SYS_MOD_{table_name}")
 
-        statements = [
-            f"IF COL_LENGTH(N'{object_name}', 'sys_modified_count') IS NULL BEGIN ALTER TABLE {table_identifier} ADD sys_modified_count INT NOT NULL CONSTRAINT DF_{trigger_prefix}_COUNT DEFAULT (0); END;",
+        statements = []
+        if not has_column:
+            statements.append(
+                f"IF COL_LENGTH(N'{object_name}', 'sys_modified_count') IS NULL BEGIN ALTER TABLE {table_identifier} ADD sys_modified_count INT NOT NULL CONSTRAINT DF_{trigger_prefix}_COUNT DEFAULT (0); END;"
+            )
+
+        statements.extend([
             f"UPDATE {table_identifier} SET sys_modified_count = 0 WHERE sys_modified_count IS NULL;",
             f"IF OBJECT_ID(N'{schema_identifier}.{trigger_prefix}_insert', N'TR') IS NOT NULL DROP TRIGGER {schema_identifier}.{trigger_prefix}_insert;",
             f"IF OBJECT_ID(N'{schema_identifier}.{trigger_prefix}_update', N'TR') IS NOT NULL DROP TRIGGER {schema_identifier}.{trigger_prefix}_update;",
@@ -539,7 +544,7 @@ BEGIN
     INNER JOIN deleted AS d ON d.sys_id = i.sys_id;
 END;
 """.strip(),
-        ]
+        ])
 
         return "\n".join(statements), tuple()
 

{velocity_python-0.0.142 → velocity_python-0.0.144}/src/velocity_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.142
+Version: 0.0.144
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.0.142 → velocity_python-0.0.144}/tests/test_where_clause_validation.py

@@ -25,10 +25,6 @@ class TestWhereClauseValidation(unittest.TestCase):
         self.mock_helper.get_table_alias.return_value = "t1"
         self.mock_helper.foreign_keys = {}
         self.mock_helper.split_columns.return_value = ["column1", "column2"]
-        
-        # Patch TableHelper creation
-        import velocity.db.servers.postgres.sql as sql_module
-        sql_module._get_table_helper = Mock(return_value=self.mock_helper)
 
     def test_invalid_where_bare_integer(self):
         """Test that bare integers in WHERE clauses are rejected with helpful error."""