From edc4c35f5f612aea9956779df57ca6e5422f0601 Mon Sep 17 00:00:00 2001 From: Derrick Anderson Date: Fri, 5 Jan 2018 12:29:40 -0500 Subject: Uncomment upgrade for 4.6 (#8045) * Uncomment upgrade for 4.6 * add 4.6 version --- store/sqlstore/upgrade.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'store') diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 49352e3ed..4095e4cac 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -325,18 +325,12 @@ func UpgradeDatabaseToVersion44(sqlStore SqlStore) { } func UpgradeDatabaseToVersion46(sqlStore SqlStore) { - //TODO: Uncomment folowing when version 4.6 is released - //if shouldPerformUpgrade(sqlStore, VERSION_4_5_0, VERSION_4_6_0) { - //TODO: Remove these remove calls when version 4.6 is released. The columns were renamed. - sqlStore.RemoveColumnIfExists("IncomingWebhooks", "PostUsername") - sqlStore.RemoveColumnIfExists("IncomingWebhooks", "PostIconURL") - - sqlStore.CreateColumnIfNotExists("IncomingWebhooks", "Username", "varchar(64)", "varchar(64)", "") - sqlStore.CreateColumnIfNotExists("IncomingWebhooks", "IconURL", "varchar(1024)", "varchar(1024)", "") - - //saveSchemaVersion(sqlStore, VERSION_4_6_0) - //} + if shouldPerformUpgrade(sqlStore, VERSION_4_5_0, VERSION_4_6_0) { + sqlStore.CreateColumnIfNotExists("IncomingWebhooks", "Username", "varchar(64)", "varchar(64)", "") + sqlStore.CreateColumnIfNotExists("IncomingWebhooks", "IconURL", "varchar(1024)", "varchar(1024)", "") + saveSchemaVersion(sqlStore, VERSION_4_6_0) + } } func UpgradeDatabaseToVersion45(sqlStore SqlStore) { -- cgit v1.2.3-1-g7c22