From b7f7cc7ace5977d6494581e64669a0bb68208cc1 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Wed, 14 Aug 2019 17:14:40 -0700
Subject: [PATCH 1/4] add the version field to the index for e2e_room_keys

---
 .../schema/delta/56/fix_room_keys_index.sql    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 synapse/storage/schema/delta/56/fix_room_keys_index.sql

diff --git a/synapse/storage/schema/delta/56/fix_room_keys_index.sql b/synapse/storage/schema/delta/56/fix_room_keys_index.sql
new file mode 100644
index 0000000000..014cb3b538
--- /dev/null
+++ b/synapse/storage/schema/delta/56/fix_room_keys_index.sql
@@ -0,0 +1,18 @@
+/* Copyright 2019 Matrix.org Foundation CIC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+-- version is supposed to be part of the room keys index
+CREATE UNIQUE INDEX e2e_room_keys_with_version_idx ON e2e_room_keys(user_id, version, room_id, session_id);
+DROP INDEX IF EXISTS e2e_room_keys_idx;

From 81b8080acd9796e8a01ed5e7259eb2115bd0eb52 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Wed, 14 Aug 2019 17:53:33 -0700
Subject: [PATCH 2/4] add changelog

---
 changelog.d/5857.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5857.bugfix

diff --git a/changelog.d/5857.bugfix b/changelog.d/5857.bugfix
new file mode 100644
index 0000000000..bfeae6a6f2
--- /dev/null
+++ b/changelog.d/5857.bugfix
@@ -0,0 +1 @@
+Add missing version field to e2e_room_keys database index.
\ No newline at end of file

From c058aeb88da3e4a4fb414183e442c1a832470398 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Wed, 14 Aug 2019 18:02:58 -0700
Subject: [PATCH 3/4] update set_e2e_room_key to agree with fixed index

---
 synapse/storage/e2e_room_keys.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index 99128f2df7..b1901404af 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -82,11 +82,11 @@ class EndToEndRoomKeyStore(SQLBaseStore):
             table="e2e_room_keys",
             keyvalues={
                 "user_id": user_id,
+                "version": version,
                 "room_id": room_id,
                 "session_id": session_id,
             },
             values={
-                "version": version,
                 "first_message_index": room_key["first_message_index"],
                 "forwarded_count": room_key["forwarded_count"],
                 "is_verified": room_key["is_verified"],

From e132ba79aece7cd6683ba7b3d593d772de24d95c Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Thu, 15 Aug 2019 21:02:40 -0700
Subject: [PATCH 4/4] fix changelog

---
 changelog.d/5857.bugfix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/5857.bugfix b/changelog.d/5857.bugfix
index bfeae6a6f2..008799ccbb 100644
--- a/changelog.d/5857.bugfix
+++ b/changelog.d/5857.bugfix
@@ -1 +1 @@
-Add missing version field to e2e_room_keys database index.
\ No newline at end of file
+Fix database index so that different backup versions can have the same sessions.