Just move the schema and add some DROPs

This commit is contained in:
Mark Haines 2016-09-09 11:04:47 +01:00
parent 43b77c5d97
commit 0877157353
2 changed files with 4 additions and 35 deletions

View File

@ -13,6 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
DROP TABLE IF EXISTS device_federation_outbox;
CREATE TABLE device_federation_outbox ( CREATE TABLE device_federation_outbox (
destination TEXT NOT NULL, destination TEXT NOT NULL,
stream_id BIGINT NOT NULL, stream_id BIGINT NOT NULL,
@ -21,16 +22,18 @@ CREATE TABLE device_federation_outbox (
); );
DROP INDEX IF EXISTS device_federation_outbox_destination_id;
CREATE INDEX device_federation_outbox_destination_id CREATE INDEX device_federation_outbox_destination_id
ON device_federation_outbox(destination, stream_id); ON device_federation_outbox(destination, stream_id);
DROP TABLE IF EXISTS device_federation_inbox;
CREATE TABLE device_federation_inbox ( CREATE TABLE device_federation_inbox (
origin TEXT NOT NULL, origin TEXT NOT NULL,
message_id TEXT NOT NULL, message_id TEXT NOT NULL,
received_ts BIGINT NOT NULL received_ts BIGINT NOT NULL
); );
DROP INDEX IF EXISTS device_federation_inbox_sender_id;
CREATE INDEX device_federation_inbox_sender_id CREATE INDEX device_federation_inbox_sender_id
ON device_federation_inbox(origin, message_id); ON device_federation_inbox(origin, message_id);

View File

@ -1,34 +0,0 @@
# -*- coding: utf-8 -*-
# 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.
# Re-apply 34/device_outbox.sql since the schema version was bumped before it
# was added to develop.
import synapse.storage.prepare_database
import os
def run_create(cur, database_engine, *args, **kwargs):
try:
delta_dir = os.path.join(os.path.dirname(__file__), "..")
synapse.storage.prepare_database.executescript(
cur, os.path.join(delta_dir, "34", "device_outbox.sql")
)
except database_engine.module.DatabaseError:
pass
def run_upgrade(cur, database_engine, *args, **kwargs):
pass