From 7253b2c59c737491898fe9bff1c1d23c183dcb34 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Mon, 26 Nov 2018 14:05:04 +0100 Subject: [PATCH] upgrade db to 5.6.0 (#9880) --- model/version.go | 1 + store/sqlstore/upgrade.go | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/model/version.go b/model/version.go index 1b09b0ad3b..79876a8578 100644 --- a/model/version.go +++ b/model/version.go @@ -13,6 +13,7 @@ import ( // It should be maintained in chronological order with most current // release at the front of the list. var versions = []string{ + "5.6.0", "5.5.0", "5.4.0", "5.3.0", diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 88011feb4b..61dc994561 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -515,20 +515,20 @@ func UpgradeDatabaseToVersion55(sqlStore SqlStore) { } func UpgradeDatabaseToVersion56(sqlStore SqlStore) { - // TODO: Uncomment following condition when version 5.6.0 is released - //if shouldPerformUpgrade(sqlStore, VERSION_5_5_0, VERSION_5_6_0) { - sqlStore.CreateColumnIfNotExists("PluginKeyValueStore", "ExpireAt", "bigint(20)", "bigint", "0") + if shouldPerformUpgrade(sqlStore, VERSION_5_5_0, VERSION_5_6_0) { + sqlStore.CreateColumnIfNotExists("PluginKeyValueStore", "ExpireAt", "bigint(20)", "bigint", "0") - // migrating user's accepted terms of service data into the new table - sqlStore.GetMaster().Exec("INSERT INTO UserTermsOfService SELECT Id, AcceptedTermsOfServiceId as TermsOfServiceId, :CreateAt FROM Users WHERE AcceptedTermsOfServiceId != \"\" AND AcceptedTermsOfServiceId IS NOT NULL", map[string]interface{}{"CreateAt": model.GetMillis()}) + // migrating user's accepted terms of service data into the new table + sqlStore.GetMaster().Exec("INSERT INTO UserTermsOfService SELECT Id, AcceptedTermsOfServiceId as TermsOfServiceId, :CreateAt FROM Users WHERE AcceptedTermsOfServiceId != \"\" AND AcceptedTermsOfServiceId IS NOT NULL", map[string]interface{}{"CreateAt": model.GetMillis()}) - if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES { - sqlStore.RemoveIndexIfExists("idx_users_email_lower", "lower(Email)") - sqlStore.RemoveIndexIfExists("idx_users_username_lower", "lower(Username)") - sqlStore.RemoveIndexIfExists("idx_users_nickname_lower", "lower(Nickname)") - sqlStore.RemoveIndexIfExists("idx_users_firstname_lower", "lower(FirstName)") - sqlStore.RemoveIndexIfExists("idx_users_lastname_lower", "lower(LastName)") + if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES { + sqlStore.RemoveIndexIfExists("idx_users_email_lower", "lower(Email)") + sqlStore.RemoveIndexIfExists("idx_users_username_lower", "lower(Username)") + sqlStore.RemoveIndexIfExists("idx_users_nickname_lower", "lower(Nickname)") + sqlStore.RemoveIndexIfExists("idx_users_firstname_lower", "lower(FirstName)") + sqlStore.RemoveIndexIfExists("idx_users_lastname_lower", "lower(LastName)") + } + saveSchemaVersion(sqlStore, VERSION_5_6_0) } - //saveSchemaVersion(sqlStore, VERSION_5_6_0) - //} + }