* uncoment db upgrade to 5.8.0

* add preparatory code for db upgrade 5.9.0

* fix versions

* Update store/sqlstore/upgrade.go

Co-Authored-By: cpanato <ctadeu@gmail.com>
Этот коммит содержится в:
Carlos Tadeu Panato Junior
2019-01-29 17:14:00 +01:00
коммит произвёл Joram Wilander
родитель d1a758a06e
Коммит d4250f50d8
2 изменённых файлов: 25 добавлений и 15 удалений

Просмотреть файл

@@ -13,6 +13,7 @@ import (
// It should be maintained in chronological order with most current // It should be maintained in chronological order with most current
// release at the front of the list. // release at the front of the list.
var versions = []string{ var versions = []string{
"5.8.0",
"5.7.0", "5.7.0",
"5.6.0", "5.6.0",
"5.5.0", "5.5.0",

Просмотреть файл

@@ -16,6 +16,8 @@ import (
) )
const ( const (
VERSION_5_9_0 = "5.9.0"
VERSION_5_8_0 = "5.8.0"
VERSION_5_7_0 = "5.7.0" VERSION_5_7_0 = "5.7.0"
VERSION_5_6_0 = "5.6.0" VERSION_5_6_0 = "5.6.0"
VERSION_5_5_0 = "5.5.0" VERSION_5_5_0 = "5.5.0"
@@ -94,6 +96,7 @@ func UpgradeDatabase(sqlStore SqlStore) {
UpgradeDatabaseToVersion56(sqlStore) UpgradeDatabaseToVersion56(sqlStore)
UpgradeDatabaseToVersion57(sqlStore) UpgradeDatabaseToVersion57(sqlStore)
UpgradeDatabaseToVersion58(sqlStore) UpgradeDatabaseToVersion58(sqlStore)
UpgradeDatabaseToVersion59(sqlStore)
// If the SchemaVersion is empty this this is the first time it has ran // If the SchemaVersion is empty this this is the first time it has ran
// so lets set it to the current version. // so lets set it to the current version.
@@ -545,9 +548,7 @@ func UpgradeDatabaseToVersion57(sqlStore SqlStore) {
} }
func UpgradeDatabaseToVersion58(sqlStore SqlStore) { func UpgradeDatabaseToVersion58(sqlStore SqlStore) {
// TODO: Uncomment following condition when version 5.8.0 is released if shouldPerformUpgrade(sqlStore, VERSION_5_7_0, VERSION_5_8_0) {
// if shouldPerformUpgrade(sqlStore, VERSION_5_7_0, VERSION_5_8_0) {
// idx_channels_txt was removed in `UpgradeDatabaseToVersion50`, but merged as part of // idx_channels_txt was removed in `UpgradeDatabaseToVersion50`, but merged as part of
// v5.1, so the migration wouldn't apply to anyone upgrading from v5.0. Remove it again to // v5.1, so the migration wouldn't apply to anyone upgrading from v5.0. Remove it again to
// bring the upgraded (from v5.0) and fresh install schemas back in sync. // bring the upgraded (from v5.0) and fresh install schemas back in sync.
@@ -562,6 +563,14 @@ func UpgradeDatabaseToVersion58(sqlStore SqlStore) {
sqlStore.AlterColumnDefaultIfExists("OutgoingWebhooks", "IconURL", nil, model.NewString("")) sqlStore.AlterColumnDefaultIfExists("OutgoingWebhooks", "IconURL", nil, model.NewString(""))
sqlStore.AlterColumnDefaultIfExists("PluginKeyValueStore", "ExpireAt", model.NewString("NULL"), model.NewString("NULL")) sqlStore.AlterColumnDefaultIfExists("PluginKeyValueStore", "ExpireAt", model.NewString("NULL"), model.NewString("NULL"))
// saveSchemaVersion(sqlStore, VERSION_5_8_0) saveSchemaVersion(sqlStore, VERSION_5_8_0)
}
}
func UpgradeDatabaseToVersion59(sqlStore SqlStore) {
// TODO: Uncomment following condition when version 5.9.0 is released
// if shouldPerformUpgrade(sqlStore, VERSION_5_8_0, VERSION_5_9_0) {
// saveSchemaVersion(sqlStore, VERSION_5_9_0)
// } // }
} }