diff options
Diffstat (limited to 'lib/sqlalchemy/orm/strategies.py')
-rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index 21152e304..b60e47bb3 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -1330,7 +1330,9 @@ class JoinedLoader(AbstractRelationshipLoader): # specific mapper's entity before looking for our attribute # name on it. efm = inspect(adapter.aliased_class).\ - _entity_for_mapper(self.parent) + _entity_for_mapper( + parentmapper + if parentmapper.isa(self.parent) else self.parent) # look for our attribute on the adapted entity, else fall back # to our straight property |