sqlalchemy-declarative-extensions 0.16.9__tar.gz → 0.16.11__tar.gz

{sqlalchemy_declarative_extensions-0.16.9 → sqlalchemy_declarative_extensions-0.16.11}/.readthedocs.yml

@@ -4,7 +4,7 @@ sphinx:
   configuration: docs/source/conf.py
 
 build:
-  os: ubuntu-20.04
+  os: ubuntu-24.04
   tools:
     python: "3.10"
 

{sqlalchemy_declarative_extensions-0.16.9 → sqlalchemy_declarative_extensions-0.16.11}/CHANGELOG.md

@@ -4,6 +4,14 @@
 
 ## 0.16
 
+### 0.16.11
+
+- fix: Correlate the extension-schema check in pg triggers_query.
+
+### 0.16.10
+
+- fix: TypeError breaking constraints on declared views.
+
 ### 0.16.9
 
 - fix: Support for duplicate PostgreSQL trigger names.

{sqlalchemy_declarative_extensions-0.16.9 → sqlalchemy_declarative_extensions-0.16.11}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: sqlalchemy-declarative-extensions
-Version: 0.16.9
+Version: 0.16.11
 Summary: Library to declare additional kinds of objects not natively supported by SQLAlchemy/Alembic.
 Project-URL: documentation, https://sqlalchemy-declarative-extensions.readthedocs.io/en/latest/
 Project-URL: homepage, https://sqlalchemy-declarative-extensions.readthedocs.io/en/latest/

{sqlalchemy_declarative_extensions-0.16.9 → sqlalchemy_declarative_extensions-0.16.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlalchemy-declarative-extensions"
-version = "0.16.9"
+version = "0.16.11"
 authors = [{ name = "Dan Cardin", email = "ddcardin@gmail.com" }]
 description = "Library to declare additional kinds of objects not natively supported by SQLAlchemy/Alembic."
 license = { file = "LICENSE" }

{sqlalchemy_declarative_extensions-0.16.9 → sqlalchemy_declarative_extensions-0.16.11}/src/sqlalchemy_declarative_extensions/dialects/postgresql/schema.py

@@ -450,6 +450,6 @@ triggers_query = (
         .join(proc_nsp, pg_proc.c.pronamespace == proc_nsp.c.oid)
     )
     .where(pg_trigger.c.tgisinternal.is_(False))
-    .where(_schema_not_from_extension())
+    .where(_schema_not_from_extension(rel_nsp.c.oid))
     .where(_not_from_extension(pg_trigger.c.oid, "pg_trigger"))
 )

{sqlalchemy_declarative_extensions-0.16.9 → sqlalchemy_declarative_extensions-0.16.11}/src/sqlalchemy_declarative_extensions/view/base.py

@@ -371,6 +371,15 @@ class View:
         return result
 
 
+def _col_name(c: Any) -> str:
+    if isinstance(c, str):
+        return c
+    name = c.key
+    if name is None:
+        raise ValueError(f"Index column {c!r} has no name")
+    return name
+
+
 @dataclass
 class ViewIndex:
     columns: list[str]
@@ -391,14 +400,14 @@ class ViewIndex:
         elif isinstance(index, Index):
             convention = "ix"
             instance = ViewIndex(
-                columns=cast(List[str], list(index.expressions)),
+                columns=[_col_name(c) for c in index.expressions],
                 name=index.name,
                 unique=index.unique,
             )
         elif isinstance(index, UniqueConstraint):
             convention = "uq"
             instance = ViewIndex(
-                columns=cast(List[str], list(index._pending_colargs)),
+                columns=[_col_name(c) for c in index._pending_colargs],
                 name=str(index.name) if index.name else None,
                 unique=True,
             )

{sqlalchemy_declarative_extensions-0.16.9 → sqlalchemy_declarative_extensions-0.16.11}/tests/audit/test_schema_support.py

@@ -1,4 +1,5 @@
 """Tests for schema-aware audit function and trigger creation."""
+
 from pytest_mock_resources import create_postgres_fixture
 from sqlalchemy import Column, text, types
 
@@ -187,7 +188,9 @@ def test_audit_functionality_with_schema(pg):
 
     # Check audit trail
     result = pg.execute(
-        text("SELECT audit_operation, name, price FROM myschema.product_audit ORDER BY audit_pk")
+        text(
+            "SELECT audit_operation, name, price FROM myschema.product_audit ORDER BY audit_pk"
+        )
     ).fetchall()
 
     assert len(result) == 1
@@ -200,7 +203,9 @@ def test_audit_functionality_with_schema(pg):
     pg.commit()
 
     result = pg.execute(
-        text("SELECT audit_operation, name, price FROM myschema.product_audit ORDER BY audit_pk")
+        text(
+            "SELECT audit_operation, name, price FROM myschema.product_audit ORDER BY audit_pk"
+        )
     ).fetchall()
 
     assert len(result) == 2
@@ -246,7 +251,9 @@ def test_audit_functions_default_schema(pg):
     pg.commit()
 
     result = pg.execute(
-        text("SELECT audit_operation, name FROM public.customer_audit ORDER BY audit_pk")
+        text(
+            "SELECT audit_operation, name FROM public.customer_audit ORDER BY audit_pk"
+        )
     ).fetchall()
 
     assert len(result) == 1

sqlalchemy_declarative_extensions-0.16.11/tests/dialect/postgresql/test_extension_owned_schema.py

@@ -0,0 +1,47 @@
+from pytest_mock_resources import create_postgres_fixture
+from sqlalchemy import text
+
+from sqlalchemy_declarative_extensions import Triggers
+from sqlalchemy_declarative_extensions.dialects import get_triggers
+from sqlalchemy_declarative_extensions.trigger.compare import compare_triggers
+
+pg = create_postgres_fixture(scope="function", engine_kwargs={"echo": True})
+
+setup = """
+CREATE EXTENSION hstore;
+CREATE SCHEMA ext_owned;
+
+INSERT INTO pg_depend
+    (classid, objid, objsubid, refclassid, refobjid, refobjsubid, deptype)
+SELECT 'pg_namespace'::regclass, n.oid, 0, 'pg_extension'::regclass, e.oid, 0, 'e'
+FROM pg_namespace n, pg_extension e
+WHERE n.nspname = 'ext_owned' AND e.extname = 'hstore';
+
+CREATE FUNCTION gimme() RETURNS trigger LANGUAGE plpgsql AS $$
+BEGIN
+RETURN NULL;
+END
+$$;
+
+CREATE TABLE foo (id integer primary key);
+CREATE TRIGGER on_insert_foo AFTER INSERT ON foo
+FOR EACH ROW EXECUTE PROCEDURE gimme();
+
+CREATE TABLE ext_owned.bar (id integer primary key);
+CREATE TRIGGER on_insert_bar AFTER INSERT ON ext_owned.bar
+FOR EACH ROW EXECUTE PROCEDURE gimme();
+"""
+
+
+def test_extension_owned_schema_only_excludes_triggers_on_own_tables(pg):
+    with pg.connect() as connection:
+        connection.execute(text(setup))
+        connection.commit()
+        
+        trigger_names = [trigger.name for trigger in get_triggers(connection)]
+        assert trigger_names == ["on_insert_foo"]
+
+        diff = compare_triggers(connection, Triggers())
+
+    diff_trigger_names = [op.trigger.name for op in diff]
+    assert diff_trigger_names == ["on_insert_foo"]

sqlalchemy_declarative_extensions-0.16.11/tests/view/test_view_index_bound_column.py

@@ -0,0 +1,62 @@
+import pytest
+from pytest_mock_resources import create_postgres_fixture
+from sqlalchemy import Column, Index, UniqueConstraint, types
+from sqlalchemy.dialects.postgresql import dialect as pg_dialect
+
+from sqlalchemy_declarative_extensions import (
+    ViewIndex,
+    declarative_database,
+    register_sqlalchemy_events,
+    view,
+)
+from sqlalchemy_declarative_extensions.dialects.postgresql import View
+from sqlalchemy_declarative_extensions.sqlalchemy import declarative_base
+
+_Base = declarative_base()
+
+
+@declarative_database
+class Base(_Base):  # type: ignore
+    __abstract__ = True
+
+
+class Foo(Base):
+    __tablename__ = "foo"
+    id = Column(types.Integer(), autoincrement=True, primary_key=True)
+
+
+@view(Base, materialized=True, register_as_model=True)
+class Bar:
+    __tablename__ = "bar"
+    __view__ = "SELECT id FROM foo"
+    __table_args__ = (Index("ix_bar_id", "id", unique=True),)
+
+    id = Column(types.Integer(), primary_key=True)
+
+
+@view(Base, materialized=True, register_as_model=True)
+class Baz:
+    __tablename__ = "baz"
+    __view__ = "SELECT id FROM foo"
+    __table_args__ = (UniqueConstraint("id"),)
+
+    id = Column(types.Integer(), primary_key=True)
+
+
+register_sqlalchemy_events(Base.metadata, views=True)
+
+pg = create_postgres_fixture(scope="function", engine_kwargs={"echo": True})
+
+
+def test_index_on_register_as_model_view(pg):
+    """create_all must not raise TypeError when Index/UniqueConstraint expressions are Column objects."""
+    with pg.connect() as conn:
+        Base.metadata.create_all(bind=conn)
+
+
+def test_col_name_raises_for_nameless_column():
+    nameless = Column(types.Integer())
+    idx = Index("ix_test", nameless)
+    v = View("some_view", "SELECT 1", materialized=True)
+    with pytest.raises(ValueError, match="has no name"):
+        ViewIndex.from_unknown(idx, v, pg_dialect(), None)

{sqlalchemy_declarative_extensions-0.16.9 → sqlalchemy_declarative_extensions-0.16.11}/uv.lock

@@ -1485,7 +1485,7 @@ mypy = [
 
 [[package]]
 name = "sqlalchemy-declarative-extensions"
-version = "0.16.7"
+version = "0.16.10"
 source = { editable = "." }
 dependencies = [
     { name = "sqlalchemy" },