From 39cf3a998ddcb7ba34ec04b075c6d301d5605ac3 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 8 Dec 2017 11:04:23 -0800 Subject: Uncomment upgrae for 4.5 --- model/version.go | 1 + store/sqlstore/upgrade.go | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/model/version.go b/model/version.go index 89107fc43..49682f1e9 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.5.0", "4.4.0", "4.3.0", "4.2.0", diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 932330a21..9bb3250d6 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -323,13 +323,7 @@ func UpgradeDatabaseToVersion44(sqlStore SqlStore) { } func UpgradeDatabaseToVersion45(sqlStore SqlStore) { - //TODO: Remove next two lines before 4.5 release. They're just here to fix CI servers - sqlStore.AlterColumnTypeIfExists("PluginKeyValueStore", "PKey", "varchar(50)", "varchar(50)") - sqlStore.AlterColumnTypeIfExists("PluginKeyValueStore", "PluginId", "varchar(190)", "varchar(190)") - - //TODO: Uncomment when 4.5 is released - /*if shouldPerformUpgrade(sqlStore, VERSION_4_4_0, VERSION_4_5_0) { - + if shouldPerformUpgrade(sqlStore, VERSION_4_4_0, VERSION_4_5_0) { saveSchemaVersion(sqlStore, VERSION_4_5_0) - }*/ + } } -- cgit v1.2.3-1-g7c22