Ugh, learning to use git-svn, [4884] was not supposed to go upstream. Reverting.

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 38edae5b674ffe05fa3ccd64322ea515dd88fc2b..07caae07af555c467ad835340e1d8573ce960fc9 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1218,8 +1218,6 @@ class Query(object):
         primary_table = context.statement.froms[0]
         
         session = self.session
-        if self._autoflush:
-            session.flush()
         
         if synchronize_session == 'evaluate':
             try:
@@ -1266,8 +1264,6 @@ class Query(object):
         primary_table = context.statement.froms[0]
         
         session = self.session
-        if self._autoflush:
-            session.flush()
         
         if synchronize_session == 'evaluate':
             try:

diff --git a/test/orm/query.py b/test/orm/query.py
index f6bd9013ed84143d61514f2bb6bcc780cbb0ec49..0c274efefdb46659de5efcab28a5d6a00aadac94 100644 (file)
--- a/test/orm/query.py
+++ b/test/orm/query.py
@@ -2310,18 +2310,5 @@ class UpdateDeleteTest(_base.MappedTest):
         eq_([john.age, jack.age, jill.age, jane.age], [25,37,29,27])
         eq_(sess.query(User.age).order_by(User.id).all(), zip([25,37,29,27]))
 
-    @testing.resolve_artifact_names
-    def test_update_changed_attributes(self):
-        sess = create_session(bind=testing.db, autocommit=False)
-        
-        john,jack,jill,jane = sess.query(User).order_by(User.id).all()
-        
-        jack.age = 21
-        
-        sess.query(User).filter(User.age > 29).update({'age': User.age - 10})
-        
-        eq_([john.age, jack.age, jill.age, jane.age], [25,21,29,27])
-        eq_(sess.query(User.age).order_by(User.id).all(), zip([25,21,29,27]))
-
 if __name__ == '__main__':
     testenv.main()