From 7c680cacab49370b5e46dc7dc66492158eb0aa08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Fri, 4 May 2018 22:10:43 +0200 Subject: MM-10319: Use normalized email for Saml (migration) (#8711) --- store/sqlstore/upgrade.go | 1 + 1 file changed, 1 insertion(+) (limited to 'store/sqlstore/upgrade.go') diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index ec2b1a1c0..09b679af4 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -419,5 +419,6 @@ func UpgradeDatabaseToVersion410(sqlStore SqlStore) { sqlStore.RemoveIndexIfExists("ClientId_2", "OAuthAccessData") // saveSchemaVersion(sqlStore, VERSION_4_10_0) + sqlStore.GetMaster().Exec("UPDATE Users SET AuthData=LOWER(AuthData) WHERE AuthService = 'saml'") //} } -- cgit v1.2.3-1-g7c22 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/sqlstore/upgrade.go') 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 From c1853c7f40dd67c49524c8ea884ab61883a6abdd Mon Sep 17 00:00:00 2001 From: Derrick Anderson Date: Tue, 8 May 2018 09:27:37 -0400 Subject: prep code for 5.0 (#8743) --- store/sqlstore/upgrade.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'store/sqlstore/upgrade.go') diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 562c36bf1..45515178d 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -15,6 +15,7 @@ import ( ) const ( + VERSION_5_0_0 = "5.0.0" VERSION_4_10_0 = "4.10.0" VERSION_4_9_0 = "4.9.0" VERSION_4_8_1 = "4.8.1" @@ -76,6 +77,7 @@ func UpgradeDatabase(sqlStore SqlStore) { UpgradeDatabaseToVersion481(sqlStore) UpgradeDatabaseToVersion49(sqlStore) UpgradeDatabaseToVersion410(sqlStore) + UpgradeDatabaseToVersion50(sqlStore) // If the SchemaVersion is empty this this is the first time it has ran // so lets set it to the current version. @@ -421,3 +423,10 @@ func UpgradeDatabaseToVersion410(sqlStore SqlStore) { sqlStore.GetMaster().Exec("UPDATE Users SET AuthData=LOWER(AuthData) WHERE AuthService = 'saml'") } } + +func UpgradeDatabaseToVersion50(sqlStore SqlStore) { + // TODO: Uncomment following condition when version 3.10.0 is released + //if shouldPerformUpgrade(sqlStore, VERSION_4_10_0, VERSION_5_0_0) { + // saveSchemaVersion(sqlStore, VERSION_5_0_0) + //} +} -- cgit v1.2.3-1-g7c22