Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_index

Fix unique_user_filter_index schema update
pull/6179/head
Brendan Abolivier 2019-10-07 13:48:43 +01:00 committed by GitHub
commit 97e2722723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

1
changelog.d/6175.bugfix Normal file
View File

@ -0,0 +1 @@
Fix syntax error in unique_user_filter_index schema update.

View File

@ -24,8 +24,8 @@ def run_upgrade(cur, database_engine, *args, **kwargs):
DROP INDEX user_filters_by_user_id_filter_id; DROP INDEX user_filters_by_user_id_filter_id;
DELETE FROM user_filters; DELETE FROM user_filters;
ALTER TABLE user_filters ALTER TABLE user_filters
ALTER COLUMN user_id SET NOT NULL ALTER COLUMN user_id SET NOT NULL,
ALTER COLUMN filter_id SET NOT NULL ALTER COLUMN filter_id SET NOT NULL,
ALTER COLUMN filter_json SET NOT NULL; ALTER COLUMN filter_json SET NOT NULL;
INSERT INTO user_filters(user_id, filter_id, filter_json) INSERT INTO user_filters(user_id, filter_id, filter_json)
SELECT * FROM user_filters_migration; SELECT * FROM user_filters_migration;