diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-12-04 11:52:16 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-12-04 11:52:16 -0500 |
| commit | 3ec9b9f6b601b8ef69d4978c7182e8efedefd191 (patch) | |
| tree | fded91038e426b974d141f2a4e4be714a18d0ae2 /lib/sqlalchemy/orm/interfaces.py | |
| parent | 935bc34dc50d5e4bdf181a8287d6e4cdbde073d0 (diff) | |
| download | sqlalchemy-3ec9b9f6b601b8ef69d4978c7182e8efedefd191.tar.gz | |
- The :meth:`.Session.merge` method now tracks pending objects by
primary key before emitting an INSERT, and merges distinct objects with
duplicate primary keys together as they are encountered, which is
essentially semi-deterministic at best. This behavior
matches what happens already with persistent objects.
fixes #3601
Diffstat (limited to 'lib/sqlalchemy/orm/interfaces.py')
| -rw-r--r-- | lib/sqlalchemy/orm/interfaces.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py index cd4a0116d..ed8f27332 100644 --- a/lib/sqlalchemy/orm/interfaces.py +++ b/lib/sqlalchemy/orm/interfaces.py @@ -234,7 +234,7 @@ class MapperProperty(_MappedAttribute, InspectionAttr, util.MemoizedSlots): """ def merge(self, session, source_state, source_dict, dest_state, - dest_dict, load, _recursive): + dest_dict, load, _recursive, _resolve_conflict_map): """Merge the attribute represented by this ``MapperProperty`` from source to destination object. |