diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2021-04-07 16:07:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2021-04-07 16:07:08 +0000 |
| commit | de72737987e6b9757e6b2fe5bea07bb110356ce8 (patch) | |
| tree | ed40cf5984549c8b115afbad4024a80ced12dabe /lib/sqlalchemy | |
| parent | 57e46cde849d3d35e4e97e953ce29ee8bcc138a7 (diff) | |
| parent | abcb9dc2734b5dd01d2f3115393d6f76e0da5411 (diff) | |
| download | sqlalchemy-de72737987e6b9757e6b2fe5bea07bb110356ce8.tar.gz | |
Merge "Add test support for merge_frozen_result"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/loading.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py index 9dcaca0ea..0dc92daf5 100644 --- a/lib/sqlalchemy/orm/loading.py +++ b/lib/sqlalchemy/orm/loading.py @@ -201,7 +201,7 @@ def merge_frozen_result(session, statement, frozen_result, load=True): session._autoflush() ctx = querycontext.ORMSelectCompileState._create_entities_collection( - statement + statement, legacy=False ) autoflush = session.autoflush @@ -262,7 +262,7 @@ def merge_result(query, iterator, load=True): frozen_result = None ctx = querycontext.ORMSelectCompileState._create_entities_collection( - query, True + query, legacy=True ) autoflush = session.autoflush |