Этот коммит содержится в:
Carlos Tadeu Panato Junior
2021-04-23 15:28:01 +02:00
коммит произвёл GitHub
родитель 9cd50a4e22
Коммит 246e4f9508
2 изменённых файлов: 25 добавлений и 24 удалений

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

@@ -13,6 +13,7 @@ import (
// It should be maintained in chronological order with most current
// release at the front of the list.
var versions = []string{
"5.35.0",
"5.34.0",
"5.33.0",
"5.32.0",

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

@@ -19,7 +19,7 @@ import (
)
const (
CurrentSchemaVersion = Version5340
CurrentSchemaVersion = Version5350
Version5350 = "5.35.0"
Version5340 = "5.34.0"
Version5330 = "5.33.0"
@@ -1033,32 +1033,32 @@ func upgradeDatabaseToVersion534(sqlStore *SqlStore) {
}
func upgradeDatabaseToVersion535(sqlStore *SqlStore) {
// if shouldPerformUpgrade(sqlStore, Version5340, Version5350) {
sqlStore.AlterColumnTypeIfExists("Roles", "Permissions", "longtext", "text")
if shouldPerformUpgrade(sqlStore, Version5340, Version5350) {
sqlStore.AlterColumnTypeIfExists("Roles", "Permissions", "longtext", "text")
sqlStore.CreateColumnIfNotExists("SidebarCategories", "Collapsed", "tinyint(1)", "boolean", "0")
sqlStore.CreateColumnIfNotExists("SidebarCategories", "Collapsed", "tinyint(1)", "boolean", "0")
// Shared channels support
sqlStore.CreateColumnIfNotExistsNoDefault("Reactions", "RemoteId", "VARCHAR(26)", "VARCHAR(26)")
sqlStore.CreateColumnIfNotExistsNoDefault("Users", "RemoteId", "VARCHAR(26)", "VARCHAR(26)")
sqlStore.CreateColumnIfNotExistsNoDefault("Posts", "RemoteId", "VARCHAR(26)", "VARCHAR(26)")
sqlStore.CreateColumnIfNotExistsNoDefault("FileInfo", "RemoteId", "VARCHAR(26)", "VARCHAR(26)")
sqlStore.CreateColumnIfNotExists("UploadSessions", "RemoteId", "VARCHAR(26)", "VARCHAR(26)", "")
sqlStore.CreateColumnIfNotExists("UploadSessions", "ReqFileId", "VARCHAR(26)", "VARCHAR(26)", "")
if _, err := sqlStore.GetMaster().ExecNoTimeout("UPDATE UploadSessions SET RemoteId='', ReqFileId='' WHERE RemoteId IS NULL"); err != nil {
mlog.Error("Error updating RemoteId,ReqFileId in UploadsSession table", mlog.Err(err))
// Shared channels support
sqlStore.CreateColumnIfNotExistsNoDefault("Reactions", "RemoteId", "VARCHAR(26)", "VARCHAR(26)")
sqlStore.CreateColumnIfNotExistsNoDefault("Users", "RemoteId", "VARCHAR(26)", "VARCHAR(26)")
sqlStore.CreateColumnIfNotExistsNoDefault("Posts", "RemoteId", "VARCHAR(26)", "VARCHAR(26)")
sqlStore.CreateColumnIfNotExistsNoDefault("FileInfo", "RemoteId", "VARCHAR(26)", "VARCHAR(26)")
sqlStore.CreateColumnIfNotExists("UploadSessions", "RemoteId", "VARCHAR(26)", "VARCHAR(26)", "")
sqlStore.CreateColumnIfNotExists("UploadSessions", "ReqFileId", "VARCHAR(26)", "VARCHAR(26)", "")
if _, err := sqlStore.GetMaster().ExecNoTimeout("UPDATE UploadSessions SET RemoteId='', ReqFileId='' WHERE RemoteId IS NULL"); err != nil {
mlog.Error("Error updating RemoteId,ReqFileId in UploadsSession table", mlog.Err(err))
}
uniquenessColumns := []string{"SiteUrl", "RemoteTeamId"}
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
uniquenessColumns = []string{"RemoteTeamId", "SiteUrl(168)"}
}
sqlStore.CreateUniqueCompositeIndexIfNotExists(RemoteClusterSiteURLUniqueIndex, "RemoteClusters", uniquenessColumns)
sqlStore.CreateColumnIfNotExists("SharedChannelUsers", "ChannelId", "VARCHAR(26)", "VARCHAR(26)", "")
rootCountMigration(sqlStore)
saveSchemaVersion(sqlStore, Version5350)
}
uniquenessColumns := []string{"SiteUrl", "RemoteTeamId"}
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
uniquenessColumns = []string{"RemoteTeamId", "SiteUrl(168)"}
}
sqlStore.CreateUniqueCompositeIndexIfNotExists(RemoteClusterSiteURLUniqueIndex, "RemoteClusters", uniquenessColumns)
sqlStore.CreateColumnIfNotExists("SharedChannelUsers", "ChannelId", "VARCHAR(26)", "VARCHAR(26)", "")
rootCountMigration(sqlStore)
// saveSchemaVersion(sqlStore, Version5350)
// }
}
func rootCountMigration(sqlStore *SqlStore) {