summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2016-04-06 13:32:10 -0400
committerGerrit Code Review <gerrit2@ln3.zzzcomputing.com>2016-04-06 13:32:10 -0400
commit829bd30834cc0e56c4aa876a074b823d0f87cea9 (patch)
treeb6522ae961240002552143b3539986837dcbf14d /doc
parent34be0bc78183b483444acdf34da1bd6c97ba074a (diff)
parentbef15a950ec4140479bc244f9ca57b5da7c9bb3f (diff)
downloadsqlalchemy-829bd30834cc0e56c4aa876a074b823d0f87cea9.tar.gz
Merge "- don't load deferred columns on unexpire for merge with load=False, fixes #3488"
Diffstat (limited to 'doc')
-rw-r--r--doc/build/changelog/changelog_11.rst8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst
index 18d6d1f74..53bd38a98 100644
--- a/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@ -22,6 +22,14 @@
:version: 1.1.0b1
.. change::
+ :tags: bug, orm
+ :tickets: 3488
+
+ Fixed bug where deferred columns would inadvertently be set up
+ for database load on the next object-wide unexpire, when the object
+ were merged into the session with ``session.merge(obj, load=False)``.
+
+ .. change::
:tags: feature, sql
:pullreq: github:231