From dcaed2c8e3380a433e5b3b1a9a91edbd1de4be2f Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Tue, 8 Aug 2017 20:48:01 +0800 Subject: uncomment upgrade for 4.1 (#7128) --- model/version.go | 1 + store/sql_upgrade.go | 17 ++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/model/version.go b/model/version.go index c40869d0d..b08af46bd 100644 --- a/model/version.go +++ b/model/version.go @@ -13,6 +13,7 @@ import ( // It should be maitained in chronological order with most current // release at the front of the list. var versions = []string{ + "4.1.0", "4.0.0", "3.10.0", "3.9.0", diff --git a/store/sql_upgrade.go b/store/sql_upgrade.go index 1ea9496f5..26ff9a164 100644 --- a/store/sql_upgrade.go +++ b/store/sql_upgrade.go @@ -281,15 +281,14 @@ func UpgradeDatabaseToVersion40(sqlStore SqlStore) { } func UpgradeDatabaseToVersion41(sqlStore SqlStore) { - // TODO: Uncomment following condition when version 4.1.0 is released - // if shouldPerformUpgrade(sqlStore, VERSION_4_0_0, VERSION_4_1_0) { + if shouldPerformUpgrade(sqlStore, VERSION_4_0_0, VERSION_4_1_0) { + // Increase maximum length of the Users table Roles column. + if sqlStore.GetMaxLengthOfColumnIfExists("Users", "Roles") != "256" { + sqlStore.AlterColumnTypeIfExists("Users", "Roles", "varchar(256)", "varchar(256)") + } - // Increase maximum length of the Users table Roles column. - if sqlStore.GetMaxLengthOfColumnIfExists("Users", "Roles") != "256" { - sqlStore.AlterColumnTypeIfExists("Users", "Roles", "varchar(256)", "varchar(256)") - } + sqlStore.RemoveTableIfExists("JobStatuses") - sqlStore.RemoveTableIfExists("JobStatuses") - // saveSchemaVersion(sqlStore, VERSION_4_1_0) - // } + saveSchemaVersion(sqlStore, VERSION_4_1_0) + } } -- cgit v1.2.3-1-g7c22