From 9be54a98456db9d8d04847737fc5a908ba061047 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Tue, 22 Dec 2020 08:38:06 -0500
Subject: [PATCH 1/2] Drop the local_invites table.

---
 changelog.d/8979.misc                          |  1 +
 .../main/schema/delta/58/27local_invites.sql   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 changelog.d/8979.misc
 create mode 100644 synapse/storage/databases/main/schema/delta/58/27local_invites.sql

diff --git a/changelog.d/8979.misc b/changelog.d/8979.misc
new file mode 100644
index 000000000000..670821cf9050
--- /dev/null
+++ b/changelog.d/8979.misc
@@ -0,0 +1 @@
+Drop the unused `local_invites` table.
diff --git a/synapse/storage/databases/main/schema/delta/58/27local_invites.sql b/synapse/storage/databases/main/schema/delta/58/27local_invites.sql
new file mode 100644
index 000000000000..44b2a0572f21
--- /dev/null
+++ b/synapse/storage/databases/main/schema/delta/58/27local_invites.sql
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * 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.
+ */
+
+-- This is unused since Synapse v1.17.0.
+DROP TABLE local_invites;

From 3939509071de9bef770032e1e2c1dc5527a89ade Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Tue, 22 Dec 2020 09:05:44 -0500
Subject: [PATCH 2/2] Fix tests.

---
 tests/rest/admin/test_room.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/rest/admin/test_room.py b/tests/rest/admin/test_room.py
index 60a5fcecf7f4..fa620f97f381 100644
--- a/tests/rest/admin/test_room.py
+++ b/tests/rest/admin/test_room.py
@@ -1598,7 +1598,6 @@ def test_not_enough_power(self):
     "event_push_summary",
     "pusher_throttle",
     "group_summary_rooms",
-    "local_invites",
     "room_account_data",
     "room_tags",
     # "state_groups",  # Current impl leaves orphaned state groups around.