replace sqlds.Query with sqlutil.Query

Author: gabor

pkg/bigquery/datasource.go

@@ -307,7 +307,7 @@ func (s *BigQueryDatasource) Projects(options ProjectsArgs) ([]*Project, error)
 type ValidateQueryArgs struct {
 	Project   string            `json:"project"`
 	Location  string            `json:"location"`
-	Query     sqlds.Query       `json:"query"`
+	Query     sqlutil.Query     `json:"query"`
 	TimeRange backend.TimeRange `json:"range"`
 }
 

pkg/bigquery/macros.go

@@ -6,18 +6,19 @@ import (
 	"strings"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
+	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
 	"github.com/grafana/sqlds/v3"
 )
 
-func macroColumn(query *sqlds.Query, args []string) (string, error) {
+func macroColumn(query *sqlutil.Query, args []string) (string, error) {
 	return "", errors.New("$__column macro is not supported")
 }
 
-func macroTable(query *sqlds.Query, args []string) (string, error) {
+func macroTable(query *sqlutil.Query, args []string) (string, error) {
 	return "", errors.New("$__table macro is not supported")
 }
 
-func macroTimeGroup(query *sqlds.Query, args []string) (string, error) {
+func macroTimeGroup(query *sqlutil.Query, args []string) (string, error) {
 	if len(args) < 2 {
 		return "", fmt.Errorf("%w: expected 2 arguments, received %d", errors.New("macro $__timeGroup needs time column and interval"), len(args))
 	}

pkg/bigquery/macros_test.go

@@ -3,55 +3,55 @@ package bigquery
 import (
 	"testing"
 
-	"github.com/grafana/sqlds/v3"
+	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
 	"github.com/pkg/errors"
 )
 
 func Test_macros(t *testing.T) {
 	tests := []struct {
 		description string
 		macro       string
-		query       *sqlds.Query
+		query       *sqlutil.Query
 		args        []string
 		expected    string
 		expectedErr error
 	}{
 		{
 			"time groups 1w",
 			"timeGroup",
-			&sqlds.Query{},
+			&sqlutil.Query{},
 			[]string{"created_at", "1w"},
 			"TIMESTAMP_MILLIS(DIV(UNIX_MILLIS(created_at), 604800000) * 604800000)",
 			nil,
 		},
 		{
 			"time groups 1d",
 			"timeGroup",
-			&sqlds.Query{},
+			&sqlutil.Query{},
 			[]string{"created_at", "1d"},
 			"TIMESTAMP_MILLIS(DIV(UNIX_MILLIS(created_at), 86400000) * 86400000)",
 			nil,
 		},
 		{
 			"time groups 1M",
 			"timeGroup",
-			&sqlds.Query{},
+			&sqlutil.Query{},
 			[]string{"created_at", "1M"},
 			"TIMESTAMP((PARSE_DATE(\"%Y-%m-%d\",CONCAT( CAST((EXTRACT(YEAR FROM created_at)) AS STRING),'-',CAST((EXTRACT(MONTH FROM created_at)) AS STRING),'-','01'))))",
 			nil,
 		},
 		{
 			"time groups '1M'",
 			"timeGroup",
-			&sqlds.Query{},
+			&sqlutil.Query{},
 			[]string{"created_at", "'1M'"},
 			"TIMESTAMP((PARSE_DATE(\"%Y-%m-%d\",CONCAT( CAST((EXTRACT(YEAR FROM created_at)) AS STRING),'-',CAST((EXTRACT(MONTH FROM created_at)) AS STRING),'-','01'))))",
 			nil,
 		},
 		{
 			"time groups \"1M\"",
 			"timeGroup",
-			&sqlds.Query{},
+			&sqlutil.Query{},
 			[]string{"created_at", "\"1M\""},
 			"TIMESTAMP((PARSE_DATE(\"%Y-%m-%d\",CONCAT( CAST((EXTRACT(YEAR FROM created_at)) AS STRING),'-',CAST((EXTRACT(MONTH FROM created_at)) AS STRING),'-','01'))))",
 			nil,