velocity-python 0.0.142__py3-none-any.whl → 0.0.144__py3-none-any.whl

velocity/__init__.py

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

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

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

@@ -1,4 +1,4 @@
-velocity/__init__.py,sha256=SkDlRMRyhFqq5GpLQPd_olQYdhQHS2BT3Y4ioTVxupg,147
+velocity/__init__.py,sha256=Ioy0BZtv2G_FlLD37UBlDUKHraQfoj2Xa6dDuiWKnk0,147
 velocity/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velocity/app/invoices.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velocity/app/orders.py,sha256=fr1oTBjSFfyeMBUXRG06LV4jgwrlwYNL5mbEBleFwf0,6328
@@ -53,7 +53,7 @@ velocity/db/servers/mysql/types.py,sha256=BMQf4TpsRo1JN-yOl1nSItTO-Juu2piSTNy5o_
 velocity/db/servers/postgres/__init__.py,sha256=6YcTLXposmsrEaJgdUAM_QgD1TZDSILQrGcwWZ-dibk,2457
 velocity/db/servers/postgres/operators.py,sha256=y9k6enReeR5hJxU_lYYR2epoaw4qCxEqmYJJ5jjaVWA,1166
 velocity/db/servers/postgres/reserved.py,sha256=5tKLaqFV-HrWRj-nsrxl5KGbmeM3ukn_bPZK36XEu8M,3648
-velocity/db/servers/postgres/sql.py,sha256=iZxvALFr3dpJm9BX_WE97E9RdM2RDCmi4M35HwXknVA,50141
+velocity/db/servers/postgres/sql.py,sha256=qUzZE45pfvB4499W1UfpqvupKP1RuQyOrRmB1oJ6sJY,49791
 velocity/db/servers/postgres/types.py,sha256=W71x8iRx-IIJkQSjb29k-KGkqp-QS6SxB0BHYXd4k8w,6955
 velocity/db/servers/sqlite/__init__.py,sha256=EIx09YN1-Vm-4CXVcEf9DBgvd8FhIN9rEqIaSRrEcIk,2293
 velocity/db/servers/sqlite/operators.py,sha256=VzZgph8RrnHkIVqqWGqnJwcafgBzc_8ZQp-M8tMl-mw,1221
@@ -63,7 +63,7 @@ velocity/db/servers/sqlite/types.py,sha256=jpCJeV25x4Iytf6D6GXgK3hVYFAAFV4WKJC-d
 velocity/db/servers/sqlserver/__init__.py,sha256=LN8OycN7W8da_ZPRYnPQ-O3Bv_xjret9qV1ZCitZlOU,2708
 velocity/db/servers/sqlserver/operators.py,sha256=xK8_doDLssS38SRs1NoAI7XTO0-gNGMDS76nTVru4kE,1104
 velocity/db/servers/sqlserver/reserved.py,sha256=Gn5n9DjxcjM-7PsIZPYigD6XLvMAYGnz1IrPuN7Dp2Y,2120
-velocity/db/servers/sqlserver/sql.py,sha256=sdmFFzt_Np9mVRGPkFsnWfYPD8z88V9Sp5no3-maPHM,26208
+velocity/db/servers/sqlserver/sql.py,sha256=O57p267LZ6WcAhxRuLuzylqjfZvDzkRuwf8s-GgeWDo,26332
 velocity/db/servers/sqlserver/types.py,sha256=FAODYEO137m-WugpM89f9bQN9q6S2cjjUaz0a9gfE6M,3745
 velocity/db/tests/__init__.py,sha256=7-hilWb43cKnSnCeXcjFG-6LpziN5k443IpsIvuevP0,24
 velocity/db/tests/common_db_test.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -121,8 +121,8 @@ velocity/misc/tests/test_merge.py,sha256=Vm5_jY5cVczw0hZF-3TYzmxFw81heJOJB-dvhCg
 velocity/misc/tests/test_oconv.py,sha256=fy4DwWGn_v486r2d_3ACpuBD-K1oOngNq1HJCGH7X-M,4694
 velocity/misc/tests/test_original_error.py,sha256=iWSd18tckOA54LoPQOGV5j9LAz2W-3_ZOwmyZ8-4YQc,1742
 velocity/misc/tests/test_timer.py,sha256=l9nrF84kHaFofvQYKInJmfoqC01wBhsUB18lVBgXCoo,2758
-velocity_python-0.0.142.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
-velocity_python-0.0.142.dist-info/METADATA,sha256=lOnWDl2eeeGGfq1hv56p2mGXGz-LzGodk7wWdVpRoH0,34262
-velocity_python-0.0.142.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-velocity_python-0.0.142.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
-velocity_python-0.0.142.dist-info/RECORD,,
+velocity_python-0.0.144.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
+velocity_python-0.0.144.dist-info/METADATA,sha256=imAkzFidVZzVoPKOvVLgKimeWssXCWGfzB9dZH6FTD8,34262
+velocity_python-0.0.144.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+velocity_python-0.0.144.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
+velocity_python-0.0.144.dist-info/RECORD,,