From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 19 Oct 2015 18:21:56 +0000 (-0400)
Subject: - adjust 4f54607923a11669961b53f where we still allow_multirow as long
X-Git-Tag: rel_1_1_0b1~84^2~70^2~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e9a81a19e9ba0502067665f3d2729bcd6b9447e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- adjust 4f54607923a11669961b53f where we still allow_multirow as long
as versioning isn't needed, fixes test_unitofworkv2->test_update_multi_missing_broken_multi_rowcount
---

diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py
index 71d62c79b7..1f9d0a2352 100644
--- a/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@ -645,7 +645,7 @@ def _emit_update_statements(base_mapper, uowtransaction,
         assert_singlerow = connection.dialect.supports_sane_rowcount
         assert_multirow = assert_singlerow and \
             connection.dialect.supports_sane_multi_rowcount
-        allow_multirow = assert_multirow and not needs_version_id
+        allow_multirow = not needs_version_id
 
         if hasvalue:
             for state, state_dict, params, mapper, \