From 4ad29c3a8d74ae8f5aae7e384902004b22d17053 Mon Sep 17 00:00:00 2001 From: Claudio Costa Date: Thu, 4 Mar 2021 17:17:27 +0100 Subject: [PATCH] Bring schema versions up-to-date (#17053) Co-authored-by: Mattermod --- store/sqlstore/upgrade.go | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index c970f65d45..ce72d7451b 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -19,7 +19,9 @@ import ( ) const ( - CurrentSchemaVersion = Version5310 + CurrentSchemaVersion = Version5330 + Version5340 = "5.34.0" + Version5330 = "5.33.0" Version5320 = "5.32.0" Version5310 = "5.31.0" Version5300 = "5.30.0" @@ -198,6 +200,8 @@ func upgradeDatabase(sqlStore *SqlStore, currentModelVersionString string) error upgradeDatabaseToVersion530(sqlStore) upgradeDatabaseToVersion531(sqlStore) upgradeDatabaseToVersion532(sqlStore) + upgradeDatabaseToVersion533(sqlStore) + upgradeDatabaseToVersion534(sqlStore) return nil } @@ -948,13 +952,23 @@ func upgradeDatabaseToVersion531(sqlStore *SqlStore) { } func upgradeDatabaseToVersion532(sqlStore *SqlStore) { - // if shouldPerformUpgrade(sqlStore, Version5310, Version5320) { - // allow 10 files per post - sqlStore.CreateColumnIfNotExists("ThreadMemberships", "UnreadMentions", "bigint", "bigint", "0") - sqlStore.CreateColumnIfNotExistsNoDefault("Channels", "Shared", "tinyint(1)", "boolean") - sqlStore.CreateColumnIfNotExistsNoDefault("Reactions", "UpdateAt", "bigint", "bigint") - sqlStore.CreateColumnIfNotExistsNoDefault("Reactions", "DeleteAt", "bigint", "bigint") + if shouldPerformUpgrade(sqlStore, Version5310, Version5320) { + sqlStore.CreateColumnIfNotExists("ThreadMemberships", "UnreadMentions", "bigint", "bigint", "0") + sqlStore.CreateColumnIfNotExistsNoDefault("Channels", "Shared", "tinyint(1)", "boolean") + sqlStore.CreateColumnIfNotExistsNoDefault("Reactions", "UpdateAt", "bigint", "bigint") + sqlStore.CreateColumnIfNotExistsNoDefault("Reactions", "DeleteAt", "bigint", "bigint") + saveSchemaVersion(sqlStore, Version5320) + } +} - // saveSchemaVersion(sqlStore, Version5320) +func upgradeDatabaseToVersion533(sqlStore *SqlStore) { + if shouldPerformUpgrade(sqlStore, Version5320, Version5330) { + saveSchemaVersion(sqlStore, Version5330) + } +} + +func upgradeDatabaseToVersion534(sqlStore *SqlStore) { + // if shouldPerformUpgrade(sqlStore, Version5330, Version5340) { + // saveSchemaVersion(sqlStore, Version5340) // } }