diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-04-07 10:40:14 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-04-07 10:41:00 -0400 |
| commit | abcb9dc2734b5dd01d2f3115393d6f76e0da5411 (patch) | |
| tree | 9c04ebb5631243c0702b745cea905b8e7cbec4f9 /lib/sqlalchemy/orm/loading.py | |
| parent | d1847bbe268d48d34f4781b317ac8e6bf13d44bd (diff) | |
| download | sqlalchemy-abcb9dc2734b5dd01d2f3115393d6f76e0da5411.tar.gz | |
Add test support for merge_frozen_result
Fixed regression where the :func:`_orm.merge_frozen_result` function relied
upon by the dogpile.caching example was not included in tests and began
failing due to incorrect internal arguments.
Fixes: #6211
Change-Id: I0b53d0f569c817994ad4827a3ddb1626fd2d082f
Diffstat (limited to 'lib/sqlalchemy/orm/loading.py')
| -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 |