summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-05-28 11:36:11 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-05-28 11:36:11 +0100
commitdde07c68593a14981116d83aec713e1e65616fdf (patch)
tree6b1a0ce82c8b74fc1484458dd9f74bc3c582af6d
parentMerge pull request #5214 from matrix-org/babolivier/password-policy (diff)
parentChangelog (diff)
downloadsynapse-dde07c68593a14981116d83aec713e1e65616fdf.tar.xz
Merge branch 'babolivier/account_validity_fix_schema' into dinsic
-rw-r--r--changelog.d/5268.bugfix1
-rw-r--r--synapse/storage/schema/delta/54/account_validity_with_renewal.sql (renamed from synapse/storage/schema/delta/54/account_validity.sql)3
2 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/5268.bugfix b/changelog.d/5268.bugfix
new file mode 100644
index 0000000000..1a5a03bf0a
--- /dev/null
+++ b/changelog.d/5268.bugfix
@@ -0,0 +1 @@
+Fix schema update for account validity.
diff --git a/synapse/storage/schema/delta/54/account_validity.sql b/synapse/storage/schema/delta/54/account_validity_with_renewal.sql
index 2357626000..0adb2ad55e 100644
--- a/synapse/storage/schema/delta/54/account_validity.sql
+++ b/synapse/storage/schema/delta/54/account_validity_with_renewal.sql
@@ -13,6 +13,9 @@
  * limitations under the License.
  */
 
+-- We previously changed the schema for this table without renaming the file, which means
+-- that some databases might still be using the old schema. This ensures Synapse uses the
+-- right schema for the table.
 DROP TABLE IF EXISTS account_validity;
 
 -- Track what users are in public rooms.