mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-28 23:20:09 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rename column to attestation_json

Browse source
This commit is contained in:
Erik Johnston 2017-07-11 14:25:46 +01:00
parent 0aac30d53b
commit e52c391cd4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
synapse/storage/group_server.py
View file

@ -168,7 +168,7 @@ class GroupServerStore(SQLBaseStore):
"group_id": group_id, "group_id": group_id,
"user_id": user_id, "user_id": user_id,
"valid_until_ms": remote_attestation["valid_until_ms"], "valid_until_ms": remote_attestation["valid_until_ms"],
"attestation": json.dumps(remote_attestation), "attestation_json": json.dumps(remote_attestation),
}, },
) )
@ -278,7 +278,7 @@ class GroupServerStore(SQLBaseStore):
}, },
updatevalues={ updatevalues={
"valid_until_ms": attestation["valid_until_ms"], "valid_until_ms": attestation["valid_until_ms"],
"attestation": json.dumps(attestation) "attestation_json": json.dumps(attestation)
}, },
desc="update_remote_attestion", desc="update_remote_attestion",
) )
@ -294,13 +294,13 @@ class GroupServerStore(SQLBaseStore):
"group_id": group_id, "group_id": group_id,
"user_id": user_id, "user_id": user_id,
}, },
retcols=("valid_until_ms", "attestation"), retcols=("valid_until_ms", "attestation_json"),
desc="get_remote_attestation", desc="get_remote_attestation",
allow_none=True, allow_none=True,
) )
now = int(self._clock.time_msec()) now = int(self._clock.time_msec())
if row and now < row["valid_until_ms"]: if row and now < row["valid_until_ms"]:
defer.returnValue(json.loads(row["attestation"])) defer.returnValue(json.loads(row["attestation_json"]))
defer.returnValue(None) defer.returnValue(None)

2
synapse/storage/schema/delta/43/group_server.sql
View file

@ -73,7 +73,7 @@ CREATE TABLE group_attestations_remote (
group_id TEXT NOT NULL, group_id TEXT NOT NULL,
user_id TEXT NOT NULL, user_id TEXT NOT NULL,
valid_until_ms BIGINT NOT NULL, valid_until_ms BIGINT NOT NULL,
attestation TEXT NOT NULL attestation_json TEXT NOT NULL
); );
CREATE INDEX group_attestations_remote_g_idx ON group_attestations_remote(group_id, user_id); CREATE INDEX group_attestations_remote_g_idx ON group_attestations_remote(group_id, user_id);