Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SYN-367: Use upsert rather than insert_or_replace

This commit is contained in:
Mark Haines 2015-04-30 15:21:31 +01:00
parent 2366d28780
commit 29400b45b9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/storage/keys.py
View File

@ -137,8 +137,13 @@ class KeyStore(SQLBaseStore):
ts_valid_until_ms (int): The time when this json stops being valid. ts_valid_until_ms (int): The time when this json stops being valid.
key_json (bytes): The encoded JSON. key_json (bytes): The encoded JSON.
""" """
return self._simple_insert( return self._simple_upsert(
table="server_keys_json", table="server_keys_json",
keyvalues={
"server_name": server_name,
"key_id": key_id,
"from_server": from_server,
},
values={ values={
"server_name": server_name, "server_name": server_name,
"key_id": key_id, "key_id": key_id,
@ -147,7 +152,6 @@ class KeyStore(SQLBaseStore):
"ts_valid_until_ms": ts_expires_ms, "ts_valid_until_ms": ts_expires_ms,
"key_json": buffer(key_json_bytes), "key_json": buffer(key_json_bytes),
}, },
or_replace=True,
) )
def get_server_keys_json(self, server_keys): def get_server_keys_json(self, server_keys):