From ae3f112874fc100ea2952b3ad5b99053c53cfd24 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Tue, 8 Oct 2019 09:32:51 +0200 Subject: [PATCH] upgrade db to 5.16 (#12260) * upgrade db to 5.16 * set current schema version --- store/sqlstore/upgrade.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index b6e43f20c8..1247e3cc78 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -20,7 +20,7 @@ import ( ) const ( - CURRENT_SCHEMA_VERSION = VERSION_5_15_0 + CURRENT_SCHEMA_VERSION = VERSION_5_16_0 VERSION_5_16_0 = "5.16.0" VERSION_5_15_0 = "5.15.0" VERSION_5_14_0 = "5.14.0" @@ -736,15 +736,12 @@ func UpgradeDatabaseToVersion515(sqlStore SqlStore) { } func UpgradeDatabaseToVersion516(sqlStore SqlStore) { - // TODO: Uncomment following condition when version 5.16.0 is released - // if shouldPerformUpgrade(sqlStore, VERSION_5_15_0, VERSION_5_16_0) { - - if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES { - sqlStore.GetMaster().Exec("ALTER TABLE Tokens ALTER COLUMN Extra TYPE varchar(2048)") - } else if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL { - sqlStore.GetMaster().Exec("ALTER TABLE Tokens MODIFY Extra text") + if shouldPerformUpgrade(sqlStore, VERSION_5_15_0, VERSION_5_16_0) { + if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES { + sqlStore.GetMaster().Exec("ALTER TABLE Tokens ALTER COLUMN Extra TYPE varchar(2048)") + } else if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL { + sqlStore.GetMaster().Exec("ALTER TABLE Tokens MODIFY Extra text") + } + saveSchemaVersion(sqlStore, VERSION_5_16_0) } - - // saveSchemaVersion(sqlStore, VERSION_5_16_0) - // } }