From 51a72503b0279ca71ee6f0454bfd36a4c84d508f Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 9 Jan 2017 14:16:22 -0500 Subject: Adapt from "localparent" in joinedloader Fixed bug involving joined eager loading against multiple entities when polymorphic inheritance is also in use which would throw "'NoneType' object has no attribute 'isa'". The issue was introduced by the fix for :ticket:`3611`. Change-Id: I296ecda38c01ec8f69dcd843beaebed6949cecfa Fixes: #3884 --- lib/sqlalchemy/orm/strategies.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/orm/strategies.py') diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index 33feab0dc..273ec1280 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 -- cgit v1.2.1