diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-12-04 17:31:47 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-12-04 17:31:47 -0500 |
| commit | 012f3852bf0356c30eabab06c81f6c35a8fa1d89 (patch) | |
| tree | 612bba5c9d0a1d4a821abccefaa8c302815a3f1e /lib/sqlalchemy/orm/loading.py | |
| parent | 3ec9b9f6b601b8ef69d4978c7182e8efedefd191 (diff) | |
| download | sqlalchemy-012f3852bf0356c30eabab06c81f6c35a8fa1d89.tar.gz | |
- fix loading.py merge_result for new _merge() argument
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 c90308a69..b5a62d6b2 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) |