diff options
| author | Martin Kraft <mkraft@users.noreply.github.com> | 2018-05-22 14:15:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 14:15:54 -0400 |
| commit | f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab (patch) | |
| tree | 85d274cb7ecca9ea6e8e595b15aa631c54acf1ea /store | |
| parent | 4c683aff7627040ff811f065848a820b2cb19d59 (diff) | |
| parent | ce378adc97399dcae9e1c9621c584669b813b2d2 (diff) | |
| download | chat-f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab.tar.gz chat-f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab.tar.bz2 chat-f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab.zip | |
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'store')
| -rw-r--r-- | store/sqlstore/upgrade.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 371639312..f6eb383f5 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -427,7 +427,7 @@ func UpgradeDatabaseToVersion410(sqlStore SqlStore) { func UpgradeDatabaseToVersion50(sqlStore SqlStore) { // TODO: Uncomment following condition when version 5.0.0 is released //if shouldPerformUpgrade(sqlStore, VERSION_4_10_0, VERSION_5_0_0) { - + sqlStore.CreateColumnIfNotExistsNoDefault("Teams", "SchemeId", "varchar(26)", "varchar(26)") sqlStore.CreateColumnIfNotExistsNoDefault("Channels", "SchemeId", "varchar(26)", "varchar(26)") @@ -439,6 +439,7 @@ func UpgradeDatabaseToVersion50(sqlStore SqlStore) { sqlStore.CreateColumnIfNotExists("Roles", "BuiltIn", "boolean", "boolean", "0") sqlStore.GetMaster().Exec("UPDATE Roles SET BuiltIn=true") sqlStore.GetMaster().Exec("UPDATE Roles SET SchemeManaged=false WHERE Name NOT IN ('system_user', 'system_admin', 'team_user', 'team_admin', 'channel_user', 'channel_admin')") + sqlStore.CreateColumnIfNotExists("IncomingWebhooks", "ChannelLocked", "boolean", "boolean", "0") // saveSchemaVersion(sqlStore, VERSION_5_0_0) //} |