summary refs log tree commit diff
path: root/synapse/storage/databases/main/devices.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:29:36 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:29:36 +0100
commit19dc9ec9a14e0075ceb79ca6f7eb30eee3e351ca (patch)
treeef7c4d507e5530df3444962d933f7f571cc20bfc /synapse/storage/databases/main/devices.py
parentMerge commit '2506074ef' into anoa/dinsic_release_1_31_0 (diff)
parentMerge remote-tracking branch 'origin/release-v1.26.0' into develop (diff)
downloadsynapse-19dc9ec9a14e0075ceb79ca6f7eb30eee3e351ca.tar.xz
Merge commit '939ef657c' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'synapse/storage/databases/main/devices.py')
-rw-r--r--synapse/storage/databases/main/devices.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/databases/main/devices.py b/synapse/storage/databases/main/devices.py

index 9097677648..659d8f245f 100644 --- a/synapse/storage/databases/main/devices.py +++ b/synapse/storage/databases/main/devices.py
@@ -897,7 +897,7 @@ class DeviceWorkerStore(SQLBaseStore): DELETE FROM device_lists_outbound_last_success WHERE destination = ? AND user_id = ? """ - txn.executemany(sql, ((row[0], row[1]) for row in rows)) + txn.execute_batch(sql, ((row[0], row[1]) for row in rows)) logger.info("Pruned %d device list outbound pokes", count) @@ -1343,7 +1343,7 @@ class DeviceStore(DeviceWorkerStore, DeviceBackgroundUpdateStore): # Delete older entries in the table, as we really only care about # when the latest change happened. - txn.executemany( + txn.execute_batch( """ DELETE FROM device_lists_stream WHERE user_id = ? AND device_id = ? AND stream_id < ?