opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-28 01:54:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Search: Fixed search issue introduced in recent PR (#16652)

Browse Source
This commit is contained in:
Torkel Ödegaard
2019-04-17 19:07:13 +02:00
committed by GitHub
parent e4eb0817e4
commit 36d64fecea
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/services/sqlstore/dashboard_test.go
View File

@ -288,6 +288,21 @@ func TestDashboardDataAccess(t *testing.T) {
So(query.Result[0].Title, ShouldEqual, "test dash 23") So(query.Result[0].Title, ShouldEqual, "test dash 23")
}) })
Convey("Should be able to filter by tag and type", func() {
query := search.FindPersistedDashboardsQuery{
OrgId: 1,
Type: "dash-db",
Tags: []string{"prod"},
SignedInUser: &m.SignedInUser{OrgId: 1, OrgRole: m.ROLE_EDITOR},
}
err := SearchDashboards(&query)
So(err, ShouldBeNil)
So(len(query.Result), ShouldEqual, 3)
So(query.Result[0].Title, ShouldEqual, "test dash 23")
})
Convey("Should be able to search for a dashboard folder's children", func() { Convey("Should be able to search for a dashboard folder's children", func() {
query := search.FindPersistedDashboardsQuery{ query := search.FindPersistedDashboardsQuery{
OrgId: 1, OrgId: 1,

2
pkg/services/sqlstore/search_builder.go
View File

@ -149,7 +149,7 @@ func (sb *SearchBuilder) buildTagQuery() {
sb.buildSearchWhereClause() sb.buildSearchWhereClause()
// this ends the inner select (tag filtered part) // this ends the inner select (tag filtered part)
sb.sql.WriteString(`GROUP BY dashboard.id HAVING COUNT(dashboard.id) >= ? `) sb.sql.WriteString(` GROUP BY dashboard.id HAVING COUNT(dashboard.id) >= ? `)
sb.params = append(sb.params, len(sb.tags)) sb.params = append(sb.params, len(sb.tags))
} }