From e77f9d06f5f50cac7c666c1e3fa955f974a8019d Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Thu, 27 Sep 2018 16:09:21 +0200 Subject: Uncomment upgrade for 5.4.0 (#9477) --- store/sqlstore/upgrade.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'store') diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 05e10d266..66599373f 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -492,15 +492,15 @@ func UpgradeDatabaseToVersion53(sqlStore SqlStore) { } func UpgradeDatabaseToVersion54(sqlStore SqlStore) { - // TODO: Uncomment following condition when version 5.4.0 is released - // if shouldPerformUpgrade(sqlStore, VERSION_5_3_0, VERSION_5_4_0) { - sqlStore.AlterColumnTypeIfExists("OutgoingWebhooks", "Description", "varchar(500)", "varchar(500)") - sqlStore.AlterColumnTypeIfExists("IncomingWebhooks", "Description", "varchar(500)", "varchar(500)") - if err := sqlStore.Channel().MigratePublicChannels(); err != nil { - mlog.Critical("Failed to migrate PublicChannels table", mlog.Err(err)) - time.Sleep(time.Second) - os.Exit(EXIT_GENERIC_FAILURE) + if shouldPerformUpgrade(sqlStore, VERSION_5_3_0, VERSION_5_4_0) { + sqlStore.AlterColumnTypeIfExists("OutgoingWebhooks", "Description", "varchar(500)", "varchar(500)") + sqlStore.AlterColumnTypeIfExists("IncomingWebhooks", "Description", "varchar(500)", "varchar(500)") + if err := sqlStore.Channel().MigratePublicChannels(); err != nil { + mlog.Critical("Failed to migrate PublicChannels table", mlog.Err(err)) + time.Sleep(time.Second) + os.Exit(EXIT_GENERIC_FAILURE) + } + sqlStore.CreateColumnIfNotExists("Users", "AcceptedServiceTermsId", "varchar(64)", "varchar(64)", "") + saveSchemaVersion(sqlStore, VERSION_5_4_0) } - sqlStore.CreateColumnIfNotExists("Users", "AcceptedServiceTermsId", "varchar(64)", "varchar(64)", "") - // saveSchemaVersion(sqlStore, VERSION_5_4_0) } -- cgit v1.2.3-1-g7c22