Query errors (#92)

return errors from query

Author: scottlepp

.drone.yml

@@ -18,11 +18,11 @@ services:
 
 steps:
   - name: "test"
-    image: golang:1.19
+    image: golang:1.20
     commands:
       - go test ./...
   - name: "integraiton_tests"
-    image: golang:1.19
+    image: golang:1.20
     environment:
       INTEGRATION_TESTS: "true"
       MYSQL_URL: "mysql:mysql@tcp(mysql:3306)/mysql"

datasource.go

@@ -142,8 +142,13 @@ func (ds *SQLDatasource) QueryData(ctx context.Context, req *backend.QueryDataRe
 	}
 
 	wg.Wait()
-	return response.Response(), nil
 
+	errs := ds.errors(response)
+	if ds.driverSettings.Errors {
+		return response.Response(), errs
+	}
+
+	return response.Response(), nil
 }
 
 func (ds *SQLDatasource) GetDBFromQuery(q *Query, datasourceUID string) (*sql.DB, error) {
@@ -380,3 +385,21 @@ func shouldRetry(retryOn []string, err string) bool {
 	}
 	return false
 }
+
+func (ds *SQLDatasource) errors(response *Response) error {
+	if response == nil {
+		return nil
+	}
+	res := response.Response()
+	if res == nil {
+		return nil
+	}
+	var err error
+	for _, r := range res.Responses {
+		err = errors.Join(err, r.Error)
+	}
+	if err != nil {
+		backend.Logger.Error(err.Error())
+	}
+	return err
+}

datasource_test.go

@@ -353,6 +353,46 @@ func Test_check_health_with_headers(t *testing.T) {
 	assert.Contains(t, string(message), "bar")
 }
 
+func Test_no_errors(t *testing.T) {
+	dsUID := "pass"
+	settings := backend.DataSourceInstanceSettings{UID: dsUID}
+
+	handler := &testSqlHandler{pass: true}
+	mockDriver := "no-errors"
+	mock.RegisterDriver(mockDriver, handler)
+	db, err := sql.Open(mockDriver, "")
+	if err != nil {
+		t.Errorf("failed to connect to mock driver: %v", err)
+	}
+	driver := fakeDriver{
+		openDBfn: func(msg json.RawMessage) (*sql.DB, error) {
+			db, err := sql.Open(mockDriver, "")
+			if err != nil {
+				t.Errorf("failed to connect to mock driver: %v", err)
+			}
+			return db, nil
+		},
+	}
+	max := time.Duration(10) * time.Second
+	driverSettings := DriverSettings{Retries: 1, Timeout: max, RetryOn: []string{""}, Errors: true}
+	ds := &SQLDatasource{c: driver, driverSettings: driverSettings}
+
+	key := defaultKey(dsUID)
+	// Add the mandatory default db
+	ds.storeDBConnection(key, dbConnection{db, settings})
+	ctx := context.Background()
+	req := &backend.CheckHealthRequest{
+		PluginContext: backend.PluginContext{
+			DataSourceInstanceSettings: &settings,
+		},
+	}
+	result, err := ds.CheckHealth(ctx, req)
+
+	assert.Nil(t, err)
+	expected := "Data source is working"
+	assert.Equal(t, expected, result.Message)
+}
+
 var testCounter = 0
 var testTimeout = 1
 var testRows = 0
@@ -362,10 +402,14 @@ type testSqlHandler struct {
 	error
 	ping   bool
 	checks int
+	pass   bool
 }
 
 func (s *testSqlHandler) Ping(ctx context.Context) error {
 	s.checks += 1
+	if s.pass {
+		return nil
+	}
 	if s.error != nil {
 		return s.error
 	}

driver.go

@@ -18,6 +18,7 @@ type DriverSettings struct {
 	Pause          int
 	RetryOn        []string
 	ForwardHeaders bool
+	Errors         bool
 }
 
 // Driver is a simple interface that defines how to connect to a backend SQL datasource

go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/sqlds/v2
 
-go 1.19
+go 1.20
 
 require (
 	github.com/go-sql-driver/mysql v1.4.0