Update upstream source from tag 'upstream/1.61.0'

Update to upstream version '1.61.0'
with Debian dir 5b9bb60cc861cbccd0027b7db7acf826071dc6a0

1 files changed, 19 insertions, 0 deletions

diff --git a/synapse/storage/schema/main/delta/70/01clean_table_purged_rooms.sql b/synapse/storage/schema/main/delta/70/01clean_table_purged_rooms.sql
new file mode 100644
index 00000000..aed79635
--- /dev/null
+++ b/synapse/storage/schema/main/delta/70/01clean_table_purged_rooms.sql
@@ -0,0 +1,19 @@
+/* Copyright 2022 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.
+ */
+
+-- Clean up left over rows from bug #11833, which was fixed in #12770.
+DELETE FROM federation_inbound_events_staging WHERE room_id not in (
+    SELECT room_id FROM rooms
+);