Make Query.update and Query.delete return the amount of rows matched

1 files changed, 10 insertions, 2 deletions

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 6c20a1fe3..0abf477ad 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1254,6 +1254,8 @@ class Query(object):
           The expression evaluator currently doesn't account for differing string
           collations between the database and Python.
 
+        Returns the number of rows deleted, excluding any cascades.
+
         Warning - this currently doesn't account for any foreign key/relation cascades.
         """
         #TODO: lots of duplication and ifs - probably needs to be refactored to strategies
@@ -1285,7 +1287,7 @@ class Query(object):
 
         if self._autoflush:
             session._autoflush()
-        session.execute(delete_stmt)
+        result = session.execute(delete_stmt)
 
         if synchronize_session == 'evaluate':
             target_cls = self._mapper_zero().class_
@@ -1302,6 +1304,8 @@ class Query(object):
                 if identity_key in session.identity_map:
                     session._remove_newly_deleted(attributes.instance_state(session.identity_map[identity_key]))
 
+        return result.rowcount
+
     def update(self, values, synchronize_session='expire'):
         """Perform a bulk update query.
 
@@ -1327,6 +1331,8 @@ class Query(object):
           The expression evaluator currently doesn't account for differing string
           collations between the database and Python.
 
+        Returns the number of rows matched by the update.
+
         Warning - this currently doesn't account for any foreign key/relation cascades.
         """
 
@@ -1363,7 +1369,7 @@ class Query(object):
 
         if self._autoflush:
             session._autoflush()
-        session.execute(update_stmt)
+        result = session.execute(update_stmt)
 
         if synchronize_session == 'evaluate':
             target_cls = self._mapper_zero().class_
@@ -1392,6 +1398,8 @@ class Query(object):
                 if identity_key in session.identity_map:
                     session.expire(session.identity_map[identity_key], values.keys())
 
+        return result.rowcount
+
 
     def _compile_context(self, labels=True):
         context = QueryContext(self)