summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2018-02-23 15:14:46 -0500
committerGerrit Code Review <gerrit@ci.zzzcomputing.com>2018-02-23 15:14:46 -0500
commita10bc4fdaa8ff95a2b7930622cb76a1aa07806f1 (patch)
tree2de4dabd1188726ed969a1ea746d6121227626d9 /lib/sqlalchemy
parent41c6b5424355a3b173dd7ca7b5143ce8616a646f (diff)
parent3859256312c8114ca7104f59c90f68623893a630 (diff)
downloadsqlalchemy-a10bc4fdaa8ff95a2b7930622cb76a1aa07806f1.tar.gz
Merge "Ensure we have states to load when doing poly post load"
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/loading.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py
index 2544f7f99..2628093e0 100644
--- a/lib/sqlalchemy/orm/loading.py
+++ b/lib/sqlalchemy/orm/loading.py
@@ -755,8 +755,8 @@ class PostLoad(object):
in self.states.items()
if state.manager.mapper.isa(limit_to_mapper)
]
- loader(
- context, path, states, self.load_keys, *arg, **kw)
+ if states:
+ loader(context, path, states, self.load_keys, *arg, **kw)
self.states.clear()
@classmethod