fix drop tables, and bump schema version

8 files changed, 9 insertions, 32 deletions

diff --git a/synapse/storage/prepare_database.py b/synapse/storage/prepare_database.py
index c1711bc8bd..23a4baa484 100644
--- a/synapse/storage/prepare_database.py
+++ b/synapse/storage/prepare_database.py
@@ -25,7 +25,7 @@ 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 = 54
+SCHEMA_VERSION = 55
 
 dir_path = os.path.abspath(os.path.dirname(__file__))
 
diff --git a/synapse/storage/schema/delta/30/state_stream.sql b/synapse/storage/schema/delta/30/state_stream.sql
index 706fe1dcf4..7e5aeb33d2 100644
--- a/synapse/storage/schema/delta/30/state_stream.sql
+++ b/synapse/storage/schema/delta/30/state_stream.sql
@@ -14,15 +14,10 @@
  */
 
 
-/**
- * The positions in the event stream_ordering when the current_state was
- * replaced by the state at the event.
+/* We used to create a table called presence_list, but this is no longer used
+ * and is removed in delta 54.
  */
 
-CREATE TABLE IF NOT EXISTS current_state_resets(
-    event_stream_ordering BIGINT PRIMARY KEY NOT NULL
-);
-
 /* The outlier events that have aquired a state group typically through
  * backfill. This is tracked separately to the events table, as assigning a
  * state group change the position of the existing event in the stream
diff --git a/synapse/storage/schema/delta/54/drop_legacy_tables.sql b/synapse/storage/schema/delta/54/drop_legacy_tables.sql
deleted file mode 100644
index 786166958c..0000000000
--- a/synapse/storage/schema/delta/54/drop_legacy_tables.sql
+++ /dev/null
@@ -1,18 +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.
- */
-
-DROP TABLE IF EXISTS application_services;
-DROP TABLE IF EXISTS application_services_regex;
-DROP TABLE IF EXISTS transaction_id_to_pdu;
diff --git a/synapse/storage/schema/full_schemas/11/event_signatures.sql b/synapse/storage/schema/full_schemas/11/event_signatures.sql
index a46f5c6198..2111caa54e 100644
--- a/synapse/storage/schema/full_schemas/11/event_signatures.sql
+++ b/synapse/storage/schema/full_schemas/11/event_signatures.sql
@@ -14,7 +14,7 @@
  */
 
 /* We used to create a tables called event_content_hashes, event_signatures and
- * event_edge_hashes, but these are no longer used and are removed in delta 54.
+ * event_edge_hashes, but these are no longer used and are removed in delta 55.
  */
 
 CREATE TABLE IF NOT EXISTS event_reference_hashes (
diff --git a/synapse/storage/schema/full_schemas/11/im.sql b/synapse/storage/schema/full_schemas/11/im.sql
index a126f72643..bfb5269fe0 100644
--- a/synapse/storage/schema/full_schemas/11/im.sql
+++ b/synapse/storage/schema/full_schemas/11/im.sql
@@ -14,7 +14,7 @@
  */
 
  /* We used to create a tables called room_hosts and feedback,
- * but these are no longer used and are removed in delta 54.
+ * but these are no longer used and are removed in delta 55.
  */
 
 CREATE TABLE IF NOT EXISTS events(
diff --git a/synapse/storage/schema/full_schemas/16/event_signatures.sql b/synapse/storage/schema/full_schemas/16/event_signatures.sql
index 81bb9033ae..fe1b68c57d 100644
--- a/synapse/storage/schema/full_schemas/16/event_signatures.sql
+++ b/synapse/storage/schema/full_schemas/16/event_signatures.sql
@@ -14,7 +14,7 @@
  */
 
  /* We used to create a tables called event_content_hashes and event_edge_hashes,
-  * but these are no longer used and are removed in delta 54.
+  * but these are no longer used and are removed in delta 55.
   */
 
 CREATE TABLE IF NOT EXISTS event_reference_hashes (
diff --git a/synapse/storage/schema/full_schemas/16/im.sql b/synapse/storage/schema/full_schemas/16/im.sql
index 49e263bcee..4158162cce 100644
--- a/synapse/storage/schema/full_schemas/16/im.sql
+++ b/synapse/storage/schema/full_schemas/16/im.sql
@@ -14,7 +14,7 @@
  */
 
 /* We used to create a tables called room_hosts and feedback,
- * but these are no longer used and are removed in delta 54.
+ * but these are no longer used and are removed in delta 55.
  */
 
 CREATE TABLE IF NOT EXISTS events(
diff --git a/synapse/storage/schema/full_schemas/16/presence.sql b/synapse/storage/schema/full_schemas/16/presence.sql
index 0892c4cf96..b832b6ba4f 100644
--- a/synapse/storage/schema/full_schemas/16/presence.sql
+++ b/synapse/storage/schema/full_schemas/16/presence.sql
@@ -28,5 +28,5 @@ CREATE TABLE IF NOT EXISTS presence_allow_inbound(
   UNIQUE (observed_user_id, observer_user_id)
 );
 
--- We used to create a table called presence_list, but this is no longer used 
--- and is removed in delta 54.
\ No newline at end of file
+-- We used to create a table called presence_list, but this is no longer used
+-- and is removed in delta 55.
\ No newline at end of file