- Fixed bug in query.update() when passing Cls.attribute

as keys in the value dict and using synchronize_session='expire'.
[ticket:1436]

diff --git a/CHANGES b/CHANGES
index 525a9112f26f6aaa65da1acdea06fff99a4ce8de..3cee14b5af416b9abe3205a2e002c332287a872e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -59,6 +59,10 @@ CHANGES
       combinations of reflected and non-reflected types to work
       with 0.5 style type reflection, such as PGText/Text (note 0.6 
       reflects types as their generic versions).   [ticket:1556]
+    
+    - Fixed bug in query.update() when passing Cls.attribute
+      as keys in the value dict and using synchronize_session='expire'.
+      [ticket:1436]
       
 - sql
     - Fixed bug in two-phase transaction whereby commit() method

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index a3c78940b49dbe5809f3b6290a81cfce9ff3d0c4..e9677b8c910c6423f89a8d02f06e2ba1b6b4ffde 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1783,7 +1783,7 @@ class Query(object):
             for primary_key in matched_rows:
                 identity_key = target_mapper.identity_key_from_primary_key(list(primary_key))
                 if identity_key in session.identity_map:
-                    session.expire(session.identity_map[identity_key], values.keys())
+                    session.expire(session.identity_map[identity_key], [expression._column_as_key(k) for k in values])
 
         for ext in session.extensions:
             ext.after_bulk_update(session, self, context, result)

diff --git a/test/orm/test_query.py b/test/orm/test_query.py
index c7dce9332e0b2d8e6ed1a67b8f9f9aacf5b44ffa..529f7bb849ec95710db26ba7372249c4aad08193 100644 (file)
--- a/test/orm/test_query.py
+++ b/test/orm/test_query.py
@@ -2967,6 +2967,10 @@ class UpdateDeleteTest(_base.MappedTest):
         eq_([john.age, jack.age, jill.age, jane.age], [25,27,19,27])
         eq_(sess.query(User.age).order_by(User.id).all(), zip([25,27,19,27]))
 
+        sess.query(User).filter(User.age == 25).update({User.age: User.age - 10}, synchronize_session='expire')
+        eq_([john.age, jack.age, jill.age, jane.age], [15,27,19,27])
+        eq_(sess.query(User.age).order_by(User.id).all(), zip([15,27,19,27]))
+
 
     @testing.resolve_artifact_names
     def test_update_with_bindparams(self):