Merge branch 'main' of github.com:jalapeno-api-gateway/request-servic…

…e into main
jalapeno-api-gateway · Mar 2, 2022 · 848e91c · 848e91c
2 parents cb20c60 + 21aa385
commit 848e91c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/influxdb/fetch.go b/influxdb/fetch.go
@@ -113,6 +113,10 @@ func Fetch(logger *logrus.Entry, request *jagw.TelemetryRequest) []string {
 }
 
 func formatSelection(properties []string) string {
+	if len(properties) == 0 {
+		return "*"
+	}
+
 	var b strings.Builder
 	for i, property := range properties {
 		b.Reset()
@@ -141,10 +145,10 @@ func formatFilters(request *jagw.TelemetryRequest) string {
 	if request.RangeFilter == nil {
 		return b.String() + " limit 1"
 	} else {
-		if len(request.StringFilters) > 0 {
+		if b.Len() > 0 {
 			formatRangeFilter(" AND ", &b, request.RangeFilter)
 			} else {
-			formatRangeFilter(" ", &b, request.RangeFilter)
+			formatRangeFilter("WHERE ", &b, request.RangeFilter)
 
 		}
 		return b.String()