feat(api): fixed minor issue with error message when trying to create duplicate datasource, fixes grafana#6164

torkelo · torkelo · commit a6918617ff6c · 2016-10-01T16:41:27.000+02:00
diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
@@ -92,6 +92,11 @@ func AddDataSource(c *middleware.Context, cmd m.AddDataSourceCommand) {
 	cmd.OrgId = c.OrgId
 
 	if err := bus.Dispatch(&cmd); err != nil {
+		if err == m.ErrDataSourceNameExists {
+			c.JsonApiErr(409, err.Error(), err)
+			return
+		}
+
 		c.JsonApiErr(500, "Failed to add datasource", err)
 		return
 	}
diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go
@@ -22,7 +22,8 @@ const (
 
 // Typed errors
 var (
-	ErrDataSourceNotFound = errors.New("Data source not found")
+	ErrDataSourceNotFound   = errors.New("Data source not found")
+	ErrDataSourceNameExists = errors.New("Data source with same name already exists")
 )
 
 type DsAccess string
diff --git a/pkg/services/sqlstore/datasource.go b/pkg/services/sqlstore/datasource.go
@@ -60,6 +60,14 @@ func DeleteDataSource(cmd *m.DeleteDataSourceCommand) error {
 func AddDataSource(cmd *m.AddDataSourceCommand) error {
 
 	return inTransaction(func(sess *xorm.Session) error {
+
+		existing := m.DataSource{OrgId: cmd.OrgId, Name: cmd.Name}
+		has, _ := x.Get(&existing)
+
+		if has {
+			return m.ErrDataSourceNameExists
+		}
+
 		ds := &m.DataSource{
 			OrgId:             cmd.OrgId,
 			Name:              cmd.Name,

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ const (`
`22`	`22`
`23`	`23`	`// Typed errors`
`24`	`24`	`var (`
`25`		`- ErrDataSourceNotFound = errors.New("Data source not found")`
	`25`	`+ ErrDataSourceNotFound = errors.New("Data source not found")`
	`26`	`+ ErrDataSourceNameExists = errors.New("Data source with same name already exists")`
`26`	`27`	`)`
`27`	`28`
`28`	`29`	`type DsAccess string`