diff --git a/synapse/storage/schema/delta/20/dummy.sql b/synapse/storage/schema/delta/20/dummy.sql
deleted file mode 100644
index e0ac49d1ec..0000000000
--- a/synapse/storage/schema/delta/20/dummy.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT 1;
diff --git a/synapse/storage/schema/delta/20/pushers.py b/synapse/storage/schema/delta/20/pushers.py
deleted file mode 100644
index 3edfcfd783..0000000000
--- a/synapse/storage/schema/delta/20/pushers.py
+++ /dev/null
@@ -1,88 +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.
-
-
-"""
-Main purpose of this upgrade is to change the unique key on the
-pushers table again (it was missed when the v16 full schema was
-made) but this also changes the pushkey and data columns to text.
-When selecting a bytea column into a text column, postgres inserts
-the hex encoded data, and there's no portable way of getting the
-UTF-8 bytes, so we have to do it in Python.
-"""
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-def run_create(cur, database_engine, *args, **kwargs):
- logger.info("Porting pushers table...")
- cur.execute(
- """
- CREATE TABLE IF NOT EXISTS pushers2 (
- id BIGINT PRIMARY KEY,
- user_name TEXT NOT NULL,
- access_token BIGINT DEFAULT NULL,
- profile_tag VARCHAR(32) NOT NULL,
- kind VARCHAR(8) NOT NULL,
- app_id VARCHAR(64) NOT NULL,
- app_display_name VARCHAR(64) NOT NULL,
- device_display_name VARCHAR(128) NOT NULL,
- pushkey TEXT NOT NULL,
- ts BIGINT NOT NULL,
- lang VARCHAR(8),
- data TEXT,
- last_token TEXT,
- last_success BIGINT,
- failing_since BIGINT,
- UNIQUE (app_id, pushkey, user_name)
- )
- """
- )
- cur.execute(
- """SELECT
- id, user_name, access_token, profile_tag, kind,
- app_id, app_display_name, device_display_name,
- pushkey, ts, lang, data, last_token, last_success,
- failing_since
- FROM pushers
- """
- )
- count = 0
- for row in cur.fetchall():
- row = list(row)
- row[8] = bytes(row[8]).decode("utf-8")
- row[11] = bytes(row[11]).decode("utf-8")
- cur.execute(
- database_engine.convert_param_style(
- """
- INSERT into pushers2 (
- id, user_name, access_token, profile_tag, kind,
- app_id, app_display_name, device_display_name,
- pushkey, ts, lang, data, last_token, last_success,
- failing_since
- ) values (%s)"""
- % (",".join(["?" for _ in range(len(row))]))
- ),
- row,
- )
- count += 1
- cur.execute("DROP TABLE pushers")
- cur.execute("ALTER TABLE pushers2 RENAME TO pushers")
- logger.info("Moved %d pushers to new table", count)
-
-
-def run_upgrade(*args, **kwargs):
- pass
|
