IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-22 08:56:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

SQL: Fix so that all captured errors are returned from sql engine (#32353)

Browse Source
This commit is contained in:
Marcus Efraimsson 2021-03-26 13:17:18 +01:00 committed by GitHub
parent c8afce5fd6
commit 5985c199ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/tsdb/sqleng/sql_engine.go
View File

@ -185,6 +185,7 @@ func (e *dataPlugin) DataQuery(ctx context.Context, dsInfo *models.DataSource,
rows, err := db.Query(rawSQL) rows, err := db.Query(rawSQL)
if err != nil { if err != nil {
queryResult.Error = e.queryResultTransformer.TransformQueryError(err) queryResult.Error = e.queryResultTransformer.TransformQueryError(err)
ch <- queryResult
return return
} }
defer func() { defer func() {
@ -200,12 +201,14 @@ func (e *dataPlugin) DataQuery(ctx context.Context, dsInfo *models.DataSource,
err := e.transformToTimeSeries(query, rows, &queryResult, queryContext) err := e.transformToTimeSeries(query, rows, &queryResult, queryContext)
if err != nil { if err != nil {
queryResult.Error = err queryResult.Error = err
ch <- queryResult
return return
} }
case "table": case "table":
err := e.transformToTable(query, rows, &queryResult, queryContext) err := e.transformToTable(query, rows, &queryResult, queryContext)
if err != nil { if err != nil {
queryResult.Error = err queryResult.Error = err
ch <- queryResult
return return
} }
} }