IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 01:53:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Backend: Remove unused code (#28933)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen 2020-11-11 11:38:04 +01:00 committed by GitHub
parent 7378af0a77
commit ab078133bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/models/datasource.go
View File

@ -207,10 +207,6 @@ type GetDataSourcesQuery struct {
Result []*DataSource Result []*DataSource
} }
type GetAllDataSourcesQuery struct {
Result []*DataSource
}
type GetDataSourceByIdQuery struct { type GetDataSourceByIdQuery struct {
Id int64 Id int64
OrgId int64 OrgId int64

6
pkg/services/provisioning/datasources/config_reader_test.go
View File

@ -35,7 +35,6 @@ func TestDatasourceAsConfig(t *testing.T) {
bus.AddHandler("test", mockInsert) bus.AddHandler("test", mockInsert)
bus.AddHandler("test", mockUpdate) bus.AddHandler("test", mockUpdate)
bus.AddHandler("test", mockGet) bus.AddHandler("test", mockGet)
bus.AddHandler("test", mockGetAll)
bus.AddHandler("test", mockGetOrg) bus.AddHandler("test", mockGetOrg)
Convey("apply default values when missing", func() { Convey("apply default values when missing", func() {
@ -282,11 +281,6 @@ func mockInsert(cmd *models.AddDataSourceCommand) error {
return nil return nil
} }
func mockGetAll(cmd *models.GetAllDataSourcesQuery) error {
cmd.Result = fakeRepo.loadAll
return nil
}
func mockGet(cmd *models.GetDataSourceByNameQuery) error { func mockGet(cmd *models.GetDataSourceByNameQuery) error {
for _, v := range fakeRepo.loadAll { for _, v := range fakeRepo.loadAll {
if cmd.Name == v.Name && cmd.OrgId == v.OrgId { if cmd.Name == v.Name && cmd.OrgId == v.OrgId {

8
pkg/services/sqlstore/datasource.go
View File

@ -18,7 +18,6 @@ import (
func init() { func init() {
bus.AddHandler("sql", GetDataSources) bus.AddHandler("sql", GetDataSources)
bus.AddHandler("sql", GetAllDataSources)
bus.AddHandler("sql", AddDataSource) bus.AddHandler("sql", AddDataSource)
bus.AddHandler("sql", DeleteDataSourceById) bus.AddHandler("sql", DeleteDataSourceById)
bus.AddHandler("sql", DeleteDataSourceByName) bus.AddHandler("sql", DeleteDataSourceByName)
@ -74,13 +73,6 @@ func GetDataSources(query *models.GetDataSourcesQuery) error {
return sess.Find(&query.Result) return sess.Find(&query.Result)
} }
func GetAllDataSources(query *models.GetAllDataSourcesQuery) error {
sess := x.Limit(5000, 0).Asc("name")
query.Result = make([]*models.DataSource, 0)
return sess.Find(&query.Result)
}
func DeleteDataSourceById(cmd *models.DeleteDataSourceByIdCommand) error { func DeleteDataSourceById(cmd *models.DeleteDataSourceByIdCommand) error {
return inTransaction(func(sess *DBSession) error { return inTransaction(func(sess *DBSession) error {
var rawSQL = "DELETE FROM data_source WHERE id=? and org_id=?" var rawSQL = "DELETE FROM data_source WHERE id=? and org_id=?"