diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2017-04-10 14:59:14 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@awstats.zzzcomputing.com> | 2017-04-10 14:59:14 -0400 |
| commit | 5b81dbcfa3888de65fc33b247353b38488199b00 (patch) | |
| tree | ad184ab166e1b41d400cb809e164d583f0eaf493 /lib/sqlalchemy | |
| parent | 7d9f241d63b76cf3d4a5f1c146554cd9dc140656 (diff) | |
| parent | 86c43d2e0f0c7c28b933f470678571077c5d5035 (diff) | |
| download | sqlalchemy-5b81dbcfa3888de65fc33b247353b38488199b00.tar.gz | |
Merge "Compare entities also on chop_path"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/strategy_options.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py index bae2b73e2..60ed2be30 100644 --- a/lib/sqlalchemy/orm/strategy_options.py +++ b/lib/sqlalchemy/orm/strategy_options.py @@ -376,7 +376,8 @@ class _UnboundLoad(Load): _WILDCARD_TOKEN,) and c_token != p_prop.key: return None elif isinstance(c_token, PropComparator): - if c_token.property is not p_prop: + if c_token.property is not p_prop or \ + c_token._parententity is not p_mapper: return None else: i += 1 |