diff options
Diffstat (limited to 'lib/sqlalchemy/orm/mapper.py')
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 2d3bceb92..2a227f9da 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -1911,7 +1911,7 @@ class Mapper( self.columns.add(col, key) - for col in prop.columns + prop._orig_columns: + for col in prop.columns: for proxy_col in col.proxy_set: self._columntoproperty[proxy_col] = prop @@ -2260,9 +2260,9 @@ class Mapper( @HasMemoized.memoized_attribute def _single_table_criterion(self): if self.single and self.inherits and self.polymorphic_on is not None: - return self.polymorphic_on._annotate({"parentmapper": self}).in_( - [m.polymorphic_identity for m in self.self_and_descendants] - ) + return self.polymorphic_on._annotate( + {"parententity": self, "parentmapper": self} + ).in_([m.polymorphic_identity for m in self.self_and_descendants]) else: return None |