velocity-python 0.0.33__tar.gz → 0.0.34__tar.gz

{velocity_python-0.0.33 → velocity_python-0.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velocity-python
-Version: 0.0.33
+Version: 0.0.34
 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.33 → velocity_python-0.0.34}/pyproject.toml

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

{velocity_python-0.0.33 → velocity_python-0.0.34}/src/velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.33"
+__version__ = version = "0.0.34"
 
 from . import aws
 from . import db

{velocity_python-0.0.33 → velocity_python-0.0.34}/src/velocity/db/core/decorators.py

@@ -1,5 +1,6 @@
 from functools import wraps
 from velocity.db import exceptions
+import traceback
 
 
 def retry_on_dup_key(function):
@@ -55,6 +56,7 @@ def return_default(
                 if result is None:
                     result = default
             except f.exceptions as e:
+                traceback.print_exc()
                 self.tx.rollback_savepoint(sp, cursor=self.cursor)
                 return f.default
             self.tx.release_savepoint(sp, cursor=self.cursor)

{velocity_python-0.0.33 → velocity_python-0.0.34}/src/velocity/db/core/engine.py

@@ -169,6 +169,8 @@ class Engine(object):
                     return function(*args, **kwds)
                 except exceptions.DbRetryTransaction as e:
                     if e.args and e.args[0]:
+                        print(e)
+                        print("**Retry Transaction. Rollback and start over")
                         _tx.rollback()
                         continue
                     retry_count += 1
@@ -249,6 +251,7 @@ class Engine(object):
             conf["database"] = database
         if "dbname" in conf:
             conf["dbname"] = database
+
         return self
 
     def set_config(self, config):

{velocity_python-0.0.33 → velocity_python-0.0.34}/src/velocity/db/core/transaction.py

@@ -6,6 +6,7 @@ from velocity.db.core.column import Column
 from velocity.db.core.database import Database
 from velocity.db.core.sequence import Sequence
 from velocity.misc.db import randomword
+import traceback
 
 
 debug = False
@@ -29,6 +30,11 @@ class Transaction(object):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if exc_type:
+            if debug:
+                print("Transaction.__exit__")
+            tb_str = "".join(traceback.format_exception(exc_type, exc_val, exc_tb))
+            if debug:
+                print(tb_str)
             self.rollback()
         self.close()
 
@@ -206,3 +212,10 @@ class Transaction(object):
             result = self.execute(sql, vals)
             self.__pg_types = dict(result.as_tuple())
         return self.__pg_types
+
+    def switch_to_database(self, name):
+        if self.connection:
+            self.connection.close()
+            self.connection = None
+        self.engine.switch_to_database(name)
+        return self

{velocity_python-0.0.33 → velocity_python-0.0.34}/src/velocity/db/servers/postgres.py

@@ -445,7 +445,7 @@ class SQL(object):
         trigger = "".format(name)
         sql = []
         if drop:
-            sql.append(cls.drop_table(fqtn))
+            sql.append(cls.drop_table(fqtn)[0])
         sql.append(
             """
             CREATE TABLE {0} (

{velocity_python-0.0.33 → velocity_python-0.0.34}/src/velocity_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velocity-python
-Version: 0.0.33
+Version: 0.0.34
 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.33 → velocity_python-0.0.34}/src/velocity_python.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ src/velocity_python.egg-info/requires.txt
 src/velocity_python.egg-info/top_level.txt
 tests/test_db.py
 tests/test_email_processing.py
+tests/test_foreign_key_handling.py
 tests/test_format.py
 tests/test_iconv.py
 tests/test_merge.py

velocity_python-0.0.34/tests/test_foreign_key_handling.py

@@ -0,0 +1,169 @@
+import unittest
+from velocity.db.servers import postgres
+
+test_db = "test_foreign_key_db"
+engine = postgres.initialize(database=test_db)
+
+
+@engine.transaction
+class TestForeignKeyHandling(unittest.TestCase):
+    @classmethod
+    @engine.transaction
+    def setUpClass(cls, tx):
+        # Drop and recreate the test database
+        tx.switch_to_database("postgres")
+        tx.execute(f"drop database if exists {test_db}", single=True)
+        tx.execute(f"create database {test_db}", single=True)
+        tx.switch_to_database(test_db)
+
+        # Create parent_table
+        parent_table = tx.table("parent_table")
+        parent_table.create(
+            columns={
+                "name": str,
+            }
+        )
+
+        # Create middle_table with a foreign key to parent_table
+        middle_table = tx.table("middle_table")
+        middle_table.create(
+            columns={
+                "parent_id": int,
+                "title": str,
+            }
+        )
+        middle_table.create_foreign_key("parent_id", "parent_table", "sys_id")
+
+        # Create child_table with foreign keys to both parent_table and middle_table
+        child_table = tx.table("child_table")
+        child_table.create(
+            columns={
+                "parent_id": int,
+                "middle_id": int,
+            }
+        )
+        child_table.create_foreign_key("parent_id", "parent_table", "sys_id")
+        child_table.create_foreign_key("middle_id", "middle_table", "sys_id")
+
+    @classmethod
+    @engine.transaction
+    def tearDownClass(cls, tx):
+        # Drop the test database
+        # tx.switch_to_database("postgres")
+        # tx.execute(f"drop database if exists {test_db}", single=True)
+        pass
+
+    def test_foreign_key_with_specified_sys_id(self, tx):
+        # Insert data into parent_table with specified sys_id
+        parent_table = tx.table("parent_table")
+        parent_table.insert({"sys_id": 100, "name": "Parent 1"})
+        parent_table.insert({"sys_id": 200, "name": "Parent 2"})
+
+        # Insert data into middle_table with specified sys_id
+        middle_table = tx.table("middle_table")
+        middle_table.insert({"sys_id": 300, "parent_id": 100, "title": "Title 1"})
+        middle_table.insert({"sys_id": 400, "parent_id": 200, "title": "Title 2"})
+
+        # Insert data into child_table with specified sys_id
+        child_table = tx.table("child_table")
+        child_table.insert(
+            {
+                "sys_id": 500,
+                "parent_id": 100,
+                "middle_id": 300,
+                "description": "Child A",
+            }
+        )
+        child_table.insert(
+            {
+                "sys_id": 600,
+                "parent_id": 200,
+                "middle_id": 400,
+                "description": "Child B",
+            }
+        )
+
+        # Query selecting columns with three foreign key references
+        result = list(
+            child_table.select(
+                columns=[
+                    "parent_id>name",
+                    "middle_id>title",
+                    "sys_id",
+                    "description",
+                ]
+            )
+        )
+        expected_result = [
+            {
+                "parent_id_name": "Parent 1",
+                "middle_id_title": "Title 1",
+                "sys_id": 500,
+                "description": "Child A",
+            },
+            {
+                "parent_id_name": "Parent 2",
+                "middle_id_title": "Title 2",
+                "sys_id": 600,
+                "description": "Child B",
+            },
+        ]
+        self.assertEqual(result, expected_result)
+
+    def test_foreign_key_conditions_with_specified_sys_id(self, tx):
+        # Query with conditions on foreign key references
+        child_table = tx.table("child_table")
+        result = list(
+            child_table.select(
+                columns=[
+                    "parent_id>name",
+                    "middle_id>title",
+                    "sys_id",
+                    "description",
+                ],
+                where={"parent_id>name": "Parent 1", "middle_id>title": "Title 1"},
+            )
+        )
+        expected_result = [
+            {
+                "parent_id_name": "Parent 1",
+                "middle_id_title": "Title 1",
+                "sys_id": 500,
+                "description": "Child A",
+            }
+        ]
+        self.assertEqual(result, expected_result)
+
+    def test_foreign_key_ordering_with_specified_sys_id(self, tx):
+        # Query with ordering based on foreign key references
+        child_table = tx.table("child_table")
+        result = list(
+            child_table.select(
+                columns=[
+                    "parent_id>name",
+                    "middle_id>title",
+                    "sys_id",
+                    "description",
+                ],
+                orderby="parent_id>name DESC, middle_id>title ASC",
+            )
+        )
+        expected_result = [
+            {
+                "parent_id_name": "Parent 2",
+                "middle_id_title": "Title 2",
+                "sys_id": 600,
+                "description": "Child B",
+            },
+            {
+                "parent_id_name": "Parent 1",
+                "middle_id_title": "Title 1",
+                "sys_id": 500,
+                "description": "Child A",
+            },
+        ]
+        self.assertEqual(result, expected_result)
+
+
+if __name__ == "__main__":
+    unittest.main()