Merged Alias Changes

Author: gravy-jones-locker

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ exclude: '^docs/conf.py'
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.3.0
+  rev: v4.4.0
   hooks:
   - id: trailing-whitespace
   - id: check-added-large-files
@@ -28,7 +28,7 @@ repos:
 #       --remove-unused-variables,
 #     ]
 - repo: https://github.com/hadialqattan/pycln
-  rev: v2.1.1
+  rev: v2.1.3
   hooks:
     - id: pycln
       args: [--config=setup.cfg]
@@ -39,7 +39,7 @@ repos:
   - id: isort
 
 - repo: https://github.com/psf/black
-  rev: 22.8.0
+  rev: 23.3.0
   hooks:
   - id: black
     language_version: python3
@@ -52,7 +52,7 @@ repos:
 #     additional_dependencies: [black]
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 5.0.4
+  rev: 6.0.0
   hooks:
   - id: flake8
   ## You can add flake8 plugins via `additional_dependencies`:

src/strawberry_sqlalchemy_mapper/loader.py

@@ -39,7 +39,11 @@ async def load_fn(keys: List[Tuple]) -> List[Any]:
                 def group_by_remote_key(row: Any) -> Tuple:
                     return tuple(
                         [
-                            getattr(row, remote.key)
+                            [
+                                getattr(row, k)
+                                for k, column in row.__mapper__.c.items()
+                                if remote.key == column.key
+                            ][0]
                             for _, remote in relationship.local_remote_pairs
                         ]
                     )

src/strawberry_sqlalchemy_mapper/mapper.py

@@ -413,7 +413,11 @@ async def resolve(self, info: Info):
             else:
                 relationship_key = tuple(
                     [
-                        getattr(self, local.key)
+                        [
+                            getattr(self, k)
+                            for k, column in self.__mapper__.c.items()
+                            if local.key == column.key
+                        ][0]
                         for local, _ in relationship.local_remote_pairs
                     ]
                 )