diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-05-19 19:40:13 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-05-19 19:40:13 -0400 |
| commit | 1e1904f8680937e42497995bab42d39a4045148f (patch) | |
| tree | 3d61deddeff334d434675b1eb225b73998e994d7 | |
| parent | fbd75af4a7e80a33dcba87592768d6622a54bfba (diff) | |
| download | sqlalchemy-1e1904f8680937e42497995bab42d39a4045148f.tar.gz | |
fix logic here broken by the change for enable_relationship_loading
| -rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index e1f838793..70e06723a 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -448,10 +448,14 @@ class LazyLoader(AbstractRelationshipLoader): return criterion def _load_for_state(self, state, passive): - if not state.session_id or \ - not state.key and \ - not self.parent_property.load_on_pending and \ - not state._load_pending: + if not state.key and \ + ( + ( + not self.parent_property.load_on_pending + and not state._load_pending + ) + or not state.session_id + ): return attributes.ATTR_EMPTY pending = not state.key |
