Merge pull request #101 from DanCardin/dc/view-naming-convention

fix: Metadata naming_convention registration in combination with regi…

Author: DanCardin

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 0.15
 
+### 0.15.6
+
+- fix: Metadata naming_convention registration in combination with register_sqlalchemy_events.
+
 ### 0.15.5
 
 - fix: Dont set `None` audit "context values".

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlalchemy-declarative-extensions"
-version = "0.15.5"
+version = "0.15.6"
 authors = [
     {name = "Dan Cardin", email = "[email protected]"},
 ]

src/sqlalchemy_declarative_extensions/api.py

@@ -227,7 +227,7 @@ def register_create_events(
     concrete_schemas = metadata.info.get("schemas")
     concrete_roles = metadata.info.get("roles")
     concrete_grants = metadata.info.get("grants")
-    concrete_views = metadata.info.get("views")
+    concrete_views = Views.extract(metadata)
     concrete_procedures = metadata.info.get("procedures")
     concrete_functions = metadata.info.get("functions")
     concrete_triggers = metadata.info.get("triggers")

src/sqlalchemy_declarative_extensions/view/base.py

@@ -15,6 +15,7 @@
     Sequence,
     TypeVar,
     cast,
+    overload,
 )
 
 from sqlalchemy import Index, MetaData, UniqueConstraint, text
@@ -533,8 +534,26 @@ def coerce_from_unknown(
 
         return None
 
+    @overload
     @classmethod
-    def extract(cls, metadata: MetaData | list[MetaData | None] | None) -> Self | None:
+    def extract(cls, metadata: MetaData) -> Self: ...
+
+    @overload
+    @classmethod
+    def extract(cls, metadata: list[MetaData]) -> Self: ...
+
+    @overload
+    @classmethod
+    def extract(cls, metadata: list[MetaData | None]) -> Self | None: ...
+
+    @overload
+    @classmethod
+    def extract(cls, metadata: None) -> None: ...
+
+    @classmethod
+    def extract(
+        cls, metadata: MetaData | list[MetaData] | list[MetaData | None] | None
+    ) -> Self | None:
         if not isinstance(metadata, Sequence):
             metadata = [metadata]
 
@@ -547,9 +566,6 @@ def extract(cls, metadata: MetaData | list[MetaData | None] | None) -> Self | No
         if instance_count == 0:
             return None
 
-        if instance_count == 1:
-            return instances[0]
-
         if not all(
             x.ignore_unspecified == instances[0].ignore_unspecified
             and x.naming_convention == instances[0].naming_convention

src/sqlalchemy_declarative_extensions/view/ddl.py

@@ -10,7 +10,9 @@
 
 def view_ddl(views: Views, view_filter: list[str] | None = None):
     def after_create(metadata: MetaData, connection: Connection, **_):
-        result = compare_views(connection, views, normalize_with_connection=False)
+        result = compare_views(
+            connection, views, normalize_with_connection=False
+        )
         for op in result:
             if not match_name(op.view.qualified_name, view_filter):
                 continue

tests/view/test_metadata_sequence.py

@@ -48,8 +48,7 @@ def test_valid_combination():
 def test_single():
     views = Views.extract(metadata5)
     assert views
-    assert views is metadata5.info["views"]
-    assert views.naming_convention is None
+    assert views.naming_convention == {"ix": "asdf"}
 
 
 def test_naming_convention_fallback():