summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-02-21 11:45:47 +0000
committerGitHub <noreply@github.com>2019-02-21 11:45:47 +0000
commit9bccd5e472d5a9538bf5a7c37644c97e50d01d4f (patch)
tree4485520fcdc7454fb3d7e4b3beca2c7ef4a15867
parentMerge pull request #4694 from matrix-org/erikj/fix_sentry_config_format (diff)
parentConsider e2e_room_keys.is_verified column as boolean (diff)
downloadsynapse-9bccd5e472d5a9538bf5a7c37644c97e50d01d4f.tar.xz
Merge pull request #4701 from fistons/fix-migration-script
Migration Script: consider e2e_room_keys.is_verified column as boolean
-rw-r--r--changelog.d/4680.bugfix3
-rwxr-xr-xscripts/synapse_port_db1
2 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/4680.bugfix b/changelog.d/4680.bugfix
new file mode 100644

index 0000000000..4aad8ecde3 --- /dev/null +++ b/changelog.d/4680.bugfix
@@ -0,0 +1,3 @@ +Fix an issue in the database migration script where the +`e2e_room_keys.is_verified` column wasn't considered as +a boolean diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db
index 3c7b606323..2fa01d1a18 100755 --- a/scripts/synapse_port_db +++ b/scripts/synapse_port_db
@@ -53,6 +53,7 @@ BOOLEAN_COLUMNS = { "group_summary_users": ["is_public"], "group_roles": ["is_public"], "local_group_membership": ["is_publicised", "is_admin"], + "e2e_room_keys": ["is_verified"], }