From 9eec6720068d4f376c16223a47879f6b080f9ed0 Mon Sep 17 00:00:00 2001
From: Bo Du <bokwandu@gmail.com>
Date: Tue, 12 Feb 2019 18:27:42 -0500
Subject: [PATCH] Move validation logic to parseCalculations.

---
 query/unparsed_query.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/query/unparsed_query.go b/query/unparsed_query.go
index 75a8309..ede052c 100644
--- 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 {