renames PartialMatch to MatchAny

pkg/api/annotations.go

@@ -14,17 +14,17 @@ import (
 func GetAnnotations(c *m.ReqContext) Response {
 
 	query := &annotations.ItemQuery{
-		From:         c.QueryInt64("from"),
-		To:           c.QueryInt64("to"),
-		OrgId:        c.OrgId,
-		UserId:       c.QueryInt64("userId"),
-		AlertId:      c.QueryInt64("alertId"),
-		DashboardId:  c.QueryInt64("dashboardId"),
-		PanelId:      c.QueryInt64("panelId"),
-		Limit:        c.QueryInt64("limit"),
-		Tags:         c.QueryStrings("tags"),
-		Type:         c.Query("type"),
-		PartialMatch: c.QueryBool("partialMatch"),
+		From:        c.QueryInt64("from"),
+		To:          c.QueryInt64("to"),
+		OrgId:       c.OrgId,
+		UserId:      c.QueryInt64("userId"),
+		AlertId:     c.QueryInt64("alertId"),
+		DashboardId: c.QueryInt64("dashboardId"),
+		PanelId:     c.QueryInt64("panelId"),
+		Limit:       c.QueryInt64("limit"),
+		Tags:        c.QueryStrings("tags"),
+		Type:        c.Query("type"),
+		MatchAny:    c.QueryBool("matchAny"),
 	}
 
 	repo := annotations.GetRepository()

pkg/services/annotations/annotations.go

@@ -21,7 +21,7 @@ type ItemQuery struct {
 	RegionId     int64    `json:"regionId"`
 	Tags         []string `json:"tags"`
 	Type         string   `json:"type"`
-	PartialMatch bool     `json:"partialMatch"`
+	MatchAny     bool     `json:"matchAny"`
 
 	Limit int64 `json:"limit"`
 }

pkg/services/sqlstore/annotation.go

@@ -211,7 +211,7 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I
             )
       `, strings.Join(keyValueFilters, " OR "))
 
-			if query.PartialMatch {
+			if query.MatchAny {
 				sql.WriteString(fmt.Sprintf(" AND (%s) > 0 ", tagsSubQuery))
 			} else {
 				sql.WriteString(fmt.Sprintf(" AND (%s) = %d ", tagsSubQuery, len(tags)))

pkg/services/sqlstore/annotation_test.go

@@ -199,11 +199,11 @@ func TestAnnotations(t *testing.T) {
 
 			Convey("Should find two annotations using partial match", func() {
 				items, err := repo.Find(&annotations.ItemQuery{
-					OrgId:        1,
-					From:         1,
-					To:           25,
-					PartialMatch: true,
-					Tags:         []string{"rollback", "deploy"},
+					OrgId:    1,
+					From:     1,
+					To:       25,
+					MatchAny: true,
+					Tags:     []string{"rollback", "deploy"},
 				})
 
 				So(err, ShouldBeNil)