summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-26 12:26:31 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-26 12:26:31 +0000
commit9abce22cc9ec381e74218ced129a9852c15d1fcb (patch)
tree69b3ab27501d26b580d0e73acf19a0d046205ac7 /synapse
parentMerge pull request #6159 from matrix-org/erikj/cache_memberships (diff)
parentMerge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_index (diff)
downloadsynapse-9abce22cc9ec381e74218ced129a9852c15d1fcb.tar.xz
Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_index
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/schema/delta/56/unique_user_filter_index.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/schema/delta/56/unique_user_filter_index.py b/synapse/storage/schema/delta/56/unique_user_filter_index.py
index 4efc1a586f..60031f23ca 100644
--- a/synapse/storage/schema/delta/56/unique_user_filter_index.py
+++ b/synapse/storage/schema/delta/56/unique_user_filter_index.py
@@ -24,8 +24,8 @@ def run_upgrade(cur, database_engine, *args, **kwargs):
             DROP INDEX user_filters_by_user_id_filter_id;
             DELETE FROM user_filters;
             ALTER TABLE user_filters
-               ALTER COLUMN user_id SET NOT NULL
-               ALTER COLUMN filter_id SET NOT NULL
+               ALTER COLUMN user_id SET NOT NULL,
+               ALTER COLUMN filter_id SET NOT NULL,
                ALTER COLUMN filter_json SET NOT NULL;
             INSERT INTO user_filters(user_id, filter_id, filter_json)
                 SELECT * FROM user_filters_migration;