From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 31 Mar 2021 17:55:30 +0000 (-0400)
Subject: repair rowcount test
X-Git-Tag: rel_1_4_5~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f849eebdfed86d8f63ce04059ac09b542ccd7c1b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

repair rowcount test

in 42185a1f3866bfc8ebffa2a6c724fac I pushed a simple rowcount
assertion, forgetting that we have some mssql case where rowcount
is not supported.

Change-Id: I2e86ed9da05723ac5c0929cb8bb156117d581905
---

diff --git a/test/orm/test_update_delete.py b/test/orm/test_update_delete.py
index 7586a1e2e5..f0df420fcf 100644
--- a/test/orm/test_update_delete.py
+++ b/test/orm/test_update_delete.py
@@ -638,7 +638,6 @@ class UpdateDeleteTest(fixtures.MappedTest):
             .values({User.age: User.age - 10})
             .execution_options(synchronize_session="fetch")
         )
-        eq_(result.rowcount, 1)
         eq_([john.age, jack.age, jill.age, jane.age], [25, 27, 29, 27])
         eq_(
             sess.query(User.age).order_by(User.id).all(),
@@ -876,11 +875,10 @@ class UpdateDeleteTest(fixtures.MappedTest):
                 .where(User.age > 29)
                 .values({"age": User.age - 10})
             )
-            result = sess.execute(
+            sess.execute(
                 stmt, execution_options={"synchronize_session": "fetch"}
             )
 
-            eq_(result.rowcount, 2)
             # these are simple values, these are now evaluated even with
             # the "fetch" strategy, new in 1.4, so there is no expiry
             eq_([john.age, jack.age, jill.age, jane.age], [25, 37, 29, 27])
@@ -1164,6 +1162,12 @@ class UpdateDeleteTest(fixtures.MappedTest):
         )
         eq_(rowcount, 2)
 
+        # test future
+        result = sess.execute(
+            update(User).where(User.age > 19).values({"age": User.age - 10})
+        )
+        eq_(result.rowcount, 4)
+
     @testing.fails_if(lambda: not testing.db.dialect.supports_sane_rowcount)
     def test_delete_returns_rowcount(self):
         User = self.classes.User