From 7ab910af480497b6e102fe5c59a968b18968e1ee Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Fri, 8 Apr 2022 09:35:34 +0200
Subject: [PATCH] Query history: Search in comments (#46761)

---
 pkg/services/queryhistory/queryhistory_search_test.go | 2 +-
 pkg/services/queryhistory/queryhistory_test.go        | 6 ++++++
 pkg/services/queryhistory/writers.go                  | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkg/services/queryhistory/queryhistory_search_test.go b/pkg/services/queryhistory/queryhistory_search_test.go
index f459cd4fa7e..9d3db5ca328 100644
--- a/pkg/services/queryhistory/queryhistory_search_test.go
+++ b/pkg/services/queryhistory/queryhistory_search_test.go
@@ -111,7 +111,7 @@ func TestGetQueriesFromQueryHistory(t *testing.T) {
 			err := json.Unmarshal(resp.Body(), &response)
 			require.NoError(t, err)
 			require.Equal(t, 200, resp.Status())
-			require.Equal(t, 1, response.Result.TotalCount)
+			require.Equal(t, 2, response.Result.TotalCount)
 			require.Equal(t, true, response.Result.QueryHistory[0].Starred)
 		})
 }
diff --git a/pkg/services/queryhistory/queryhistory_test.go b/pkg/services/queryhistory/queryhistory_test.go
index fe9dfecedeb..b88c3161309 100644
--- a/pkg/services/queryhistory/queryhistory_test.go
+++ b/pkg/services/queryhistory/queryhistory_test.go
@@ -115,6 +115,12 @@ func testScenarioWithMultipleQueriesInQueryHistory(t *testing.T, desc string, fn
 		resp1 := sc.service.createHandler(sc.reqContext)
 		sc.initialResult = validateAndUnMarshalResponse(t, resp1)
 
+		// Add comment
+		cmd := PatchQueryCommentInQueryHistoryCommand{Comment: "test comment 2"}
+		sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
+		sc.reqContext.Req.Body = mockRequestBody(cmd)
+		sc.service.patchCommentHandler(sc.reqContext)
+
 		time.Sleep(1 * time.Second)
 		command2 := CreateQueryInQueryHistoryCommand{
 			DatasourceUID: testDsUID1,
diff --git a/pkg/services/queryhistory/writers.go b/pkg/services/queryhistory/writers.go
index 20f94ab1705..034a055ecfb 100644
--- a/pkg/services/queryhistory/writers.go
+++ b/pkg/services/queryhistory/writers.go
@@ -23,12 +23,12 @@ func writeStarredSQL(query SearchInQueryHistoryQuery, sqlStore *sqlstore.SQLStor
 }
 
 func writeFiltersSQL(query SearchInQueryHistoryQuery, user *models.SignedInUser, sqlStore *sqlstore.SQLStore, builder *sqlstore.SQLBuilder) {
-	params := []interface{}{user.OrgId, user.UserId, "%" + query.SearchString + "%"}
+	params := []interface{}{user.OrgId, user.UserId, "%" + query.SearchString + "%", "%" + query.SearchString + "%"}
 	for _, uid := range query.DatasourceUIDs {
 		params = append(params, uid)
 	}
 	var sql bytes.Buffer
-	sql.WriteString(" WHERE query_history.org_id = ? AND query_history.created_by = ? AND query_history.queries " + sqlStore.Dialect.LikeStr() + " ? AND query_history.datasource_uid IN (? " + strings.Repeat(",?", len(query.DatasourceUIDs)-1) + ") ")
+	sql.WriteString(" WHERE query_history.org_id = ? AND query_history.created_by = ? AND (query_history.queries " + sqlStore.Dialect.LikeStr() + " ? OR query_history.comment " + sqlStore.Dialect.LikeStr() + " ?) AND query_history.datasource_uid IN (? " + strings.Repeat(",?", len(query.DatasourceUIDs)-1) + ") ")
 	builder.Write(sql.String(), params...)
 }