summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
authorCarlos Tadeu Panato Junior <ctadeu@gmail.com>2018-06-05 20:17:53 +0200
committerGitHub <noreply@github.com>2018-06-05 20:17:53 +0200
commitbfba142e2bfe75e1adffb5f4b5facb77bd16fc21 (patch)
tree6c68de6641ed7e89a326361352d1c656a348cd47 /store
parent3bae2f3b37237eda300b934006401d7af81ff03b (diff)
downloadchat-bfba142e2bfe75e1adffb5f4b5facb77bd16fc21.tar.gz
chat-bfba142e2bfe75e1adffb5f4b5facb77bd16fc21.tar.bz2
chat-bfba142e2bfe75e1adffb5f4b5facb77bd16fc21.zip
Uncomment upgrade for 5.0.0 (#8914)
Diffstat (limited to 'store')
-rw-r--r--store/sqlstore/upgrade.go27
1 files changed, 13 insertions, 14 deletions
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index 98a89f36d..8356ef17f 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -429,22 +429,21 @@ func UpgradeDatabaseToVersion50(sqlStore SqlStore) {
// in `config.json` to a `Permission` in the database. The migration code can be seen
// in the file `app/app.go` in the function `DoEmojisPermissionsMigration()`.
- // TODO: Uncomment following condition when version 5.0.0 is released
- //if shouldPerformUpgrade(sqlStore, VERSION_4_10_0, VERSION_5_0_0) {
+ 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)")
+ sqlStore.CreateColumnIfNotExistsNoDefault("Teams", "SchemeId", "varchar(26)", "varchar(26)")
+ sqlStore.CreateColumnIfNotExistsNoDefault("Channels", "SchemeId", "varchar(26)", "varchar(26)")
- sqlStore.CreateColumnIfNotExistsNoDefault("TeamMembers", "SchemeUser", "boolean", "boolean")
- sqlStore.CreateColumnIfNotExistsNoDefault("TeamMembers", "SchemeAdmin", "boolean", "boolean")
- sqlStore.CreateColumnIfNotExistsNoDefault("ChannelMembers", "SchemeUser", "boolean", "boolean")
- sqlStore.CreateColumnIfNotExistsNoDefault("ChannelMembers", "SchemeAdmin", "boolean", "boolean")
+ sqlStore.CreateColumnIfNotExistsNoDefault("TeamMembers", "SchemeUser", "boolean", "boolean")
+ sqlStore.CreateColumnIfNotExistsNoDefault("TeamMembers", "SchemeAdmin", "boolean", "boolean")
+ sqlStore.CreateColumnIfNotExistsNoDefault("ChannelMembers", "SchemeUser", "boolean", "boolean")
+ sqlStore.CreateColumnIfNotExistsNoDefault("ChannelMembers", "SchemeAdmin", "boolean", "boolean")
- 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")
+ 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)
- //}
+ saveSchemaVersion(sqlStore, VERSION_5_0_0)
+ }
}