From 012f3852bf0356c30eabab06c81f6c35a8fa1d89 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 4 Dec 2015 17:31:47 -0500 Subject: [PATCH] - fix loading.py merge_result for new _merge() argument --- lib/sqlalchemy/orm/loading.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py index c90308a693..b5a62d6b2b 100644 --- a/lib/sqlalchemy/orm/loading.py +++ b/lib/sqlalchemy/orm/loading.py @@ -108,7 +108,7 @@ def merge_result(querylib, query, iterator, load=True): result = [session._merge( attributes.instance_state(instance), attributes.instance_dict(instance), - load=load, _recursive={}) + load=load, _recursive={}, _resolve_conflict_map={}) for instance in iterator] else: result = list(iterator) @@ -125,7 +125,7 @@ def merge_result(querylib, query, iterator, load=True): newrow[i] = session._merge( attributes.instance_state(newrow[i]), attributes.instance_dict(newrow[i]), - load=load, _recursive={}) + load=load, _recursive={}, _resolve_conflict_map={}) result.append(keyed_tuple(newrow)) return iter(result) -- 2.47.3