IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-17109] Bump model version to 5.16 (#12172)

Browse Source 
* Bump model version to 5.16

* Make db schema version indipended of app version
This commit is contained in:
Ben Schumacher
2019-09-18 18:23:58 +02:00
committed by GitHub
parent 3a3676eb12
commit 3323e7a619
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
model/version.go
View File

@@ -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.16.0",
"5.15.0",
"5.14.0",
"5.13.0",

1
store/sqlstore/upgrade.go
View File

@@ -20,6 +20,7 @@ import (
)
const (
CURRENT_SCHEMA_VERSION = VERSION_5_15_0
VERSION_5_16_0 = "5.16.0"
VERSION_5_15_0 = "5.15.0"
VERSION_5_14_0 = "5.14.0"

23
store/sqlstore/upgrade_test.go
View File

@@ -6,7 +6,6 @@ package sqlstore
import (
"testing"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/store"
"github.com/stretchr/testify/require"
)
@@ -36,25 +35,25 @@ func TestStoreUpgrade(t *testing.T) {
t.Run("upgrade from earliest supported version", func(t *testing.T) {
saveSchemaVersion(sqlStore, VERSION_3_0_0)
err := UpgradeDatabase(sqlStore, model.CurrentVersion)
err := UpgradeDatabase(sqlStore, CURRENT_SCHEMA_VERSION)
require.NoError(t, err)
require.Equal(t, model.CurrentVersion, sqlStore.GetCurrentSchemaVersion())
require.Equal(t, CURRENT_SCHEMA_VERSION, sqlStore.GetCurrentSchemaVersion())
})
t.Run("upgrade from no existing version", func(t *testing.T) {
saveSchemaVersion(sqlStore, "")
err := UpgradeDatabase(sqlStore, model.CurrentVersion)
err := UpgradeDatabase(sqlStore, CURRENT_SCHEMA_VERSION)
require.NoError(t, err)
require.Equal(t, model.CurrentVersion, sqlStore.GetCurrentSchemaVersion())
require.Equal(t, CURRENT_SCHEMA_VERSION, sqlStore.GetCurrentSchemaVersion())
})
t.Run("upgrade schema running earlier minor version", func(t *testing.T) {
saveSchemaVersion(sqlStore, "5.1.0")
err := UpgradeDatabase(sqlStore, "5.8.0")
require.NoError(t, err)
// Assert model.CurrentVersion, not 5.8.0, since the migrations will move
// Assert CURRENT_SCHEMA_VERSION, not 5.8.0, since the migrations will move
// past 5.8.0 regardless of the input parameter.
require.Equal(t, model.CurrentVersion, sqlStore.GetCurrentSchemaVersion())
require.Equal(t, CURRENT_SCHEMA_VERSION, sqlStore.GetCurrentSchemaVersion())
})
t.Run("upgrade schema running later minor version", func(t *testing.T) {
@@ -66,9 +65,9 @@ func TestStoreUpgrade(t *testing.T) {
t.Run("upgrade schema running earlier major version", func(t *testing.T) {
saveSchemaVersion(sqlStore, "4.1.0")
err := UpgradeDatabase(sqlStore, model.CurrentVersion)
err := UpgradeDatabase(sqlStore, CURRENT_SCHEMA_VERSION)
require.NoError(t, err)
require.Equal(t, model.CurrentVersion, sqlStore.GetCurrentSchemaVersion())
require.Equal(t, CURRENT_SCHEMA_VERSION, sqlStore.GetCurrentSchemaVersion())
})
t.Run("upgrade schema running later major version", func(t *testing.T) {
@@ -94,12 +93,12 @@ func TestSaveSchemaVersion(t *testing.T) {
})
t.Run("set current version", func(t *testing.T) {
saveSchemaVersion(sqlStore, model.CurrentVersion)
saveSchemaVersion(sqlStore, CURRENT_SCHEMA_VERSION)
props, err := ss.System().Get()
require.Nil(t, err)
require.Equal(t, model.CurrentVersion, props["Version"])
require.Equal(t, model.CurrentVersion, sqlStore.GetCurrentSchemaVersion())
require.Equal(t, CURRENT_SCHEMA_VERSION, props["Version"])
require.Equal(t, CURRENT_SCHEMA_VERSION, sqlStore.GetCurrentSchemaVersion())
})
})
}