From cbabcec05c19e78927edb693508e4c8049dcd9b3 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Fri, 10 Jul 2020 12:07:59 +0100
Subject: Drop incorrectly-added table `local_rejections_stream`. (#7816)

---
 changelog.d/7816.bugfix                            |  1 +
 .../delta/58/10drop_local_rejections_stream.sql    | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 changelog.d/7816.bugfix
 create mode 100644 synapse/storage/data_stores/main/schema/delta/58/10drop_local_rejections_stream.sql

diff --git a/changelog.d/7816.bugfix b/changelog.d/7816.bugfix
new file mode 100644
index 0000000000..ca9e56d3ce
--- /dev/null
+++ b/changelog.d/7816.bugfix
@@ -0,0 +1 @@
+Drop table `local_rejections_stream` which was incorrectly added in Synapse 1.16.0.
diff --git a/synapse/storage/data_stores/main/schema/delta/58/10drop_local_rejections_stream.sql b/synapse/storage/data_stores/main/schema/delta/58/10drop_local_rejections_stream.sql
new file mode 100644
index 0000000000..20ebd52e63
--- /dev/null
+++ b/synapse/storage/data_stores/main/schema/delta/58/10drop_local_rejections_stream.sql
@@ -0,0 +1,22 @@
+/* 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.
+ */
+
+/*
+The version of synapse 1.16.0 on pypi incorrectly contained a migration which
+added a table called 'local_rejections_stream'. This table is not used, and
+we drop it here for anyone who was affected.
+*/
+
+DROP TABLE IF NOT EXISTS local_rejections_stream;
-- 
cgit 1.4.1