public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Remove result field from remaining datasources queries (#65054)

Browse Source 
remove result field from datasources
This commit is contained in:
Serge Zaitsev
2023-03-20 19:18:21 +01:00
committed by GitHub
parent 70116dc65f
commit 126c4a106e
7 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/datasources/service/datasource.go
+1 -1
View File
@@ -161,7 +161,7 @@ func (s *Service) GetDataSources(ctx context.Context, query *datasources.GetData
return s.SQLStore.GetDataSources(ctx, query)
}
func (s *Service) GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) error {
func (s *Service) GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) (res []*datasources.DataSource, err error) {
return s.SQLStore.GetAllDataSources(ctx, query)
}
pkg/services/datasources/service/store.go
+6 -5
View File
@@ -30,7 +30,7 @@ type Store interface {
DeleteDataSource(context.Context, *datasources.DeleteDataSourceCommand) error
AddDataSource(context.Context, *datasources.AddDataSourceCommand) (*datasources.DataSource, error)
UpdateDataSource(context.Context, *datasources.UpdateDataSourceCommand) (*datasources.DataSource, error)
GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) error
GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) (res []*datasources.DataSource, err error)
Count(context.Context, *quota.ScopeParameters) (*quota.Map, error)
}
@@ -93,11 +93,12 @@ func (ss *SqlStore) GetDataSources(ctx context.Context, query *datasources.GetDa
})
}
func (ss *SqlStore) GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) error {
return ss.db.WithDbSession(ctx, func(sess *db.Session) error {
query.Result = make([]*datasources.DataSource, 0)
return sess.Asc("name").Find(&query.Result)
func (ss *SqlStore) GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) (res []*datasources.DataSource, err error) {
err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
res = make([]*datasources.DataSource, 0)
return sess.Asc("name").Find(&res)
})
return res, err
}
// GetDataSourcesByType returns all datasources for a given type or an error if the specified type is an empty string