]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
- fix loading.py merge_result for new _merge() argument
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 4 Dec 2015 22:31:47 +0000 (17:31 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 4 Dec 2015 22:31:47 +0000 (17:31 -0500)
lib/sqlalchemy/orm/loading.py

index c90308a69341f75109dd07bc1173549a47f26982..b5a62d6b2bdd70c819ae6103d16f24de80b74336 100644 (file)
@@ -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)