From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 4 Dec 2015 22:31:47 +0000 (-0500)
Subject: - fix loading.py merge_result for new _merge() argument
X-Git-Tag: rel_1_1_0b1~84^2~70^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=012f3852bf0356c30eabab06c81f6c35a8fa1d89;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- fix loading.py merge_result for new _merge() argument
---

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)