Improve error handling for invalid queries (#65)

nineinchnick · web-flow · commit 0f7924cebd3e · 2022-05-12T16:30:00.000+02:00
diff --git a/datasource.go b/datasource.go
@@ -170,7 +170,7 @@ func (ds *sqldatasource) handleQuery(ctx context.Context, req backend.DataQuery,
 	// Convert the backend.DataQuery into a Query object
 	q, err := GetQuery(req)
 	if err != nil {
-		return getErrorFrameFromQuery(q), err
+		return nil, err
 	}
 
 	// Apply supported macros to the query
diff --git a/query.go b/query.go
@@ -67,7 +67,7 @@ func GetQuery(query backend.DataQuery) (*Query, error) {
 	model := &Query{}
 
 	if err := json.Unmarshal(query.JSON, &model); err != nil {
-		return nil, ErrorJSON
+		return nil, fmt.Errorf("%w: %v", ErrorJSON, err)
 	}
 
 	// Copy directly from the well typed query

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ func (ds *sqldatasource) handleQuery(ctx context.Context, req backend.DataQuery,`
`170`	`170`	`// Convert the backend.DataQuery into a Query object`
`171`	`171`	`q, err := GetQuery(req)`
`172`	`172`	`if err != nil {`
`173`		`- return getErrorFrameFromQuery(q), err`
	`173`	`+ return nil, err`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`// Apply supported macros to the query`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func GetQuery(query backend.DataQuery) (*Query, error) {`
`67`	`67`	`model := &Query{}`
`68`	`68`
`69`	`69`	`if err := json.Unmarshal(query.JSON, &model); err != nil {`
`70`		`- return nil, ErrorJSON`
	`70`	`+ return nil, fmt.Errorf("%w: %v", ErrorJSON, err)`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// Copy directly from the well typed query`