Move validation logic to parseCalculations.

xichen2020 · Feb 12, 2019 · 9eec672 · 9eec672
1 parent 8e7c96a
commit 9eec672
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/query/unparsed_query.go b/query/unparsed_query.go
@@ -319,14 +319,14 @@ func (q *UnparsedQuery) validateGroupBy() error {
 	if q.TimeGranularity != nil {
 		return errTimeGranularityWithGroupBy
 	}
-	if len(q.Calculations) == 0 {
-		return errGroupByWithNoCalculations
-	}
 	return nil
 }
 
 func (q *UnparsedQuery) parseCalculations(opts ParseOptions) ([]Calculation, error) {
 	if len(q.Calculations) == 0 {
+		if len(q.GroupBy) > 0 {
+			return nil, errGroupByWithNoCalculations
+		}
 		return nil, nil
 	}
 	if err := q.validateCalculations(); err != nil {