MM-35181 Move SharedChannelsUsers.ChannelId column add to 5.36 migration (#17518)

* add 5.36 migration
Этот коммит содержится в:
Doug Lauder
2021-04-28 10:46:10 -04:00
коммит произвёл GitHub
родитель ccc7365ac3
Коммит 12dbf0f527

Просмотреть файл

@@ -20,6 +20,7 @@ import (
const ( const (
CurrentSchemaVersion = Version5350 CurrentSchemaVersion = Version5350
Version5360 = "5.36.0"
Version5350 = "5.35.0" Version5350 = "5.35.0"
Version5340 = "5.34.0" Version5340 = "5.34.0"
Version5330 = "5.33.0" Version5330 = "5.33.0"
@@ -206,6 +207,7 @@ func upgradeDatabase(sqlStore *SqlStore, currentModelVersionString string) error
upgradeDatabaseToVersion533(sqlStore) upgradeDatabaseToVersion533(sqlStore)
upgradeDatabaseToVersion534(sqlStore) upgradeDatabaseToVersion534(sqlStore)
upgradeDatabaseToVersion535(sqlStore) upgradeDatabaseToVersion535(sqlStore)
upgradeDatabaseToVersion536(sqlStore)
return nil return nil
} }
@@ -1053,7 +1055,6 @@ func upgradeDatabaseToVersion535(sqlStore *SqlStore) {
uniquenessColumns = []string{"RemoteTeamId", "SiteUrl(168)"} uniquenessColumns = []string{"RemoteTeamId", "SiteUrl(168)"}
} }
sqlStore.CreateUniqueCompositeIndexIfNotExists(RemoteClusterSiteURLUniqueIndex, "RemoteClusters", uniquenessColumns) sqlStore.CreateUniqueCompositeIndexIfNotExists(RemoteClusterSiteURLUniqueIndex, "RemoteClusters", uniquenessColumns)
sqlStore.CreateColumnIfNotExists("SharedChannelUsers", "ChannelId", "VARCHAR(26)", "VARCHAR(26)", "")
rootCountMigration(sqlStore) rootCountMigration(sqlStore)
@@ -1061,6 +1062,15 @@ func upgradeDatabaseToVersion535(sqlStore *SqlStore) {
} }
} }
func upgradeDatabaseToVersion536(sqlStore *SqlStore) {
//if shouldPerformUpgrade(sqlStore, Version5350, Version5360) {
sqlStore.CreateColumnIfNotExists("SharedChannelUsers", "ChannelId", "VARCHAR(26)", "VARCHAR(26)", "")
//saveSchemaVersion(sqlStore, Version5360)
//}
}
func rootCountMigration(sqlStore *SqlStore) { func rootCountMigration(sqlStore *SqlStore) {
totalMsgCountRootExists := sqlStore.DoesColumnExist("Channels", "TotalMsgCountRoot") totalMsgCountRootExists := sqlStore.DoesColumnExist("Channels", "TotalMsgCountRoot")
msgCountRootExists := sqlStore.DoesColumnExist("ChannelMembers", "MsgCountRoot") msgCountRootExists := sqlStore.DoesColumnExist("ChannelMembers", "MsgCountRoot")