diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-12-15 14:00:50 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-12-15 14:00:50 -0500 |
| commit | a8ec3491983ed5e68452514b4d52a4347377809f (patch) | |
| tree | 7692578b83a8c6cade1306f389e3e206eef79319 /lib/sqlalchemy/orm | |
| parent | c42725ed54a61d7e5a0931404ee83aa6b94d0aea (diff) | |
| download | sqlalchemy-a8ec3491983ed5e68452514b4d52a4347377809f.tar.gz | |
- Fixed regression caused in 1.0.10 by the fix for :ticket:`3593` where
the check added for a polymorphic joinedload from a
poly_subclass->class->poly_baseclass connection would fail for the
scenario of class->poly_subclass->class.
fixes #3611
Diffstat (limited to 'lib/sqlalchemy/orm')
| -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 |