From f39dd28b72acdfa2a120e01e28a3c0b276c34c72 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 3 Jun 2019 14:41:53 -0700 Subject: [PATCH] Upgrading schema version to 5.12.0 (#11043) --- model/version.go | 1 + store/sqlstore/upgrade.go | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/model/version.go b/model/version.go index b8600ec1dc..2a20ce80ac 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.12.0", "5.11.0", "5.10.0", "5.9.0", diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 9df462dfec..4c4eceb390 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -20,6 +20,7 @@ import ( ) const ( + VERSION_5_12_0 = "5.12.0" VERSION_5_11_0 = "5.11.0" VERSION_5_10_0 = "5.10.0" VERSION_5_9_0 = "5.9.0" @@ -678,14 +679,13 @@ func UpgradeDatabaseToVersion511(sqlStore SqlStore) { } func UpgradeDatabaseToVersion512(sqlStore SqlStore) { - // TODO: Uncomment following condition when version 5.12.0 is released - // if shouldPerformUpgrade(sqlStore, VERSION_5_11_0, VERSION_5_12_0) { - sqlStore.CreateColumnIfNotExistsNoDefault("TeamMembers", "SchemeGuest", "boolean", "boolean") - sqlStore.CreateColumnIfNotExistsNoDefault("ChannelMembers", "SchemeGuest", "boolean", "boolean") - sqlStore.CreateColumnIfNotExistsNoDefault("Schemes", "DefaultTeamGuestRole", "text", "VARCHAR(64)") - sqlStore.CreateColumnIfNotExistsNoDefault("Schemes", "DefaultChannelGuestRole", "text", "VARCHAR(64)") - sqlStore.GetMaster().Exec("UPDATE Schemes SET DefaultTeamGuestRole = '', DefaultChannelGuestRole = ''") + if shouldPerformUpgrade(sqlStore, VERSION_5_11_0, VERSION_5_12_0) { + sqlStore.CreateColumnIfNotExistsNoDefault("TeamMembers", "SchemeGuest", "boolean", "boolean") + sqlStore.CreateColumnIfNotExistsNoDefault("ChannelMembers", "SchemeGuest", "boolean", "boolean") + sqlStore.CreateColumnIfNotExistsNoDefault("Schemes", "DefaultTeamGuestRole", "text", "VARCHAR(64)") + sqlStore.CreateColumnIfNotExistsNoDefault("Schemes", "DefaultChannelGuestRole", "text", "VARCHAR(64)") + sqlStore.GetMaster().Exec("UPDATE Schemes SET DefaultTeamGuestRole = '', DefaultChannelGuestRole = ''") - // saveSchemaVersion(sqlStore, VERSION_5_12_0) - // } + saveSchemaVersion(sqlStore, VERSION_5_12_0) + } }