summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-10-07 13:48:43 +0100
committerGitHub <noreply@github.com>2019-10-07 13:48:43 +0100
commit97e2722723696a52ab8355fe4d36cb85d0375c2b (patch)
treed02a04262303c48fcc096cb8d0b8d041871bd6dc
parentMerge pull request #6159 from matrix-org/erikj/cache_memberships (diff)
parentChangelog (diff)
downloadsynapse-97e2722723696a52ab8355fe4d36cb85d0375c2b.tar.xz
Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_index
Fix unique_user_filter_index schema update
-rw-r--r--changelog.d/6175.bugfix1
-rw-r--r--synapse/storage/schema/delta/56/unique_user_filter_index.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/6175.bugfix b/changelog.d/6175.bugfix
new file mode 100644
index 0000000000..3cd9a99edf
--- /dev/null
+++ b/changelog.d/6175.bugfix
@@ -0,0 +1 @@
+Fix syntax error in unique_user_filter_index schema update.
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;