Merge pull request #437 from reagento/pr-408

Fixed #408

Author: zhPavel

docs/changelog/fragments/+sa-custom-column-name.bugfix.rst

@@ -0,0 +1 @@
+Fix introspection of SQLAlchemy models with custom column name

src/adaptix/_internal/model_tools/introspection/sqlalchemy.py

@@ -131,13 +131,13 @@ def _get_input_shape(
     autoincrement_column = _get_autoincrement_column(table)
     fields = []
     params = []
-    for column in columns:
+    for field_name, column in columns.items():
         if not isinstance(column, sqlalchemy.Column):
             continue
 
         fields.append(
             InputField(
-                id=column.key,
+                id=field_name,
                 type=_get_type_for_column(column, type_hints),
                 default=_get_default(column.default),
                 is_required=_is_input_required_for_column(column, autoincrement_column),
@@ -147,8 +147,8 @@ def _get_input_shape(
         )
         params.append(
             Param(
-                field_id=column.key,
-                name=column.key,
+                field_id=field_name,
+                name=field_name,
                 kind=ParamKind.KW_ONLY,
             ),
         )
@@ -193,14 +193,14 @@ def _get_output_shape(
 ) -> OutputShape:
     output_fields = [
         OutputField(
-            id=column.name,
+            id=field_name,
             type=_get_type_for_column(column, type_hints),
             default=_get_default(column.default),
             metadata=column.info,
             original=IdWrapper(column),
-            accessor=create_attr_accessor(column.name, is_required=True),
+            accessor=create_attr_accessor(field_name, is_required=True),
         )
-        for column in columns
+        for field_name, column in columns.items()
         if isinstance(column, sqlalchemy.Column)
     ]
     for relationship in relationships:

tests/integration/morphing/test_sqlalchemy.py

@@ -135,3 +135,63 @@ class Declarative2:
         ==
         {"id": 1, "text": "abc", "children": [{"id": 2, "parent_id": None}]}
     )
+
+
+def test_o2o_relationship_with_custom_name_pos(accum):
+    mapper_registry = registry()
+
+    @mapper_registry.mapped
+    class Declarative1:
+        __tablename__ = "DeclarativeModel1"
+
+        id: Mapped[int] = mapped_column("Id", primary_key=True)
+
+        __eq__ = sqlalchemy_equals
+
+    @mapper_registry.mapped
+    class Declarative2:
+        __tablename__ = "DeclarativeModel2"
+
+        id: Mapped[int] = mapped_column("Id", primary_key=True)
+        text: Mapped[str] = mapped_column("Text")
+
+        parent_id: Mapped[Optional[int]] = mapped_column("ParentId", ForeignKey(Declarative1.id))
+        parent: Mapped[Optional[Declarative1]] = relationship()
+
+        __eq__ = sqlalchemy_equals
+
+    retort = Retort(recipe=[accum])
+
+    loader = retort.get_loader(Declarative2)
+    assert (
+        loader({"id": 1, "text": "abc", "parent_id": 100})
+        ==
+        Declarative2(id=1, text="abc", parent_id=100)
+    )
+    assert (
+        loader({"id": 1, "text": "abc", "parent": {"id": 100}})
+        ==
+        Declarative2(id=1, text="abc", parent=Declarative1(id=100))
+    )
+    assert (
+        loader({"id": 1, "text": "abc", "parent_id": 100, "parent": {"id": 100}})
+        ==
+        Declarative2(id=1, text="abc", parent_id=100, parent=Declarative1(id=100))
+    )
+
+    dumper = retort.get_dumper(Declarative2)
+    assert (
+        dumper(Declarative2(id=1, text="abc", parent_id=100))
+        ==
+        {"id": 1, "text": "abc", "parent_id": 100, "parent": None}
+    )
+    assert (
+        dumper(Declarative2(id=1, text="abc", parent=Declarative1(id=100)))
+        ==
+        {"id": 1, "text": "abc", "parent_id": None, "parent": {"id": 100}}
+    )
+    assert (
+        dumper(Declarative2(id=1, text="abc", parent_id=100, parent=Declarative1(id=100)))
+        ==
+        {"id": 1, "text": "abc", "parent_id": 100, "parent": {"id": 100}}
+    )