From f7dd715052741097616816f9cce600006e5c2290 Mon Sep 17 00:00:00 2001 From: Derrick Anderson Date: Thu, 5 Apr 2018 11:27:19 -0400 Subject: update db code for release branch only (#8584) --- store/sqlstore/upgrade.go | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'store') diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 89c6e3d07..ae0ea7acd 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -396,16 +396,15 @@ 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) - //} } -- cgit v1.2.3-1-g7c22