From f9015a37f3f3ffe9dac9d3c3a44c7795b8b8b8b0 Mon Sep 17 00:00:00 2001 From: Derrick Anderson Date: Thu, 5 Apr 2018 11:45:55 -0400 Subject: uncomment 4.9 upgrade code (#8582) * set db to 4.9 * add prepatory code for 4.10 * bug from old example --- store/sqlstore/upgrade.go | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'store') diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 89c6e3d07..882ee48ba 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -16,6 +16,7 @@ import ( ) const ( + VERSION_4_10_0 = "4.10.0" VERSION_4_9_0 = "4.9.0" VERSION_4_8_1 = "4.8.1" VERSION_4_8_0 = "4.8.0" @@ -75,6 +76,7 @@ func UpgradeDatabase(sqlStore SqlStore) { UpgradeDatabaseToVersion48(sqlStore) UpgradeDatabaseToVersion481(sqlStore) UpgradeDatabaseToVersion49(sqlStore) + UpgradeDatabaseToVersion410(sqlStore) // If the SchemaVersion is empty this this is the first time it has ran // so lets set it to the current version. @@ -396,16 +398,23 @@ func UpgradeDatabaseToVersion49(sqlStore SqlStore) { // a number of parameters in `config.json` to a `Roles` table in the database. The migration code can be seen // in the file `app/app.go` in the function `DoAdvancedPermissionsMigration()`. - //TODO: Uncomment the following condition when version 4.9.0 is released - //if shouldPerformUpgrade(sqlStore, VERSION_4_8_1, VERSION_4_9_0) { - sqlStore.CreateColumnIfNotExists("Teams", "LastTeamIconUpdate", "bigint", "bigint", "0") - defaultTimezone := model.DefaultUserTimezone() - defaultTimezoneValue, err := json.Marshal(defaultTimezone) - if err != nil { - l4g.Critical(err) + if shouldPerformUpgrade(sqlStore, VERSION_4_8_1, VERSION_4_9_0) { + sqlStore.CreateColumnIfNotExists("Teams", "LastTeamIconUpdate", "bigint", "bigint", "0") + defaultTimezone := model.DefaultUserTimezone() + defaultTimezoneValue, err := json.Marshal(defaultTimezone) + if err != nil { + l4g.Critical(err) + } + sqlStore.CreateColumnIfNotExists("Users", "Timezone", "varchar(256)", "varchar(256)", string(defaultTimezoneValue)) + sqlStore.RemoveIndexIfExists("idx_channels_displayname", "Channels") + saveSchemaVersion(sqlStore, VERSION_4_9_0) } - sqlStore.CreateColumnIfNotExists("Users", "Timezone", "varchar(256)", "varchar(256)", string(defaultTimezoneValue)) - sqlStore.RemoveIndexIfExists("idx_channels_displayname", "Channels") - // saveSchemaVersion(sqlStore, VERSION_4_9_0) +} + +func UpgradeDatabaseToVersion410(sqlStore SqlStore) { + // TODO: Uncomment following condition when version 4.10.0 is released + //if shouldPerformUpgrade(sqlStore, VERSION_4_9_0, VERSION_4_10_0) { + + // saveSchemaVersion(sqlStore, VERSION_4_10_0) //} } -- cgit v1.2.3-1-g7c22