]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
- don't load deferred columns on unexpire for merge with load=False,
authorDiana Clarke <diana.joan.clarke@gmail.com>
Tue, 5 Apr 2016 22:58:21 +0000 (18:58 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Wed, 6 Apr 2016 17:28:25 +0000 (13:28 -0400)
commitbef15a950ec4140479bc244f9ca57b5da7c9bb3f
tree79ed72593990bb7ba482fabed575aaa8acbd815b
parentfdb6ab6a1d5d55d900c388e039835c6433032977
- don't load deferred columns on unexpire for merge with load=False,
fixes #3488

Change-Id: Ic9577b800e4a4e2465ec7f3a2e95bd231f5337ee
Co-Authored-By: Mike Bayer <mike_mp@zzzcomputing.com>
doc/build/changelog/changelog_11.rst
lib/sqlalchemy/orm/properties.py
lib/sqlalchemy/orm/session.py
lib/sqlalchemy/orm/state.py
test/orm/test_merge.py