From 0bae7212f6d5d58078656ba1b4ffd12fd073b70f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 18 Apr 2017 17:15:22 +0200
Subject: [PATCH] annotations: removed category stuff, my mistake, we need tags

---
 pkg/services/category/category.go             | 39 -------------------
 pkg/services/sqlstore/category.go             | 24 ------------
 .../sqlstore/migrations/annotation_mig.go     |  1 -
 .../sqlstore/migrations/category_mig.go       | 27 -------------
 .../sqlstore/migrations/migrations.go         |  1 -
 pkg/services/sqlstore/sqlstore.go             |  3 --
 6 files changed, 95 deletions(-)
 delete mode 100644 pkg/services/category/category.go
 delete mode 100644 pkg/services/sqlstore/category.go
 delete mode 100644 pkg/services/sqlstore/migrations/category_mig.go

diff --git a/pkg/services/category/category.go b/pkg/services/category/category.go
deleted file mode 100644
index 2f0df5523a8..00000000000
--- a/pkg/services/category/category.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package category
-
-type Repository interface {
-	Save(item *Item) error
-	Update(item *Item) error
-	Delete(params *DeleteParams) error
-	Find(query *FindParams) ([]*Item, error)
-}
-
-var repositoryInstance Repository
-
-func GetRepository() Repository {
-	return repositoryInstance
-}
-
-func SetRepository(rep Repository) {
-	repositoryInstance = rep
-}
-
-type FindParams struct {
-	OrgId  int64 `json:"orgId"`
-	UserId int64 `json:"userId"`
-	Limit  int64 `json:"limit"`
-}
-
-type DeleteParams struct {
-	Id   int64  `json:"id"`
-	Name string `json:"title"`
-}
-
-type ItemType string
-
-type Item struct {
-	Id          int64  `json:"id"`
-	OrgId       int64  `json:"orgId"`
-	UserId      int64  `json:"userId"`
-	Name        string `json:"title"`
-	Description string `json:"text"`
-}
diff --git a/pkg/services/sqlstore/category.go b/pkg/services/sqlstore/category.go
deleted file mode 100644
index b20dfb85f4f..00000000000
--- a/pkg/services/sqlstore/category.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package sqlstore
-
-import (
-	"github.com/grafana/grafana/pkg/services/category"
-)
-
-type SqlCategoryRepo struct {
-}
-
-func (r *SqlCategoryRepo) Save(item *category.Item) error {
-	return nil
-}
-
-func (r *SqlCategoryRepo) Update(item *category.Item) error {
-	return nil
-}
-
-func (r *SqlCategoryRepo) Delete(params *category.DeleteParams) error {
-	return nil
-}
-
-func (r *SqlCategoryRepo) Find(params *category.FindParams) ([]*category.Item, error) {
-	return nil, nil
-}
diff --git a/pkg/services/sqlstore/migrations/annotation_mig.go b/pkg/services/sqlstore/migrations/annotation_mig.go
index aeb2afed4fb..a9343266863 100644
--- a/pkg/services/sqlstore/migrations/annotation_mig.go
+++ b/pkg/services/sqlstore/migrations/annotation_mig.go
@@ -35,7 +35,6 @@ func addAnnotationMig(mg *Migrator) {
 	}
 
 	mg.AddMigration("Drop old annotation table v4", NewDropTableMigration("annotation"))
-
 	mg.AddMigration("create annotation table v5", NewAddTableMigration(table))
 
 	// create indices
diff --git a/pkg/services/sqlstore/migrations/category_mig.go b/pkg/services/sqlstore/migrations/category_mig.go
deleted file mode 100644
index 2a1b27abeb2..00000000000
--- a/pkg/services/sqlstore/migrations/category_mig.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package migrations
-
-import (
-	. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
-)
-
-func addAnnotationCategoryMig(mg *Migrator) {
-	category := Table{
-		Name: "category",
-		Columns: []*Column{
-			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-			{Name: "org_id", Type: DB_BigInt, Nullable: false},
-			{Name: "user_id", Type: DB_BigInt, Nullable: true},
-			{Name: "name", Type: DB_Text, Nullable: false},
-			{Name: "description", Type: DB_Text, Nullable: false},
-		},
-		Indices: []*Index{
-			{Cols: []string{"org_id", "name"}, Type: IndexType},
-		},
-	}
-
-	// create table
-	mg.AddMigration("create category table", NewAddTableMigration(category))
-
-	// create indices
-	mg.AddMigration("add index org_id & name", NewAddIndexMigration(category, category.Indices[0]))
-}
diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index e9e20fb190c..163c6d762a8 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -26,7 +26,6 @@ func AddMigrations(mg *Migrator) {
 	addAnnotationMig(mg)
 	addStatsMigrations(mg)
 	addTestDataMigrations(mg)
-	// addAnnotationCategoryMig(mg)
 }
 
 func addMigrationLogMigrations(mg *Migrator) {
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index ce2090fc701..fe759ec8df9 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -12,7 +12,6 @@ import (
 	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/annotations"
-	"github.com/grafana/grafana/pkg/services/category"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrations"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/setting"
@@ -101,8 +100,6 @@ func SetEngine(engine *xorm.Engine) (err error) {
 
 	// Init repo instances
 	annotations.SetRepository(&SqlAnnotationRepo{})
-	category.SetRepository(&SqlCategoryRepo{})
-
 	return nil
 }