summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-07-25 19:15:11 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-07-25 19:15:11 -0400
commit306047c006336ce7d4b33e12236a12c985bdb8e2 (patch)
treeea61774bd5d1b7d421aeeb5a0cbb69be23301d31 /lib/sqlalchemy
parent9e6624c0496e22ec1139e0fb54cfefc14f660352 (diff)
parent54d086253e9bf31fa4d3764e9ff3a593b3c9c28e (diff)
downloadsqlalchemy-306047c006336ce7d4b33e12236a12c985bdb8e2.tar.gz
Merge branch 'master' into xdist_poc
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/dependency.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py
index c1cf66f14..d10a38394 100644
--- 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(