velocity-python 0.0.141__tar.gz → 0.0.143__tar.gz

{velocity_python-0.0.141 → velocity_python-0.0.143}/PKG-INFO

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

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

{velocity_python-0.0.141 → velocity_python-0.0.143}/src/velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.141"
+__version__ = version = "0.0.143"
 
 from . import aws
 from . import db

{velocity_python-0.0.141 → velocity_python-0.0.143}/src/velocity/db/servers/postgres/sql.py

@@ -794,7 +794,7 @@ 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)
@@ -804,8 +804,13 @@ class SQL(BaseSQLDialect):
         trigger_name = f"on_update_row_{fqtn.replace('.', '_')}"
         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()
@@ -843,9 +848,11 @@ class SQL(BaseSQLDialect):
             BEFORE INSERT OR UPDATE ON {fqtn}
             FOR EACH ROW EXECUTE PROCEDURE {schema}.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.141 → velocity_python-0.0.143}/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.141 → velocity_python-0.0.143}/src/velocity_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.141
+Version: 0.0.143
 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.141 → velocity_python-0.0.143}/src/velocity_python.egg-info/SOURCES.txt

@@ -129,4 +129,5 @@ src/velocity_python.egg-info/SOURCES.txt
 src/velocity_python.egg-info/dependency_links.txt
 src/velocity_python.egg-info/requires.txt
 src/velocity_python.egg-info/top_level.txt
+tests/test_sys_modified_count_postgres_demo.py
 tests/test_where_clause_validation.py

velocity_python-0.0.143/tests/test_sys_modified_count_postgres_demo.py

@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+"""Integration test for sys_modified_count triggers against the demo PostgreSQL database."""
+
+import sys
+import unittest
+import uuid
+from pathlib import Path
+
+# Ensure the shared secrets package (contains env.py) is on the path.
+REPO_ROOT = Path(__file__).resolve().parents[1]
+SECRETS_PATH = REPO_ROOT.parent / "caringcent" / "secrets"
+if str(SECRETS_PATH) not in sys.path:
+    sys.path.append(str(SECRETS_PATH))
+
+import env
+from velocity.db.servers import postgres
+
+# Ensure we are pointed at the demo environment before opening any connections.
+env.set("demo")
+
+engine = postgres.initialize()
+
+
+class TestSysModifiedCountDemo(unittest.TestCase):
+    """Exercises the new sys_modified_count wiring against the demo PostgreSQL database."""
+
+    @classmethod
+    def setUpClass(cls):
+        cls.table_name = f"tmp_sys_mod_{uuid.uuid4().hex[:12]}"
+
+        @engine.transaction
+        def setup(tx):
+            table = tx.table(cls.table_name)
+            table.drop()
+            table.create(columns={"custom_value": "sample"})
+
+        setup()
+
+    @classmethod
+    def tearDownClass(cls):
+        @engine.transaction
+        def cleanup(tx):
+            tx.table(cls.table_name).drop()
+
+        cleanup()
+
+    def test_sys_modified_count_triggers_increment(self):
+        table_name = self.table_name
+
+        @engine.transaction
+        def run(tx):
+            table = tx.table(table_name)
+            row = table.new({"custom_value": "initial"})
+
+            row_data = row.to_dict()
+            self.assertEqual(row_data["sys_modified_count"], 0, "insert should reset modified count")
+            self.assertFalse(row_data["sys_dirty"], "insert should start clean")
+            self.assertEqual(row_data["sys_table"], table_name)
+
+            row["custom_value"] = "updated"
+            updated = row.to_dict()
+            self.assertEqual(updated["sys_modified_count"], 1)
+            self.assertTrue(updated["sys_dirty"])
+
+            # Ensure the helper no-ops when the column already exists.
+            self.assertIsNone(table.ensure_sys_modified_count())
+
+            row["custom_value"] = "final"
+            final = row.to_dict()
+            self.assertEqual(final["sys_modified_count"], 2)
+            self.assertTrue(final["sys_dirty"])
+
+        run()
+
+
+if __name__ == "__main__":
+    unittest.main()