sqlalchemy-events-lib 0.3.2__tar.gz → 0.3.3__tar.gz

{sqlalchemy_events_lib-0.3.2 → sqlalchemy_events_lib-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlalchemy-events-lib
-Version: 0.3.2
+Version: 0.3.3
 Summary: Event-driven extension for SQLAlchemy that enables listening to database CUD events. This library allows you to react to database changes in real time using a clean, declarative API.
 Author-email: Alexey Kostarev <normjkeeewm@gmail.com>
 License: MIT

{sqlalchemy_events_lib-0.3.2 → sqlalchemy_events_lib-0.3.3}/pyproject.toml

@@ -10,7 +10,7 @@ where = ["src"]
 
 [project]
 name = "sqlalchemy-events-lib"
-version = "0.3.2"
+version = "0.3.3"
 description = "Event-driven extension for SQLAlchemy that enables listening to database CUD events. This library allows you to react to database changes in real time using a clean, declarative API."
 requires-python = ">=3.12"
 authors = [

{sqlalchemy_events_lib-0.3.2 → sqlalchemy_events_lib-0.3.3}/src/sqlalchemy_events/__init__.py

@@ -11,4 +11,4 @@ __all__ = [
     'with_events',
     'SaEvent'
 ]
-__version__ = '0.3.2'
+__version__ = '0.3.3'

{sqlalchemy_events_lib-0.3.2 → sqlalchemy_events_lib-0.3.3}/src/sqlalchemy_events/init_triggers_strategies/postgres_init_triggers.py

@@ -10,6 +10,8 @@ from .base import InitTriggersStrategy
 class PostgresInitTriggers(InitTriggersStrategy):
 
     async def __call__(self, model_list: list[Type[DeclarativeBase]], conn, logger):
+        result = await conn.execute(text("SELECT current_schema()"))
+        schema = result.scalar()
         for sa_event in SaEvent:
             sa_event = sa_event.lower()
             await conn.execute(
@@ -21,7 +23,7 @@ class PostgresInitTriggers(InitTriggersStrategy):
                         BEGIN
                             payload := json_build_object(
                                 'op', '{sa_event}',
-                                'table', TG_TABLE_NAME,
+                                'table', TG_full_name,
                                 'rows', array_agg(n.id)
                             )
                             FROM {'old_rows' if sa_event.upper() == SaEvent.DELETE else 'new_rows'} n;
@@ -40,23 +42,18 @@ class PostgresInitTriggers(InitTriggersStrategy):
                 continue
 
             table_name = cls.__tablename__
-
+            full_name = f'{schema}.{table_name}'
             existing_triggers = set()
 
             table_exists = await conn.scalar(
-                text("""
-                     SELECT EXISTS (SELECT 1
-                                    FROM pg_class
-                                    WHERE relname = :tbl
-                                      AND relkind = 'r')
-                     """),
-                {'tbl': table_name},
+                text('SELECT to_regclass(:tbl) IS NOT NULL'),
+                {'tbl': full_name},
             )
             if not table_exists:
                 if logger:
                     logger.warning(f"[SQLAlchemyEvents] {cls.__name__} has "
                                    f"{'event' if len(events) == 1 else 'events'} {', '.join(events)}, "
-                                   f"but relation '{table_name}' does not exist")
+                                   f"but relation '{full_name}' does not exist")
                 continue
 
             if table_exists:
@@ -67,26 +64,26 @@ class PostgresInitTriggers(InitTriggersStrategy):
                                 AND NOT tgisinternal
                               """)
 
-                for row in await conn.execute(tg_sql, {'tbl': table_name}):
+                for row in await conn.execute(tg_sql, {'tbl': full_name}):
                     existing_triggers.add(row[0])
 
             added_events = []
             for event in sorted(events):
                 l_event = event.lower()
-                trig_name = f'sa_{table_name}_{l_event}_notify'
+                trig_name = f'sa_{schema}_{table_name}_{l_event}_notify'
 
                 if trig_name in existing_triggers:
                     continue
 
                 added_events.append(event)
                 await conn.execute(
-                    text(f'DROP TRIGGER IF EXISTS {trig_name} ON {table_name};')
+                    text(f'DROP TRIGGER IF EXISTS {trig_name} ON {full_name};')
                 )
 
                 await conn.execute(
                     text(f"""
                             CREATE TRIGGER {trig_name}
-                            AFTER {event} ON {table_name}
+                            AFTER {event} ON {full_name}
                             REFERENCING {'OLD' if event == SaEvent.DELETE else 'NEW'} 
                             TABLE AS {'old_rows' if event == SaEvent.DELETE else 'new_rows'}
                             FOR EACH STATEMENT
@@ -97,7 +94,7 @@ class PostgresInitTriggers(InitTriggersStrategy):
             if added_events and logger:
                 logger.info(
                     f"Detected added {'event' if len(added_events) == 1 else 'events'} "
-                    f"{', '.join(added_events)} for table '{table_name}'"
+                    f"{', '.join(added_events)} for table '{full_name}'"
                 )
 
         await conn.commit()

{sqlalchemy_events_lib-0.3.2 → sqlalchemy_events_lib-0.3.3}/src/sqlalchemy_events_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlalchemy-events-lib
-Version: 0.3.2
+Version: 0.3.3
 Summary: Event-driven extension for SQLAlchemy that enables listening to database CUD events. This library allows you to react to database changes in real time using a clean, declarative API.
 Author-email: Alexey Kostarev <normjkeeewm@gmail.com>
 License: MIT

{sqlalchemy_events_lib-0.3.2 → sqlalchemy_events_lib-0.3.3}/src/tests/test_is_created_triggers.py

@@ -3,21 +3,28 @@ from sqlalchemy import text
 
 async def test_is_created_triggers(session):
     trigger_names = [
-        'sa_users_delete_notify',
-        'sa_users_insert_notify',
-        'sa_users_update_notify',
+        'sa_public_users_delete_notify',
+        'sa_public_users_insert_notify',
+        'sa_public_users_update_notify',
     ]
-
+    result = await session.execute(text('SELECT current_schema()'))
+    schema = result.scalar()
     result = await session.execute(
         text("""
              SELECT COUNT(*)
              FROM pg_trigger t
                       JOIN pg_class c ON t.tgrelid = c.oid
-             WHERE c.relname = 'users'
+                      JOIN pg_namespace n ON c.relnamespace = n.oid
+             WHERE c.relname = :table
+               AND n.nspname = :schema
                AND t.tgname = ANY (:trigger_names)
                AND NOT t.tgisinternal
              """),
-        {'trigger_names': trigger_names}
+        {
+            'table': 'users',
+            'schema': schema,
+            'trigger_names': trigger_names,
+        }
     )
 
     count = result.scalar()