IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Delete unused db in orgs and use db in datasources (#57085)

Browse Source 
* Delete unused db in orgs and use db in datasources

* Sort imports
This commit is contained in:
Selene 2022-10-17 16:27:56 +02:00 committed by GitHub
parent 6524a0b437
commit ba6c715708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/datasources/service/store.go
View File

@ -36,7 +36,7 @@ type SqlStore struct {
logger log.Logger logger log.Logger
} }
func CreateStore(db sqlstore.Store, logger log.Logger) *SqlStore { func CreateStore(db db.DB, logger log.Logger) *SqlStore {
return &SqlStore{db: db, logger: logger} return &SqlStore{db: db, logger: logger}
} }

11
pkg/services/org/orgimpl/org.go
View File

@ -7,7 +7,7 @@ import (
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/org" "github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore/db"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
) )
@ -16,11 +16,9 @@ type Service struct {
store store store store
cfg *setting.Cfg cfg *setting.Cfg
log log.Logger log log.Logger
// TODO remove sqlstore and use db.DB
sqlStore sqlstore.Store
} }
func ProvideService(db sqlstore.Store, cfg *setting.Cfg) org.Service { func ProvideService(db db.DB, cfg *setting.Cfg) org.Service {
log := log.New("org service") log := log.New("org service")
return &Service{ return &Service{
store: &sqlStore{ store: &sqlStore{
@ -29,9 +27,8 @@ func ProvideService(db sqlstore.Store, cfg *setting.Cfg) org.Service {
log: log, log: log,
cfg: cfg, cfg: cfg,
}, },
cfg: cfg, cfg: cfg,
log: log, log: log,
sqlStore: db,
} }
} }