From 7f92ac4c1cbd7fae815c02b4920eb02ddf9458cb Mon Sep 17 00:00:00 2001 From: Mathieu Velten Date: Mon, 30 May 2022 16:51:37 +0200 Subject: [PATCH] Add a migration step to cleanup potential leftovers of bug 11833 (#12784) Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com> --- changelog.d/12784.bugfix | 1 + .../delta/70/01clean_table_purged_rooms.sql | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 changelog.d/12784.bugfix create mode 100644 synapse/storage/schema/main/delta/70/01clean_table_purged_rooms.sql diff --git a/changelog.d/12784.bugfix b/changelog.d/12784.bugfix new file mode 100644 index 0000000000..a958f9a16b --- /dev/null +++ b/changelog.d/12784.bugfix @@ -0,0 +1 @@ +Delete events from the `federation_inbound_events_staging` table when a room is purged through the admin API. 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 0000000000..aed79635b2 --- /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 +);