From 1e34cf8ab00a56318290b3f18acd6334c971944f Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 7 Dec 2015 14:56:46 -0500 Subject: Make sure posts in threads are included in getPosts DB query --- store/sql_post_store.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/store/sql_post_store.go b/store/sql_post_store.go index 035309e21..be770c09e 100644 --- a/store/sql_post_store.go +++ b/store/sql_post_store.go @@ -571,7 +571,8 @@ func (s SqlPostStore) getParentsPosts(channelId string, offset int, limit int) S AND DeleteAt = 0 ORDER BY CreateAt DESC LIMIT :Limit OFFSET :Offset) q3 - WHERE q3.RootId != '') q1 ON q1.RootId = q2.Id + WHERE q3.RootId != '') q1 + ON q1.RootId = q2.Id OR q1.RootId = q2.RootId WHERE ChannelId = :ChannelId2 AND DeleteAt = 0 -- cgit v1.2.3-1-g7c22 From 910b3216fe78c8df53451ab33d359c42c5c5e38e Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 7 Dec 2015 15:10:03 -0500 Subject: Update unit test --- store/sql_post_store_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store/sql_post_store_test.go b/store/sql_post_store_test.go index 12b50cad3..a3e3e10dd 100644 --- a/store/sql_post_store_test.go +++ b/store/sql_post_store_test.go @@ -445,7 +445,7 @@ func TestPostStoreGetPostsWtihDetails(t *testing.T) { t.Fatal("invalid order") } - if len(r1.Posts) != 5 { //the last 4, + o1 (o3 and o2a's parent) + if len(r1.Posts) != 6 { //the last 4, + o1 (o2a and o3's parent) + o2 (in same thread as o2a and o3) t.Fatal("wrong size") } -- cgit v1.2.3-1-g7c22