diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2023-02-18 09:10:20 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2023-02-18 09:11:36 -0500 |
| commit | ebcb80be9ce27d9cd383dc7c0750569c43587df2 (patch) | |
| tree | 4e8ab4d2c0df8a2cedf6a20b17070beb29e10dff /lib/sqlalchemy/orm | |
| parent | c6ecc39b62b41c4f21375a51bac582c61baa3d9d (diff) | |
| download | sqlalchemy-ebcb80be9ce27d9cd383dc7c0750569c43587df2.tar.gz | |
consider column.name directly when evaluating use_existing_column
Fixed issue where new :paramref:`_orm.mapped_column.use_existing_column`
feature would not work if the two same-named columns were mapped under
attribute names that were differently-named from the explicit name given to
the column itself. The attribute names can now be differently named when
using this parameter.
Fixes: #9332
Change-Id: I43716b8ca2b089e54a2b078db28b6c4770468bdd
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/properties.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py index e736e4fd2..a5f34f3de 100644 --- a/lib/sqlalchemy/orm/properties.py +++ b/lib/sqlalchemy/orm/properties.py @@ -663,8 +663,9 @@ class MappedColumn( ) supercls_mapper = class_mapper(decl_scan.inherits, False) + colname = column.name if column.name is not None else key column = self.column = supercls_mapper.local_table.c.get( # type: ignore # noqa: E501 - key, column + colname, column ) if column.key is None: |