From 9cce175bf00797ea0c03dae7ab19f9d8f2375a61 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Mon, 10 Jun 2019 15:34:41 +0100 Subject: Move schema update to 54 and add a warning comment --- synapse/storage/prepare_database.py | 4 +++- .../schema/delta/54/profile_replication_status_index.sql | 16 ++++++++++++++++ .../schema/delta/55/profile_replication_status_index.sql | 16 ---------------- 3 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 synapse/storage/schema/delta/54/profile_replication_status_index.sql delete mode 100644 synapse/storage/schema/delta/55/profile_replication_status_index.sql (limited to 'synapse') diff --git a/synapse/storage/prepare_database.py b/synapse/storage/prepare_database.py index 23a4baa484..858a886131 100644 --- a/synapse/storage/prepare_database.py +++ b/synapse/storage/prepare_database.py @@ -25,7 +25,9 @@ logger = logging.getLogger(__name__) # Remember to update this number every time a change is made to database # schema files, so the users will be informed on server restarts. -SCHEMA_VERSION = 55 +# FIXME: When we merge v1.0.0 into the dinsic branch, we need to remember to also +# regenerate the full schema so that it includes dinsic-specific tables and indexes. +SCHEMA_VERSION = 54 dir_path = os.path.abspath(os.path.dirname(__file__)) diff --git a/synapse/storage/schema/delta/54/profile_replication_status_index.sql b/synapse/storage/schema/delta/54/profile_replication_status_index.sql new file mode 100644 index 0000000000..7c20cb5a44 --- /dev/null +++ b/synapse/storage/schema/delta/54/profile_replication_status_index.sql @@ -0,0 +1,16 @@ +/* Copyright 2019 New Vector Ltd + * + * 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. + */ + +CREATE UNIQUE INDEX profile_replication_status_idx ON profile_replication_status(host); diff --git a/synapse/storage/schema/delta/55/profile_replication_status_index.sql b/synapse/storage/schema/delta/55/profile_replication_status_index.sql deleted file mode 100644 index 7c20cb5a44..0000000000 --- a/synapse/storage/schema/delta/55/profile_replication_status_index.sql +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 New Vector Ltd - * - * 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. - */ - -CREATE UNIQUE INDEX profile_replication_status_idx ON profile_replication_status(host); -- cgit 1.5.1