diff options
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 4 | ||||
| -rw-r--r-- | test/orm/inheritance/polymorph.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index dd7fa638e..83065a73d 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -929,8 +929,10 @@ class Query(object): # be adapted to be relative to the user-supplied selectable. adapt_criterion = self.table not in self._get_joinable_tables() + # adapt for poylmorphic mapper + # TODO: generalize the polymorphic mapper adaption to that of the select_from() adaption if not adapt_criterion and whereclause is not None and (self.mapper is not self.select_mapper): - whereclause = sql_util.ClauseAdapter(from_obj).traverse(whereclause) + whereclause = sql_util.ClauseAdapter(from_obj, equivalents=self.select_mapper._get_equivalent_columns()).traverse(whereclause) # TODO: mappers added via add_entity(), adapt their queries also, # if those mappers are polymorphic diff --git a/test/orm/inheritance/polymorph.py b/test/orm/inheritance/polymorph.py index e45a11a54..f9ac6199c 100644 --- a/test/orm/inheritance/polymorph.py +++ b/test/orm/inheritance/polymorph.py @@ -269,6 +269,10 @@ def generate_round_trip_test(include_base=False, lazy_relation=True, redefine_co assert getattr(dilbert, person_attribute_name) == 'dilbert' session.clear() + dilbert = session.query(Person).filter(Person.person_id==dilbert.person_id).one() + assert getattr(dilbert, person_attribute_name) == 'dilbert' + session.clear() + id = c.company_id def go(): c = session.query(Company).get(id) |