Merge pull request #112 from DanCardin/dc/trigger-quoting

fix: Trigger quoting (with schemas).

Author: DanCardin

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 0.15
 
+### 0.15.10
+
+- feat: Support alembic check.
+- fix: Quote trigger name/tablenames.
+
 ### 0.15.9
 
 - fix: Quote trigger name/tablenames.

pyproject.toml

@@ -1,12 +1,11 @@
 [project]
 name = "sqlalchemy-declarative-extensions"
-version = "0.15.9"
+version = "0.15.10"
 authors = [
     {name = "Dan Cardin", email = "[email protected]"},
 ]
 description = "Library to declare additional kinds of objects not natively supported by SQLAlchemy/Alembic."
 license = {file = "LICENSE"}
-repository = "https://github.com/dancardin/sqlalchemy-declarative-extensions"
 readme = 'README.md'
 
 keywords = [
@@ -36,6 +35,12 @@ dependencies = [
   "sqlalchemy >= 1.3",
 ]
 
+[project.urls]
+documentation = "https://sqlalchemy-declarative-extensions.readthedocs.io/en/latest/"
+homepage = "https://sqlalchemy-declarative-extensions.readthedocs.io/en/latest/"
+repository = "https://github.com/dancardin/sqlalchemy-declarative-extensions"
+changelog = "https://github.com/DanCardin/sqlalchemy-declarative-extensions/blob/main/CHANGELOG.md"
+
 [project.optional-dependencies]
 alembic = ["alembic >= 1.0"]
 parse = ["sqlglot"]

src/sqlalchemy_declarative_extensions/dialects/postgresql/trigger.py

@@ -159,7 +159,11 @@ def to_sql_create(self, replace=False):
         components.append(self.time.value)
         components.append(" OR ".join([e.value for e in self.events]))
         components.append("ON")
-        components.append(f'"{self.on}"')
+
+        on_components = [f'"{component}"' for component in self.on.split(".")]
+        on = ".".join(on_components)
+        components.append(on)
+
         components.append("FOR EACH")
         components.append(self.for_each.value)
 

tests/trigger/test_schema_quoting.py

@@ -0,0 +1,68 @@
+from pytest_mock_resources import create_postgres_fixture
+from sqlalchemy import Column, types
+
+from sqlalchemy_declarative_extensions import (
+    Function,
+    Functions,
+    Triggers,
+    declarative_database,
+    register_sqlalchemy_events,
+)
+from sqlalchemy_declarative_extensions.dialects.postgresql import Trigger
+from sqlalchemy_declarative_extensions.sqlalchemy import declarative_base
+from sqlalchemy_declarative_extensions.trigger.compare import compare_triggers
+
+_Base = declarative_base()
+
+
+@declarative_database
+class Base(_Base):  # type: ignore
+    __abstract__ = True
+
+    schemas = ["table"]
+    functions = Functions().are(
+        Function(
+            "gimme",
+            """
+            BEGIN
+            INSERT INTO "table"."select" (id) select NEW.id + 1;
+            RETURN NULL;
+            END
+            """,
+            language="plpgsql",
+            returns="trigger",
+        )
+    )
+    triggers = Triggers().are(
+        Trigger.after("insert", on="table.select", execute="gimme")
+        .named("on_insert_foo")
+        .when("pg_trigger_depth() < 1")
+        .for_each_row(),
+    )
+
+
+class Foo(Base):
+    __tablename__ = "select"
+    __table_args__ = {"schema": "table"}
+
+    id = Column(types.Integer(), primary_key=True)
+
+
+register_sqlalchemy_events(Base.metadata, functions=True, triggers=True, schemas=True)
+
+pg = create_postgres_fixture(engine_kwargs={"echo": True}, session=True)
+
+
+def test_quotes_target_components(pg):
+    Base.metadata.create_all(bind=pg.connection())
+    pg.commit()
+
+    pg.add(Foo(id=5))
+    pg.commit()
+
+    result = [r.id for r in pg.query(Foo).all()]
+    assert result == [5, 6]
+
+    connection = pg.connection()
+    diff = compare_triggers(connection, Base.metadata.info["triggers"])
+    assert diff == []