summary refs log tree commit diff
path: root/synapse/storage/_base.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-06-11 10:37:07 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-06-11 10:55:53 +0100
commit3c8262b181489c1f2f7a4de50c9171b0239edd17 (patch)
tree54ce2c87d121a6f96209d229633d110c95125486 /synapse/storage/_base.py
parentMerge branch 'babolivier/account_validity_send_mail_auth' into dinsic (diff)
parent0.99.5.2 (diff)
downloadsynapse-3c8262b181489c1f2f7a4de50c9171b0239edd17.tar.xz
Merge branch 'master' into dinsic
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r--synapse/storage/_base.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py

index 086318a530..52891bb9eb 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py
@@ -1279,7 +1279,8 @@ class SQLBaseStore(object): " AND ".join("%s = ?" % (k,) for k in keyvalues), ) - return txn.execute(sql, list(keyvalues.values())) + txn.execute(sql, list(keyvalues.values())) + return txn.rowcount def _simple_delete_many(self, table, column, iterable, keyvalues, desc): return self.runInteraction( @@ -1298,9 +1299,12 @@ class SQLBaseStore(object): column : column name to test for inclusion against `iterable` iterable : list keyvalues : dict of column names and values to select the rows with + + Returns: + int: Number rows deleted """ if not iterable: - return + return 0 sql = "DELETE FROM %s" % table @@ -1315,7 +1319,9 @@ class SQLBaseStore(object): if clauses: sql = "%s WHERE %s" % (sql, " AND ".join(clauses)) - return txn.execute(sql, values) + txn.execute(sql, values) + + return txn.rowcount def _get_cache_dict( self, db_conn, table, entity_column, stream_column, max_value, limit=100000