diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-09 15:00:07 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-09 15:00:07 -0400 |
| commit | d3e14a1bf86ac6148e09f888384cb46c61f23cdc (patch) | |
| tree | 1c634c90166964f5184cb1ebd20ffb8ed209b120 /store | |
| parent | 60cf74352f13874a7d07c609c03b1c763af19cea (diff) | |
| parent | c1853c7f40dd67c49524c8ea884ab61883a6abdd (diff) | |
| download | chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.tar.gz chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.tar.bz2 chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'store')
| -rw-r--r-- | store/sqlstore/upgrade.go | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 3fc3ba79b..45515178d 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -15,6 +15,7 @@ import ( ) const ( + VERSION_5_0_0 = "5.0.0" VERSION_4_10_0 = "4.10.0" VERSION_4_9_0 = "4.9.0" VERSION_4_8_1 = "4.8.1" @@ -76,6 +77,7 @@ func UpgradeDatabase(sqlStore SqlStore) { UpgradeDatabaseToVersion481(sqlStore) UpgradeDatabaseToVersion49(sqlStore) UpgradeDatabaseToVersion410(sqlStore) + UpgradeDatabaseToVersion50(sqlStore) // If the SchemaVersion is empty this this is the first time it has ran // so lets set it to the current version. @@ -411,26 +413,20 @@ func UpgradeDatabaseToVersion49(sqlStore SqlStore) { } func UpgradeDatabaseToVersion410(sqlStore SqlStore) { - // TODO: Uncomment following condition when version 4.10.0 is released - //if shouldPerformUpgrade(sqlStore, VERSION_4_9_0, VERSION_4_10_0) { + if shouldPerformUpgrade(sqlStore, VERSION_4_9_0, VERSION_4_10_0) { - sqlStore.RemoveIndexIfExists("Name_2", "Channels") - sqlStore.RemoveIndexIfExists("Name_2", "Emoji") - sqlStore.RemoveIndexIfExists("ClientId_2", "OAuthAccessData") + sqlStore.RemoveIndexIfExists("Name_2", "Channels") + sqlStore.RemoveIndexIfExists("Name_2", "Emoji") + sqlStore.RemoveIndexIfExists("ClientId_2", "OAuthAccessData") - // saveSchemaVersion(sqlStore, VERSION_4_10_0) - 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.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')") + saveSchemaVersion(sqlStore, VERSION_4_10_0) + sqlStore.GetMaster().Exec("UPDATE Users SET AuthData=LOWER(AuthData) WHERE AuthService = 'saml'") + } +} - // saveSchemaVersion(sqlStore, VERSION_4_9_0) +func UpgradeDatabaseToVersion50(sqlStore SqlStore) { + // TODO: Uncomment following condition when version 3.10.0 is released + //if shouldPerformUpgrade(sqlStore, VERSION_4_10_0, VERSION_5_0_0) { + // saveSchemaVersion(sqlStore, VERSION_5_0_0) //} } |