summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/strategies.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/orm/strategies.py')
-rw-r--r--lib/sqlalchemy/orm/strategies.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index bd9b02d24..2c18e8129 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -536,9 +536,10 @@ class LazyLoader(AbstractRelationshipLoader):
pending = not state.key
# don't autoflush on pending
- if pending:
+ if pending or passive & attributes.NO_AUTOFLUSH:
q = q.autoflush(False)
+
if state.load_path:
q = q._with_current_path(state.load_path[self.parent_property])
@@ -568,6 +569,7 @@ class LazyLoader(AbstractRelationshipLoader):
q = q.filter(lazy_clause)
+
result = q.all()
if self.uselist:
return result