SQL utils: Fix error source when unmarhsaling invalid query object (#1222)

Author: ivanahuckova

data/sqlutil/query.go

@@ -71,7 +71,7 @@ func GetQuery(query backend.DataQuery) (*Query, error) {
 	model := &Query{}
 
 	if err := json.Unmarshal(query.JSON, &model); err != nil {
-		return nil, fmt.Errorf("%w: %v", ErrorJSON, err)
+		return nil, backend.DownstreamError(fmt.Errorf("%w: %v", ErrorJSON, err))
 	}
 
 	// Copy directly from the well typed query

data/sqlutil/query_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
 )
 
-func TestQuery(t *testing.T) {
-	t.Run("GetQuery", func(t *testing.T) {
+func TestGetQuery(t *testing.T) {
+	t.Run("returns correct query", func(t *testing.T) {
 		timeRange := backend.TimeRange{From: time.Now().Add(-time.Hour), To: time.Now()}
 		dataQuery := backend.DataQuery{
 			RefID:         "foo",
@@ -45,4 +45,23 @@ func TestQuery(t *testing.T) {
 		assert.Equal(t, parsedQuery.Table, "y")
 		assert.Equal(t, parsedQuery.Column, "z")
 	})
+
+	t.Run("returns error if invalid query", func(t *testing.T) {
+		timeRange := backend.TimeRange{From: time.Now().Add(-time.Hour), To: time.Now()}
+		dataQuery := backend.DataQuery{
+			RefID:         "foo",
+			MaxDataPoints: 10,
+			Interval:      time.Second,
+			TimeRange:     timeRange,
+			// invalid JSON, rawSql should be a string
+			JSON: json.RawMessage(`{
+			"rawSql": 1,
+		}`),
+		}
+
+		_, err := sqlutil.GetQuery(dataQuery)
+		assert.Error(t, err)
+		assert.ErrorContains(t, err, "error unmarshaling query JSON to the Query Model")
+		assert.True(t, backend.IsDownstreamError(err))
+	})
 }