FIXUP - Move child group field propogation into p.GroupBy

sourcenetwork · Nov 19, 2021 · 69f2633 · 69f2633
1 parent dc730a1
commit 69f2633
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/query/graphql/planner/group.go b/query/graphql/planner/group.go
@@ -39,6 +39,12 @@ func (p *Planner) GroupBy(n *parser.GroupBy, childSelect *parser.Select) (*group
 		return nil, nil
 	}
 
+	if childSelect != nil && childSelect.GroupBy != nil {
+		// group by fields have to be propogated downwards to ensure correct sub-grouping, otherwise child
+		// groups will only group on the fields they explicitly reference
+		childSelect.GroupBy.Fields = append(childSelect.GroupBy.Fields, n.Fields...)
+	}
+
 	groupNode := groupNode{
 		p:             p,
 		childSelect:   childSelect,

diff --git a/query/graphql/planner/planner.go b/query/graphql/planner/planner.go
@@ -262,12 +262,6 @@ func (p *Planner) expandGroupNodePlan(plan *selectTopNode) error {
 	}
 
 	if plan.group.childSelect != nil {
-		if plan.group.childSelect.GroupBy != nil {
-			// group by fields have to be propogated downwards to ensure correct sub-grouping, otherwise child
-			// groups will only group on the fields they explicitly reference
-			plan.group.childSelect.GroupBy.Fields = append(plan.group.childSelect.GroupBy.Fields, plan.group.groupByFields...)
-		}
-
 		childSelectNode, err := p.SelectFromSource(plan.group.childSelect, pipe, false, &plan.source.(*selectNode).sourceInfo)
 		if err != nil {
 			return err