diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-04-05 11:27:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 11:27:19 -0400 |
| commit | f7dd715052741097616816f9cce600006e5c2290 (patch) | |
| tree | 63017c41e7123aa5d867643e88437fba37e62aee | |
| parent | 715a7f893dc4a855083331333629cb50528a030d (diff) | |
| download | chat-f7dd715052741097616816f9cce600006e5c2290.tar.gz chat-f7dd715052741097616816f9cce600006e5c2290.tar.bz2 chat-f7dd715052741097616816f9cce600006e5c2290.zip | |
update db code for release branch only (#8584)
| -rw-r--r-- | model/version.go | 1 | ||||
| -rw-r--r-- | store/sqlstore/upgrade.go | 21 |
2 files changed, 11 insertions, 11 deletions
diff --git a/model/version.go b/model/version.go index 38ace0bde..a58ca4df6 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{ + "4.9.0", "4.8.1", "4.8.0", "4.7.2", diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 89c6e3d07..ae0ea7acd 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -396,16 +396,15 @@ func UpgradeDatabaseToVersion49(sqlStore SqlStore) { // a number of parameters in `config.json` to a `Roles` table in the database. The migration code can be seen // in the file `app/app.go` in the function `DoAdvancedPermissionsMigration()`. - //TODO: Uncomment the following condition when version 4.9.0 is released - //if shouldPerformUpgrade(sqlStore, VERSION_4_8_1, VERSION_4_9_0) { - sqlStore.CreateColumnIfNotExists("Teams", "LastTeamIconUpdate", "bigint", "bigint", "0") - defaultTimezone := model.DefaultUserTimezone() - defaultTimezoneValue, err := json.Marshal(defaultTimezone) - if err != nil { - l4g.Critical(err) + if shouldPerformUpgrade(sqlStore, VERSION_4_8_1, VERSION_4_9_0) { + sqlStore.CreateColumnIfNotExists("Teams", "LastTeamIconUpdate", "bigint", "bigint", "0") + defaultTimezone := model.DefaultUserTimezone() + defaultTimezoneValue, err := json.Marshal(defaultTimezone) + if err != nil { + l4g.Critical(err) + } + sqlStore.CreateColumnIfNotExists("Users", "Timezone", "varchar(256)", "varchar(256)", string(defaultTimezoneValue)) + sqlStore.RemoveIndexIfExists("idx_channels_displayname", "Channels") + saveSchemaVersion(sqlStore, VERSION_4_9_0) } - sqlStore.CreateColumnIfNotExists("Users", "Timezone", "varchar(256)", "varchar(256)", string(defaultTimezoneValue)) - sqlStore.RemoveIndexIfExists("idx_channels_displayname", "Channels") - // saveSchemaVersion(sqlStore, VERSION_4_9_0) - //} } |