summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
authorDerrick Anderson <derrick@andersonwebstudio.com>2018-05-04 17:01:14 -0400
committerGitHub <noreply@github.com>2018-05-04 17:01:14 -0400
commite555b7454d84a5cceb9b27a6c6b7c4dfa8d01b52 (patch)
tree8c829ad6d13fa4fa53e441be37b7e056435a9980 /store
parentfc513a9e61605a947c2bb8552eb7abfcecc729c1 (diff)
downloadchat-e555b7454d84a5cceb9b27a6c6b7c4dfa8d01b52.tar.gz
chat-e555b7454d84a5cceb9b27a6c6b7c4dfa8d01b52.tar.bz2
chat-e555b7454d84a5cceb9b27a6c6b7c4dfa8d01b52.zip
Uncomment upgrade for 4.10 (#8727)
* uncomment upgrade code * ping jenkins * add 4.10.0 to version.go
Diffstat (limited to 'store')
-rw-r--r--store/sqlstore/upgrade.go15
1 files changed, 7 insertions, 8 deletions
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'")
+ }
}