Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-08-03 14:04:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix idiocies and so make tests pass

Browse source
This commit is contained in:
Matthew Hodgson 2017-12-31 14:35:25 +00:00 • committed by Hubert Chathi
parent 174be586e5
commit 15d513f16f
3 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/storage/e2e_room_keys.py
View file

@ -207,6 +207,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
this_version = version
return self._simple_select_one_txn(
txn,
table="e2e_room_keys_versions",
keyvalues={
"user_id": user_id,
@ -243,9 +244,9 @@ class EndToEndRoomKeyStore(SQLBaseStore):
)
current_version = txn.fetchone()[0]
if current_version is None:
current_version = 0
current_version = '0'
new_version = current_version + 1
new_version = str(int(current_version) + 1)
self._simple_insert_txn(
txn,

2
synapse/storage/schema/delta/46/e2e_room_keys.sql
View file

@ -35,4 +35,4 @@ CREATE TABLE e2e_room_keys_versions (
auth_data TEXT NOT NULL
);
CREATE UNIQUE INDEX e2e_room_keys_versions_user_idx ON e2e_room_keys_versions(user_id);
CREATE UNIQUE INDEX e2e_room_keys_versions_idx ON e2e_room_keys_versions(user_id, version);