Merge pull request #134 from HTTPArchive/fix-timeseries-date-range-re…

…prots

Fix bug in time series reports where date range was not used correctly

sql/generate_reports.sh

@@ -257,9 +257,17 @@ else
 				fi
 
 				if [[ -n "${date_join}" ]]; then
-					result=$(sed -e "s/\(WHERE\)/\1 $date_join AND/" $query \
-						| sed -e "s/\(\`[^\`]*\`)*\)/\1 $lens_join/" \
-						| $BQ_CMD)
+					if [[ $(grep -i "WHERE" $query) ]]; then
+						# If WHERE clause already exists then add to it, before GROUP BY
+						result=$(sed -e "s/\(WHERE\)/\1 $date_join AND/" $query \
+							| sed -e "s/\(\`[^\`]*\`)*\)/\1 $lens_join/" \
+							| $BQ_CMD)
+					else
+						# If WHERE clause doesn't exists then add it, before GROUP BY
+						result=$(sed -e "s/\(GROUP BY\)/WHERE $date_join \1/" $query \
+							| sed -e "s/\(\`[^\`]*\`)*\)/\1 $lens_join/" \
+							| $BQ_CMD)
+					fi
 				else
 					result=$(sed -e "s/\(\`[^\`]*\`)*\)/\1 $lens_join/" $query \
 						| $BQ_CMD)