From d82584a7839f3190e842da9e9e939c17942f6cb5 Mon Sep 17 00:00:00 2001 From: Martin Kraft Date: Thu, 26 Sep 2019 14:11:55 -0400 Subject: [PATCH] MM-18668: Fix for scan error selecting null SchemeGuest columns. (#12370) --- store/sqlstore/group_store.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/store/sqlstore/group_store.go b/store/sqlstore/group_store.go index 84f2139845..0895ef0ae9 100644 --- a/store/sqlstore/group_store.go +++ b/store/sqlstore/group_store.go @@ -977,7 +977,7 @@ func (s *SqlGroupStore) teamMembersMinusGroupMembersQuery(teamID string, groupID if isCount { selectStr = "count(DISTINCT Users.Id)" } else { - tmpl := "Users.*, TeamMembers.SchemeGuest, TeamMembers.SchemeAdmin, TeamMembers.SchemeUser, %s AS GroupIDs" + tmpl := "Users.*, coalesce(TeamMembers.SchemeGuest, false), TeamMembers.SchemeAdmin, TeamMembers.SchemeUser, %s AS GroupIDs" if s.DriverName() == model.DATABASE_DRIVER_MYSQL { selectStr = fmt.Sprintf(tmpl, "group_concat(UserGroups.Id)") } else { @@ -1055,7 +1055,7 @@ func (s *SqlGroupStore) channelMembersMinusGroupMembersQuery(channelID string, g if isCount { selectStr = "count(DISTINCT Users.Id)" } else { - tmpl := "Users.*, ChannelMembers.SchemeGuest, ChannelMembers.SchemeAdmin, ChannelMembers.SchemeUser, %s AS GroupIDs" + tmpl := "Users.*, coalesce(ChannelMembers.SchemeGuest, false), ChannelMembers.SchemeAdmin, ChannelMembers.SchemeUser, %s AS GroupIDs" if s.DriverName() == model.DATABASE_DRIVER_MYSQL { selectStr = fmt.Sprintf(tmpl, "group_concat(UserGroups.Id)") } else {