From ec22cf9a08e80588ba8fae56a241c6f225566ee4 Mon Sep 17 00:00:00 2001 From: Ashish Bhate Date: Tue, 11 Jan 2022 19:59:52 +0530 Subject: [PATCH] [MM-37013]: Fix store get for null columns (#19310) Automatic Merge --- store/sqlstore/channel_store.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index c6a5309ca8..5f4f6b878a 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -3726,10 +3726,10 @@ func (s SqlChannelStore) GetCRTUnfixedChannelMembershipsAfter(channelID, userID LIMIT :count; ` } - var cms []model.ChannelMember + var dbMembers channelMemberWithSchemeRolesList - if _, err := s.GetReplica().Select(&cms, getUnfixedCMQuery, map[string]interface{}{"channelId": channelID, "userId": userID, "count": count}); err != nil { - return nil, errors.Wrapf(err, "failed to %d ChannelMembers after channelId=%q and userId=%q", count, channelID, userID) + if _, err := s.GetReplica().Select(&dbMembers, getUnfixedCMQuery, map[string]interface{}{"channelId": channelID, "userId": userID, "count": count}); err != nil { + return nil, errors.Wrapf(err, "failed to get %d ChannelMembers after channelId=%q and userId=%q", count, channelID, userID) } - return cms, nil + return dbMembers.ToModel(), nil }