From 46dd24333106aca13fe2abb1a564c18fd16ac4ac Mon Sep 17 00:00:00 2001
From: Carlos Tadeu Panato Junior <ctadeu@gmail.com>
Date: Mon, 5 Nov 2018 21:38:30 +0100
Subject: [PATCH] upgrade to 5.5 (#9798)

* upgrade to 5.5

* add 5.6 upgrade db
---
 model/version.go          |  1 +
 store/sqlstore/upgrade.go | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/model/version.go b/model/version.go
index 000d754d81..1b09b0ad3b 100644
--- a/model/version.go
+++ b/model/version.go
@@ -13,6 +13,7 @@ import (
 // It should be maintained in chronological order with most current
 // release at the front of the list.
 var versions = []string{
+	"5.5.0",
 	"5.4.0",
 	"5.3.0",
 	"5.2.0",
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index 9898d5b322..26f0ed88db 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -15,6 +15,7 @@ import (
 )
 
 const (
+	VERSION_5_6_0            = "5.6.0"
 	VERSION_5_5_0            = "5.5.0"
 	VERSION_5_4_0            = "5.4.0"
 	VERSION_5_3_0            = "5.3.0"
@@ -88,6 +89,7 @@ func UpgradeDatabase(sqlStore SqlStore) {
 	UpgradeDatabaseToVersion53(sqlStore)
 	UpgradeDatabaseToVersion54(sqlStore)
 	UpgradeDatabaseToVersion55(sqlStore)
+	UpgradeDatabaseToVersion56(sqlStore)
 
 	// If the SchemaVersion is empty this this is the first time it has ran
 	// so lets set it to the current version.
@@ -508,9 +510,15 @@ func UpgradeDatabaseToVersion54(sqlStore SqlStore) {
 }
 
 func UpgradeDatabaseToVersion55(sqlStore SqlStore) {
-	// TODO: Uncomment following condition when version 5.5.0 is released
-	// if shouldPerformUpgrade(sqlStore, VERSION_5_4_0, VERSION_5_5_0) {
-	sqlStore.CreateColumnIfNotExists("PluginKeyValueStore", "ExpireAt", "bigint(20)", "bigint", "0")
-	// 	saveSchemaVersion(sqlStore, VERSION_5_5_0)
-	// }
+	if shouldPerformUpgrade(sqlStore, VERSION_5_4_0, VERSION_5_5_0) {
+		saveSchemaVersion(sqlStore, VERSION_5_5_0)
+	}
+}
+
+func UpgradeDatabaseToVersion56(sqlStore SqlStore) {
+	// TODO: Uncomment following condition when version 5.5.0 is released
+	//if shouldPerformUpgrade(sqlStore, VERSION_5_5_0, VERSION_5_6_0) {
+	sqlStore.CreateColumnIfNotExists("PluginKeyValueStore", "ExpireAt", "bigint(20)", "bigint", "0")
+	//	saveSchemaVersion(sqlStore, VERSION_5_5_0)
+	//}
 }