From 25f43faa70f7cc58493b636c2702ae63395779dc Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Fri, 7 May 2021 10:22:05 +0100
Subject: Reorganise the database schema directories (#9932)

The hope here is that by moving all the schema files into synapse/storage/schema, it gets a bit easier for newcomers to navigate.

It certainly got easier for me to write a helpful README. There's more to do on that front, but I'll follow up with other PRs for that.
---
 .../schema/delta/25/00background_updates.sql        | 21 ---------------------
 .../delta/35/00background_updates_add_col.sql       | 17 -----------------
 .../delta/58/00background_update_ordering.sql       | 19 -------------------
 3 files changed, 57 deletions(-)
 delete mode 100644 synapse/storage/schema/delta/25/00background_updates.sql
 delete mode 100644 synapse/storage/schema/delta/35/00background_updates_add_col.sql
 delete mode 100644 synapse/storage/schema/delta/58/00background_update_ordering.sql

(limited to 'synapse/storage/schema/delta')

diff --git a/synapse/storage/schema/delta/25/00background_updates.sql b/synapse/storage/schema/delta/25/00background_updates.sql
deleted file mode 100644
index 2ad9e8fa56..0000000000
--- a/synapse/storage/schema/delta/25/00background_updates.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2015, 2016 OpenMarket 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 TABLE IF NOT EXISTS background_updates(
-    update_name TEXT NOT NULL, -- The name of the background update.
-    progress_json TEXT NOT NULL, -- The current progress of the update as JSON.
-    CONSTRAINT background_updates_uniqueness UNIQUE (update_name)
-);
diff --git a/synapse/storage/schema/delta/35/00background_updates_add_col.sql b/synapse/storage/schema/delta/35/00background_updates_add_col.sql
deleted file mode 100644
index c2d2a4f836..0000000000
--- a/synapse/storage/schema/delta/35/00background_updates_add_col.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2016 OpenMarket 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.
- */
-
-
-ALTER TABLE background_updates ADD COLUMN depends_on TEXT;
diff --git a/synapse/storage/schema/delta/58/00background_update_ordering.sql b/synapse/storage/schema/delta/58/00background_update_ordering.sql
deleted file mode 100644
index 02dae587cc..0000000000
--- a/synapse/storage/schema/delta/58/00background_update_ordering.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 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.
- */
-
-/* add an "ordering" column to background_updates, which can be used to sort them
-   to achieve some level of consistency. */
-
-ALTER TABLE background_updates ADD COLUMN ordering INT NOT NULL DEFAULT 0;
-- 
cgit 1.5.1