git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit

]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit

projects / thirdparty / sqlalchemy / sqlalchemy.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 7009a3b) | patch

author	Mike Bayer <mike_mp@zzzcomputing.com>
	Sat, 8 May 2010 20:09:48 +0000 (16:09 -0400)
committer	Mike Bayer <mike_mp@zzzcomputing.com>
	Sat, 8 May 2010 20:09:48 +0000 (16:09 -0400)
commit	6ea6673376609ce6a5e26f9f20425cffee96bcd8
tree	937024d0317d18d6fdffbbca7ee32b2449162242	tree \| snapshot
parent	7009a3bc32daadf078e2806622615c665105240e	commit \| diff

- session.merge() will not expire attributes on the returned
instance if that instance is "pending". [ticket:1789]

CHANGES		diff \| blob \| blame \| history
lib/sqlalchemy/orm/dynamic.py		diff \| blob \| blame \| history
lib/sqlalchemy/orm/mapper.py		diff \| blob \| blame \| history
lib/sqlalchemy/orm/properties.py		diff \| blob \| blame \| history
lib/sqlalchemy/orm/session.py		diff \| blob \| blame \| history
lib/sqlalchemy/orm/state.py		diff \| blob \| blame \| history
lib/sqlalchemy/orm/strategies.py		diff \| blob \| blame \| history
lib/sqlalchemy/orm/util.py		diff \| blob \| blame \| history
test/orm/test_merge.py		diff \| blob \| blame \| history

Mirror of https://github.com/sqlalchemy/sqlalchemy.git