Merge branch 'master' into sql-proxy

2017-03-29 16:40:14 +02:00
parent 01f1c1b8dc 91c184d3e0
commit 6965064ea9
326 changed files with 6477 additions and 1825 deletions
@@ -122,11 +122,16 @@ type UpdateDataSourceCommand struct {
 	Id    int64 `json:"-"`
 }

-type DeleteDataSourceCommand struct {
+type DeleteDataSourceByIdCommand struct {
 	Id    int64
 	OrgId int64
 }

+type DeleteDataSourceByNameCommand struct {
+	Name  string
+	OrgId int64
+}
+
 // ---------------------
 // QUERIES