From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 12 Nov 2012 17:44:42 +0000 (-0500)
Subject: Fixed regression where query.update() would produce
X-Git-Tag: rel_0_8_0b2~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9dd08c2eca8ed250e3a36dcb6a9aa20693d324be;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fixed regression where query.update() would produce
an error if an object matched by the "fetch"
synchronization strategy wasn't locally present.
Courtesy Scott Torborg. [ticket:2602]
---

diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index 7f1b1d0fdc..0d552d5463 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -6,6 +6,15 @@
 .. changelog::
     :version: 0.8.0b2
 
+    .. change::
+        :tags: orm, bug
+        :tickets: 2602
+
+        Fixed regression where query.update() would produce
+        an error if an object matched by the "fetch"
+        synchronization strategy wasn't locally present.
+        Courtesy Scott Torborg.
+
     .. change::
         :tags: sql, bug
         :tickets: 2597
diff --git a/test/orm/test_update_delete.py b/test/orm/test_update_delete.py
index eb0767a8af..65d69538e7 100644
--- a/test/orm/test_update_delete.py
+++ b/test/orm/test_update_delete.py
@@ -233,7 +233,7 @@ class UpdateDeleteTest(fixtures.MappedTest):
 
         sess.query(User).filter(User.id == 3).\
                 update({'age': 44}, synchronize_session='fetch')
-        eq_(sess.query(User.age).order_by(User.id).all(), zip([25,37,44,27]))
+        eq_(sess.query(User.age).order_by(User.id).all(), zip([25,47,44,37]))
 
     def test_update_changes_resets_dirty(self):
         User = self.classes.User