diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2017-01-09 17:42:03 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@awstats.zzzcomputing.com> | 2017-01-09 17:42:03 -0500 |
| commit | e251f64d686ca62a338c53d40ca72bf7a3cc82cd (patch) | |
| tree | bf919f174ac12880d9a4e3b78a298779a40e3f45 /lib | |
| parent | e6eefc0c5e946f10cb31264d71d6f1987a3f96e8 (diff) | |
| parent | 51a72503b0279ca71ee6f0454bfd36a4c84d508f (diff) | |
| download | sqlalchemy-e251f64d686ca62a338c53d40ca72bf7a3cc82cd.tar.gz | |
Merge "Adapt from "localparent" in joinedloader"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 4 |
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 |