summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/strategies.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index 7cee5a79f..ace82871f 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -1368,8 +1368,8 @@ class JoinedLoader(AbstractRelationshipLoader):
# name on it.
efm = inspect(adapter.aliased_class).\
_entity_for_mapper(
- parentmapper
- if parentmapper.isa(self.parent) else self.parent)
+ localparent
+ if localparent.isa(self.parent) else self.parent)
# look for our attribute on the adapted entity, else fall back
# to our straight property