- restore non_updating_cascade to test_manytomany_nonpassive, but also

add sane_multi_rowcount requirement, as pg8000 doesn't do "multi" row count.

diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py
index c1cf66f14130df5459f17a2eb71e709f07984afe..d10a3839410e841359f101ca6f307556f622a19f 100644 (file)
--- a/lib/sqlalchemy/orm/dependency.py
+++ b/lib/sqlalchemy/orm/dependency.py
@@ -1119,6 +1119,7 @@ class ManyToManyDP(DependencyProcessor):
                 if c.key in associationrow
             ]))
             result = connection.execute(statement, secondary_update)
+
             if result.supports_sane_multi_rowcount() and \
                     result.rowcount != len(secondary_update):
                 raise exc.StaleDataError(

diff --git a/test/orm/test_naturalpks.py b/test/orm/test_naturalpks.py
index 5a72881a0ff774ac251056eaa5b50653996f43f5..ac5e723c702e6868565818a2ff79b87107d522b1 100644 (file)
--- a/test/orm/test_naturalpks.py
+++ b/test/orm/test_naturalpks.py
@@ -393,6 +393,8 @@ class NaturalPKTest(fixtures.MappedTest):
     def test_manytomany_passive(self):
         self._test_manytomany(True)
 
+    @testing.requires.non_updating_cascade
+    @testing.requires.sane_multi_rowcount
     def test_manytomany_nonpassive(self):
         self._test_manytomany(False)