From 7573efe0390a6a1c5cdd814939aea485d321446d Mon Sep 17 00:00:00 2001 From: Eli Yukelzon Date: Tue, 6 Apr 2021 11:27:09 +0300 Subject: [PATCH] merge fix (#17337) --- store/sqlstore/upgrade.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index ed283cf85d..b2e2ca6465 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -1030,8 +1030,6 @@ func upgradeDatabaseToVersion535(sqlStore *SqlStore) { } sqlStore.CreateUniqueCompositeIndexIfNotExists(RemoteClusterSiteURLUniqueIndex, "RemoteClusters", uniquenessColumns) - sqlStore.CreateColumnIfNotExistsNoDefault("Channels", "TotalMsgCountRoot", "bigint", "bigint") - // note: setting default 0 on pre-5.0 tables causes test-db-migration script to fail, so this column will be added to ignore list sqlStore.CreateColumnIfNotExists("ChannelMembers", "MentionCountRoot", "bigint", "bigint", "0") sqlStore.AlterColumnDefaultIfExists("ChannelMembers", "MentionCountRoot", model.NewString("0"), model.NewString("0"))