]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
- The :meth:`.Session.merge` method now tracks pending objects by
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 4 Dec 2015 16:52:16 +0000 (11:52 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 4 Dec 2015 16:52:16 +0000 (11:52 -0500)
commit3ec9b9f6b601b8ef69d4978c7182e8efedefd191
treefded91038e426b974d141f2a4e4be714a18d0ae2
parent935bc34dc50d5e4bdf181a8287d6e4cdbde073d0
- 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
doc/build/changelog/changelog_11.rst
doc/build/changelog/migration_11.rst
lib/sqlalchemy/orm/interfaces.py
lib/sqlalchemy/orm/properties.py
lib/sqlalchemy/orm/relationships.py
lib/sqlalchemy/orm/session.py
test/orm/test_merge.py