From e555b7454d84a5cceb9b27a6c6b7c4dfa8d01b52 Mon Sep 17 00:00:00 2001 From: Derrick Anderson Date: Fri, 4 May 2018 17:01:14 -0400 Subject: Uncomment upgrade for 4.10 (#8727) * uncomment upgrade code * ping jenkins * add 4.10.0 to version.go --- store/sqlstore/upgrade.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'store') diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 09b679af4..562c36bf1 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -411,14 +411,13 @@ func UpgradeDatabaseToVersion49(sqlStore SqlStore) { } 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) { + if shouldPerformUpgrade(sqlStore, VERSION_4_9_0, VERSION_4_10_0) { - sqlStore.RemoveIndexIfExists("Name_2", "Channels") - sqlStore.RemoveIndexIfExists("Name_2", "Emoji") - sqlStore.RemoveIndexIfExists("ClientId_2", "OAuthAccessData") + sqlStore.RemoveIndexIfExists("Name_2", "Channels") + sqlStore.RemoveIndexIfExists("Name_2", "Emoji") + sqlStore.RemoveIndexIfExists("ClientId_2", "OAuthAccessData") - // saveSchemaVersion(sqlStore, VERSION_4_10_0) - sqlStore.GetMaster().Exec("UPDATE Users SET AuthData=LOWER(AuthData) WHERE AuthService = 'saml'") - //} + saveSchemaVersion(sqlStore, VERSION_4_10_0) + sqlStore.GetMaster().Exec("UPDATE Users SET AuthData=LOWER(AuthData) WHERE AuthService = 'saml'") + } } -- cgit v1.2.3-1-g7c22