From c91ab6267ab9f1a67550c18b729f74bbcfbd9376 Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Tue, 26 Oct 2021 14:02:03 +0530 Subject: [PATCH] Revert "Optimize TotalUnreadThreads (#18788)" (#18845) This reverts commit 971af6935c509191ab3a32d5d35435d60dab64f4. --- store/sqlstore/thread_store.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/store/sqlstore/thread_store.go b/store/sqlstore/thread_store.go index 247d137ed7..8a1cce8f20 100644 --- a/store/sqlstore/thread_store.go +++ b/store/sqlstore/thread_store.go @@ -149,7 +149,7 @@ func (s *SqlThreadStore) GetThreadsForUser(userId, teamId string, opts model.Get if !opts.Deleted { fetchConditions = sq.And{ fetchConditions, - sq.Eq{"Posts.DeleteAt": 0}, + sq.Eq{"COALESCE(Posts.DeleteAt, 0)": 0}, } } @@ -169,9 +169,9 @@ func (s *SqlThreadStore) GetThreadsForUser(userId, teamId string, opts model.Get go func() { repliesQuery, repliesQueryArgs, _ := s.getQueryBuilder(). Select("COUNT(DISTINCT(Posts.RootId))"). - From("Posts, ThreadMemberships, Channels"). - Where("Posts.RootId = ThreadMemberships.PostId"). - Where("Posts.ChannelId = Channels.Id"). + From("Posts"). + LeftJoin("ThreadMemberships ON Posts.RootId = ThreadMemberships.PostId"). + LeftJoin("Channels ON Posts.ChannelId = Channels.Id"). Where(fetchConditions). Where("Posts.CreateAt > ThreadMemberships.LastViewed").ToSql()