diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2023-02-05 22:57:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2023-02-05 22:57:05 +0000 |
| commit | 44da56e573a1404dae48e6025b6fdb042bfc231c (patch) | |
| tree | 770648b06724c41d804e6346741d25840338e6af /lib/sqlalchemy/orm/decl_base.py | |
| parent | af24660a963c84998d102fb504742d05a9c15146 (diff) | |
| parent | 4b51e9a7eeeb219e031e7df235ae3c62f38d331b (diff) | |
| download | sqlalchemy-44da56e573a1404dae48e6025b6fdb042bfc231c.tar.gz | |
Merge "coerce elements in mapper.primary_key, process in __mapper_args__" into main
Diffstat (limited to 'lib/sqlalchemy/orm/decl_base.py')
| -rw-r--r-- | lib/sqlalchemy/orm/decl_base.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/decl_base.py b/lib/sqlalchemy/orm/decl_base.py index 26e25b4e1..aeed9b439 100644 --- a/lib/sqlalchemy/orm/decl_base.py +++ b/lib/sqlalchemy/orm/decl_base.py @@ -1743,6 +1743,12 @@ class _ClassScanMapperConfig(_MapperConfig): v = mapper_args[k] mapper_args[k] = self.column_copies.get(v, v) + if "primary_key" in mapper_args: + mapper_args["primary_key"] = [ + self.column_copies.get(v, v) + for v in util.to_list(mapper_args["primary_key"]) + ] + if "inherits" in mapper_args: inherits_arg = mapper_args["inherits"] if isinstance(inherits_arg, Mapper): |