better timeGroup macro handling for sub-second intervals

Author: gabor

pkg/bigquery/macros.go

@@ -46,7 +46,7 @@ func macroTimeGroup(query *sqlds.Query, args []string) (string, error) {
 
 	}
 
-	return fmt.Sprintf("TIMESTAMP_SECONDS(DIV(UNIX_SECONDS(%s), %v) * %v)", timeVar, interval.Seconds(), interval.Seconds()), nil
+	return fmt.Sprintf("TIMESTAMP_MILLIS(DIV(UNIX_MILLIS(%s), %v) * %v)", timeVar, interval.Milliseconds(), interval.Milliseconds()), nil
 }
 
 var macros = map[string]sqlds.MacroFunc{

pkg/bigquery/macros_test.go

@@ -21,15 +21,15 @@ func Test_macros(t *testing.T) {
 			"timeGroup",
 			&sqlds.Query{},
 			[]string{"created_at", "1w"},
-			"TIMESTAMP_SECONDS(DIV(UNIX_SECONDS(created_at), 604800) * 604800)",
+			"TIMESTAMP_MILLIS(DIV(UNIX_MILLIS(created_at), 604800000) * 604800000)",
 			nil,
 		},
 		{
 			"time groups 1d",
 			"timeGroup",
 			&sqlds.Query{},
 			[]string{"created_at", "1d"},
-			"TIMESTAMP_SECONDS(DIV(UNIX_SECONDS(created_at), 86400) * 86400)",
+			"TIMESTAMP_MILLIS(DIV(UNIX_MILLIS(created_at), 86400000) * 86400000)",
 			nil,
 		},
 		{