From 5985c199ae72af6a2fbecbaa907210c15f0d214b Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Fri, 26 Mar 2021 13:17:18 +0100
Subject: [PATCH] SQL: Fix so that all captured errors are returned from sql
 engine (#32353)

---
 pkg/tsdb/sqleng/sql_engine.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/tsdb/sqleng/sql_engine.go b/pkg/tsdb/sqleng/sql_engine.go
index 386b9ef7e92..f7b18da9cd5 100644
--- a/pkg/tsdb/sqleng/sql_engine.go
+++ b/pkg/tsdb/sqleng/sql_engine.go
@@ -185,6 +185,7 @@ func (e *dataPlugin) DataQuery(ctx context.Context, dsInfo *models.DataSource,
 			rows, err := db.Query(rawSQL)
 			if err != nil {
 				queryResult.Error = e.queryResultTransformer.TransformQueryError(err)
+				ch <- queryResult
 				return
 			}
 			defer func() {
@@ -200,12 +201,14 @@ func (e *dataPlugin) DataQuery(ctx context.Context, dsInfo *models.DataSource,
 				err := e.transformToTimeSeries(query, rows, &queryResult, queryContext)
 				if err != nil {
 					queryResult.Error = err
+					ch <- queryResult
 					return
 				}
 			case "table":
 				err := e.transformToTable(query, rows, &queryResult, queryContext)
 				if err != nil {
 					queryResult.Error = err
+					ch <- queryResult
 					return
 				}
 			}