summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/loading.py
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2021-02-12 17:10:21 +0000
committerGerrit Code Review <gerrit@ci3.zzzcomputing.com>2021-02-12 17:10:21 +0000
commit4aa0c7ae76894048c5c30c89c403c7cbf5d844ff (patch)
tree59ca106bf70bf526a5c12873613561ecb2a0a2f5 /lib/sqlalchemy/orm/loading.py
parent88b881f12c3a4db3f7f8b58b95c5dcec16ab893e (diff)
parent553ac45aae5712e64a5380ba1fa1c6028acf5f39 (diff)
downloadsqlalchemy-4aa0c7ae76894048c5c30c89c403c7cbf5d844ff.tar.gz
Merge "Apply consistent labeling for all future style ORM queries"
Diffstat (limited to 'lib/sqlalchemy/orm/loading.py')
-rw-r--r--lib/sqlalchemy/orm/loading.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py
index a63a4236d..24751bf1d 100644
--- a/lib/sqlalchemy/orm/loading.py
+++ b/lib/sqlalchemy/orm/loading.py
@@ -252,7 +252,9 @@ def merge_result(query, iterator, load=True):
else:
frozen_result = None
- ctx = querycontext.ORMSelectCompileState._create_entities_collection(query)
+ ctx = querycontext.ORMSelectCompileState._create_entities_collection(
+ query, True
+ )
autoflush = session.autoflush
try: