From ebe7c6b76b0c293f378a66d918d2f5491c89c94c Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 7 Nov 2016 09:17:08 -0500 Subject: Updated stored database schema number to 3.5 --- store/sql_upgrade.go | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) (limited to 'store/sql_upgrade.go') diff --git a/store/sql_upgrade.go b/store/sql_upgrade.go index 824d0c3f0..992fac189 100644 --- a/store/sql_upgrade.go +++ b/store/sql_upgrade.go @@ -189,28 +189,24 @@ func UpgradeDatabaseToVersion34(sqlStore *SqlStore) { } func UpgradeDatabaseToVersion35(sqlStore *SqlStore) { - //if shouldPerformUpgrade(sqlStore, VERSION_3_4_0, VERSION_3_5_0) { - - sqlStore.GetMaster().Exec("UPDATE Users SET Roles = 'system_user' WHERE Roles = ''") - sqlStore.GetMaster().Exec("UPDATE Users SET Roles = 'system_user system_admin' WHERE Roles = 'system_admin'") - sqlStore.GetMaster().Exec("UPDATE TeamMembers SET Roles = 'team_user' WHERE Roles = ''") - sqlStore.GetMaster().Exec("UPDATE TeamMembers SET Roles = 'team_user team_admin' WHERE Roles = 'admin'") - sqlStore.GetMaster().Exec("UPDATE ChannelMembers SET Roles = 'channel_user' WHERE Roles = ''") - sqlStore.GetMaster().Exec("UPDATE ChannelMembers SET Roles = 'channel_user channel_admin' WHERE Roles = 'admin'") + if shouldPerformUpgrade(sqlStore, VERSION_3_4_0, VERSION_3_5_0) { + sqlStore.GetMaster().Exec("UPDATE Users SET Roles = 'system_user' WHERE Roles = ''") + sqlStore.GetMaster().Exec("UPDATE Users SET Roles = 'system_user system_admin' WHERE Roles = 'system_admin'") + sqlStore.GetMaster().Exec("UPDATE TeamMembers SET Roles = 'team_user' WHERE Roles = ''") + sqlStore.GetMaster().Exec("UPDATE TeamMembers SET Roles = 'team_user team_admin' WHERE Roles = 'admin'") + sqlStore.GetMaster().Exec("UPDATE ChannelMembers SET Roles = 'channel_user' WHERE Roles = ''") + sqlStore.GetMaster().Exec("UPDATE ChannelMembers SET Roles = 'channel_user channel_admin' WHERE Roles = 'admin'") + + // The rest of the migration from Filenames -> FileIds is done lazily in api.GetFileInfosForPost + sqlStore.CreateColumnIfNotExists("Posts", "FileIds", "varchar(150)", "varchar(150)", "[]") + + // Increase maximum length of the Channel table Purpose column. + if sqlStore.GetMaxLengthOfColumnIfExists("Channels", "Purpose") != "250" { + sqlStore.AlterColumnTypeIfExists("Channels", "Purpose", "varchar(250)", "varchar(250)") + } - // The rest of the migration from Filenames -> FileIds is done lazily in api.GetFileInfosForPost - sqlStore.CreateColumnIfNotExists("Posts", "FileIds", "varchar(150)", "varchar(150)", "[]") + sqlStore.Session().RemoveAllSessions() - // Increase maximum length of the Channel table Purpose column. - if sqlStore.GetMaxLengthOfColumnIfExists("Channels", "Purpose") != "250" { - sqlStore.AlterColumnTypeIfExists("Channels", "Purpose", "varchar(250)", "varchar(250)") + saveSchemaVersion(sqlStore, VERSION_3_5_0) } - - // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - // UNCOMMENT WHEN WE DO RELEASE - // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - //sqlStore.Session().RemoveAllSessions() - - //saveSchemaVersion(sqlStore, VERSION_3_5_0) - //} } -- cgit v1.2.3-1-g7c22