mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-10-01 11:49:51 -04:00
really fix queries to work with Postgres
(by going back to not using SQL directly)
This commit is contained in:
parent
430ea08186
commit
73b26f827c
@ -601,11 +601,11 @@ class DeviceStore(DeviceWorkerStore, BackgroundUpdateStore):
|
||||
Returns:
|
||||
defer.Deferred
|
||||
"""
|
||||
sql = """
|
||||
DELETE FROM devices
|
||||
WHERE user_id = ? AND device_id = ? AND hidden = ?
|
||||
"""
|
||||
yield self._execute("delete_device", None, sql, user_id, device_id, False)
|
||||
yield self._simple_delete_one(
|
||||
table="devices",
|
||||
keyvalues={"user_id": user_id, "device_id": device_id, "hidden": False},
|
||||
desc="delete_device",
|
||||
)
|
||||
|
||||
self.device_id_exists_cache.invalidate((user_id, device_id))
|
||||
|
||||
@ -619,21 +619,13 @@ class DeviceStore(DeviceWorkerStore, BackgroundUpdateStore):
|
||||
Returns:
|
||||
defer.Deferred
|
||||
"""
|
||||
|
||||
if not device_ids or len(device_ids) == 0:
|
||||
return
|
||||
sql = """
|
||||
DELETE FROM devices
|
||||
WHERE user_id = ? AND device_id IN (%s) AND hidden = ?
|
||||
""" % (
|
||||
",".join("?" for _ in device_ids)
|
||||
yield self._simple_delete_many(
|
||||
table="devices",
|
||||
column="device_id",
|
||||
iterable=device_ids,
|
||||
keyvalues={"user_id": user_id, "hidden": False},
|
||||
desc="delete_devices",
|
||||
)
|
||||
values = [user_id]
|
||||
values.extend(device_ids)
|
||||
values.append(False)
|
||||
|
||||
yield self._execute("delete_devices", None, sql, *values)
|
||||
|
||||
for device_id in device_ids:
|
||||
self.device_id_exists_cache.invalidate((user_id, device_id))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user