summary refs log tree commit diff
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-12-03 15:27:00 -0500
committerHubert Chathi <hubert@uhoreg.ca>2019-12-03 15:27:00 -0500
commit418813b205b7b6f8c9d21f639d740fd2e1016ab7 (patch)
tree2b577709db3c3bbdaa4bb2bb5f15126d53b8d59d
parentadd changelog (diff)
downloadsynapse-418813b205b7b6f8c9d21f639d740fd2e1016ab7.tar.xz
apply changes from review
-rw-r--r--changelog.d/6451.bugfix2
-rw-r--r--synapse/storage/data_stores/main/schema/delta/56/signing_keys.sql3
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/6451.bugfix b/changelog.d/6451.bugfix
index e678dc240b..23b67583ec 100644
--- a/changelog.d/6451.bugfix
+++ b/changelog.d/6451.bugfix
@@ -1 +1 @@
-Change the index on the `e2e_cross_signing_signatures` table to be non-unique.
+Fix uploading multiple cross signing signatures for the same user.
diff --git a/synapse/storage/data_stores/main/schema/delta/56/signing_keys.sql b/synapse/storage/data_stores/main/schema/delta/56/signing_keys.sql
index bee0a5da91..5c5fffcafb 100644
--- a/synapse/storage/data_stores/main/schema/delta/56/signing_keys.sql
+++ b/synapse/storage/data_stores/main/schema/delta/56/signing_keys.sql
@@ -40,7 +40,8 @@ CREATE TABLE IF NOT EXISTS e2e_cross_signing_signatures (
     signature TEXT NOT NULL
 );
 
-CREATE INDEX e2e_cross_signing_signatures2_idx ON e2e_cross_signing_signatures(user_id, target_user_id, target_device_id);
+-- replaced by the index created in signing_keys_nonunique_signatures.sql
+-- CREATE UNIQUE INDEX e2e_cross_signing_signatures_idx ON e2e_cross_signing_signatures(user_id, target_user_id, target_device_id);
 
 -- stream of user signature updates
 CREATE TABLE IF NOT EXISTS user_signature_stream (