From a8caee330ad64c305768530e3d59c5500d66c1a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Wed, 22 May 2019 12:31:26 +0200
Subject: [PATCH] MM-15728: Fixing not initialized SchemeGuest field on bulk
 indexing query (#10906)

* MM-15728: Fixing not initialized SchemeGuest field on bulk indexing query

* Fix typo
---
 store/sqlstore/user_store.go | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/store/sqlstore/user_store.go b/store/sqlstore/user_store.go
index 0acb94de98..dd61e223ed 100644
--- a/store/sqlstore/user_store.go
+++ b/store/sqlstore/user_store.go
@@ -1550,7 +1550,19 @@ func (us SqlUserStore) GetUsersBatchForIndexing(startTime, endTime int64, limit
 
 		var channelMembers []*model.ChannelMember
 		channelMembersQuery, args, _ := us.getQueryBuilder().
-			Select("cm.*").
+			Select(`
+				cm.ChannelId,
+				cm.UserId,
+				cm.Roles,
+				cm.LastViewedAt,
+				cm.MsgCount,
+				cm.MentionCount,
+				cm.NotifyProps,
+				cm.LastUpdateAt,
+				cm.SchemeUser,
+				cm.SchemeAdmin,
+				(cm.SchemeGuest IS NOT NULL AND cm.SchemeGuest) as SchemeGuest
+			`).
 			From("ChannelMembers cm").
 			Join("Channels c ON cm.ChannelId = c.Id").
 			Where(sq.Eq{"c.Type": "O", "cm.UserId": userIds}).