diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-01-15 19:04:50 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-01-15 19:04:50 +0000 |
| commit | f72378137a855098c4f0c1c830e3b244634cbd84 (patch) | |
| tree | ea8f3dc70cacad1a41b675dc2661585c79ab0afe /lib/sqlalchemy/orm/query.py | |
| parent | 6e6b13b945299aede8bade024403d74af43279db (diff) | |
| download | sqlalchemy-f72378137a855098c4f0c1c830e3b244634cbd84.tar.gz | |
restore common_parent logic in correspoinds_to, fixes [ticket:1657]
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index fc83f9195..7be068019 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -2038,10 +2038,10 @@ class _MapperEntity(_QueryEntity): self.adapter = query._get_polymorphic_adapter(self, from_obj) def corresponds_to(self, entity): - if _is_aliased_class(entity): + if _is_aliased_class(entity) or self.is_aliased_class: return entity is self.path_entity else: - return entity.isa(self.path_entity) + return entity.common_parent(self.path_entity) def adapt_to_selectable(self, query, sel): query._entities.append(self) |