Merge pull request #1152 from jlebleu/PLT-797

PLT-797 Update System Table with latest version
Этот коммит содержится в:
Joram Wilander
2015-10-23 08:16:30 -04:00
родитель d404aa1a4c f0a31c209d
Коммит 8db383d2e3

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

@@ -73,6 +73,7 @@ func NewSqlStore() Store {
} }
schemaVersion := sqlStore.GetCurrentSchemaVersion() schemaVersion := sqlStore.GetCurrentSchemaVersion()
isSchemaVersion07 := false
// If the version is already set then we are potentially in an 'upgrade needed' state // If the version is already set then we are potentially in an 'upgrade needed' state
if schemaVersion != "" { if schemaVersion != "" {
@@ -81,7 +82,6 @@ func NewSqlStore() Store {
// If we are upgrading from the previous version then print a warning and continue // If we are upgrading from the previous version then print a warning and continue
// Special case // Special case
isSchemaVersion07 := false
if schemaVersion == "0.7.1" || schemaVersion == "0.7.0" { if schemaVersion == "0.7.1" || schemaVersion == "0.7.0" {
isSchemaVersion07 = true isSchemaVersion07 = true
} }
@@ -140,7 +140,7 @@ func NewSqlStore() Store {
sqlStore.webhook.(*SqlWebhookStore).CreateIndexesIfNotExists() sqlStore.webhook.(*SqlWebhookStore).CreateIndexesIfNotExists()
sqlStore.preference.(*SqlPreferenceStore).CreateIndexesIfNotExists() sqlStore.preference.(*SqlPreferenceStore).CreateIndexesIfNotExists()
if model.IsPreviousVersion(schemaVersion) { if model.IsPreviousVersion(schemaVersion) || isSchemaVersion07 {
sqlStore.system.Update(&model.System{Name: "Version", Value: model.CurrentVersion}) sqlStore.system.Update(&model.System{Name: "Version", Value: model.CurrentVersion})
l4g.Warn("The database schema has been upgraded to version " + model.CurrentVersion) l4g.Warn("The database schema has been upgraded to version " + model.CurrentVersion)
} }