]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
- merge -r6534 of trunk, for [ticket:1618]
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 7 Dec 2009 22:51:19 +0000 (22:51 +0000)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 7 Dec 2009 22:51:19 +0000 (22:51 +0000)
commit699d77958239d299812af57aa3ba9e7fd7a5ac88
tree2a9ab1e6dd28b51424ddd2c0b6343663e7a3f6c9
parent52d2e67edbbe6e05df04b18f3a47fac33ede3970
- merge -r6534 of trunk, for [ticket:1618]
- backported 0.6's approach to "null pks allowed" in mapper._instance_processor
CHANGES
lib/sqlalchemy/orm/mapper.py
lib/sqlalchemy/orm/session.py
test/orm/test_merge.py