diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index e52fe89bde..02424a23d4 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -19,7 +19,7 @@ import ( ) const ( - CURRENT_SCHEMA_VERSION = VERSION_5_29_0 + CURRENT_SCHEMA_VERSION = VERSION_5_30_0 VERSION_5_30_0 = "5.30.0" VERSION_5_29_0 = "5.29.0" VERSION_5_28_1 = "5.28.1" @@ -942,12 +942,10 @@ func upgradeDatabaseToVersion529(sqlStore *SqlStore) { } func upgradeDatabaseToVersion530(sqlStore *SqlStore) { - // if shouldPerformUpgrade(sqlStore, VERSION_5_29_0, VERSION_5_30_0) { + if shouldPerformUpgrade(sqlStore, VERSION_5_29_0, VERSION_5_30_0) { + sqlStore.CreateColumnIfNotExistsNoDefault("FileInfo", "Content", "longtext", "text") - sqlStore.CreateColumnIfNotExistsNoDefault("FileInfo", "Content", "longtext", "text") - - sqlStore.CreateColumnIfNotExists("SidebarCategories", "Muted", "tinyint(1)", "boolean", "0") - - // saveSchemaVersion(sqlStore, VERSION_5_30_0) - // } + sqlStore.CreateColumnIfNotExists("SidebarCategories", "Muted", "tinyint(1)", "boolean", "0") + saveSchemaVersion(sqlStore, VERSION_5_30_0) + } } diff --git a/store/sqlstore/upgrade_test.go b/store/sqlstore/upgrade_test.go index 48ac4142f0..d27e2644b3 100644 --- a/store/sqlstore/upgrade_test.go +++ b/store/sqlstore/upgrade_test.go @@ -57,10 +57,10 @@ func TestStoreUpgrade(t *testing.T) { }) t.Run("upgrade schema running later minor version", func(t *testing.T) { - saveSchemaVersion(sqlStore, "5.29.0") + saveSchemaVersion(sqlStore, "5.99.0") err := upgradeDatabase(sqlStore, "5.8.0") require.NoError(t, err) - require.Equal(t, "5.29.0", sqlStore.GetCurrentSchemaVersion()) + require.Equal(t, "5.99.0", sqlStore.GetCurrentSchemaVersion()) }) t.Run("upgrade schema running earlier major version", func(t *testing.T) {