From a3320e0ce31352e9279b87a9bed31b5bdfd8ad91 Mon Sep 17 00:00:00 2001 From: Derrick Anderson Date: Mon, 5 Mar 2018 14:50:10 -0500 Subject: Uncomment upgrade code to 4.8 (#8409) * upgrade to 48 * fix upgrade bug --- model/version.go | 1 + store/sqlstore/upgrade.go | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/model/version.go b/model/version.go index 6e461e5d5..3e75478d3 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.8.0", "4.7.1", "4.7.0", "4.6.0", diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 77289183c..1e704ec01 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -365,8 +365,7 @@ func UpgradeDatabaseToVersion471(sqlStore SqlStore) { } func UpgradeDatabaseToVersion48(sqlStore SqlStore) { - //TODO: Uncomment the following condition when version 4.8.0 is released - //if shouldPerformUpgrade(sqlStore, VERSION_4_7_0, VERSION_4_8_0) { - // saveSchemaVersion(sqlStore, VERSION_4_8_0) - //} + if shouldPerformUpgrade(sqlStore, VERSION_4_7_1, VERSION_4_8_0) { + saveSchemaVersion(sqlStore, VERSION_4_8_0) + } } -- cgit v1.2.3-1-g7c22