diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-06 14:38:04 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-06 14:38:04 +0000 |
commit | 0cd66885e3ff7828282cc03dd8189763fdb7b927 (patch) | |
tree | cb74f4a479abae1659ee71e4b15d9fa2b9157903 /synapse | |
parent | Don't query auth if the only difference is events that were rejected due to a... (diff) | |
download | synapse-0cd66885e3ff7828282cc03dd8189763fdb7b927.tar.xz |
Move delta/v13.sql to delta/v12.sql
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/storage/schema/delta/v12.sql | 11 | ||||
-rw-r--r-- | synapse/storage/schema/delta/v13.sql | 24 |
2 files changed, 11 insertions, 24 deletions
diff --git a/synapse/storage/schema/delta/v12.sql b/synapse/storage/schema/delta/v12.sql index 16c2258ca4..302d958dbf 100644 --- a/synapse/storage/schema/delta/v12.sql +++ b/synapse/storage/schema/delta/v12.sql @@ -52,3 +52,14 @@ CREATE TABLE IF NOT EXISTS push_rules ( ); CREATE INDEX IF NOT EXISTS push_rules_user_name on push_rules (user_name); + +CREATE TABLE IF NOT EXISTS user_filters( + user_id TEXT, + filter_id INTEGER, + filter_json TEXT, + FOREIGN KEY(user_id) REFERENCES users(id) +); + +CREATE INDEX IF NOT EXISTS user_filters_by_user_id_filter_id ON user_filters( + user_id, filter_id +); diff --git a/synapse/storage/schema/delta/v13.sql b/synapse/storage/schema/delta/v13.sql deleted file mode 100644 index beb39ca201..0000000000 --- a/synapse/storage/schema/delta/v13.sql +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2015 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 user_filters( - user_id TEXT, - filter_id INTEGER, - filter_json TEXT, - FOREIGN KEY(user_id) REFERENCES users(id) -); - -CREATE INDEX IF NOT EXISTS user_filters_by_user_id_filter_id ON user_filters( - user_id, filter_id -); |