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: [PATCH 1/5] Drop incorrectly-added table `local_rejections_stream`. (#7816) --- changelog.d/7816.bugfix | 1 + .../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 000000000000..ca9e56d3ce20 --- /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 000000000000..20ebd52e631a --- /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; From c9f7c683aefe53dd33db69848302f3ff6e77dcfb Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 10 Jul 2020 12:11:12 +0100 Subject: [PATCH 2/5] 1.16.1 --- CHANGES.md | 19 +++++++++++++++++++ changelog.d/7816.bugfix | 1 - debian/changelog | 6 ++++++ synapse/__init__.py | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/7816.bugfix diff --git a/CHANGES.md b/CHANGES.md index 3a0fe606f8ca..a937b8cc312a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,22 @@ +Synapse 1.16.1 (2020-07-10) +=========================== + +In some distributions of Synapse 1.16.0, we incorrectly included a database +migration which added a new, unused table. This release removes the redundant +table. + +Bugfixes +-------- + +- Drop table `local_rejections_stream` which was incorrectly added in Synapse 1.16.0. ([\#7816](https://github.com/matrix-org/synapse/issues/7816)) + + +Synapse 1.16.1 (2020-07-10) +=========================== + +No significant changes. + + Synapse 1.16.0 (2020-07-08) =========================== diff --git a/changelog.d/7816.bugfix b/changelog.d/7816.bugfix deleted file mode 100644 index ca9e56d3ce20..000000000000 --- a/changelog.d/7816.bugfix +++ /dev/null @@ -1 +0,0 @@ -Drop table `local_rejections_stream` which was incorrectly added in Synapse 1.16.0. diff --git a/debian/changelog b/debian/changelog index 1e7d7191ad22..6339f937cc55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.16.1) stable; urgency=medium + + * New synapse release 1.16.1. + + -- Synapse Packaging team Fri, 10 Jul 2020 12:09:24 +0100 + matrix-synapse-py3 (1.16.0) stable; urgency=medium * New synapse release 1.16.0. diff --git a/synapse/__init__.py b/synapse/__init__.py index de65ce6db89f..0116478fbb18 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ except ImportError: pass -__version__ = "1.16.0" +__version__ = "1.16.1" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when From e6fbb0c12112eafbd99f9a1284517d0ad7ef3f87 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 10 Jul 2020 12:11:46 +0100 Subject: [PATCH 3/5] fix changelog --- CHANGES.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a937b8cc312a..f9b8fc51ec33 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,12 +11,6 @@ Bugfixes - Drop table `local_rejections_stream` which was incorrectly added in Synapse 1.16.0. ([\#7816](https://github.com/matrix-org/synapse/issues/7816)) -Synapse 1.16.1 (2020-07-10) -=========================== - -No significant changes. - - Synapse 1.16.0 (2020-07-08) =========================== From b1beb3ff59a42799154fa9b5d43de7e270ccbb58 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 10 Jul 2020 12:18:35 +0100 Subject: [PATCH 4/5] fix migration, again --- .../main/schema/delta/58/10drop_local_rejections_stream.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 20ebd52e631a..eb57203e46fa 100644 --- 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 @@ -19,4 +19,4 @@ 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; +DROP TABLE IF EXISTS local_rejections_stream; From e66e38bbd7818ca967a7c08f1b1c227c544a9ede Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 10 Jul 2020 12:19:47 +0100 Subject: [PATCH 5/5] update changelog --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index f9b8fc51ec33..1d4f336ee186 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,7 +8,7 @@ table. Bugfixes -------- -- Drop table `local_rejections_stream` which was incorrectly added in Synapse 1.16.0. ([\#7816](https://github.com/matrix-org/synapse/issues/7816)) +- Drop table `local_rejections_stream` which was incorrectly added in Synapse 1.16.0. ([\#7816](https://github.com/matrix-org/synapse/issues/7816), [b1beb3ff5](https://github.com/matrix-org/synapse/commit/b1beb3ff5)) Synapse 1.16.0 (2020-07-08)