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: Remove x from org (#46851)

Browse Source
This commit is contained in:
Kat Yang 2022-03-22 17:17:53 -04:00 committed by GitHub
parent 560fc9812d
commit 884c2351d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/services/sqlstore/org.go
View File

@ -26,8 +26,9 @@ func (ss *SQLStore) addOrgQueryAndCommandHandlers() {
} }
func (ss *SQLStore) SearchOrgs(ctx context.Context, query *models.SearchOrgsQuery) error { func (ss *SQLStore) SearchOrgs(ctx context.Context, query *models.SearchOrgsQuery) error {
return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
query.Result = make([]*models.OrgDTO, 0) query.Result = make([]*models.OrgDTO, 0)
sess := x.Table("org") sess := dbSession.Table("org")
if query.Query != "" { if query.Query != "" {
sess.Where("name LIKE ?", query.Query+"%") sess.Where("name LIKE ?", query.Query+"%")
} }
@ -46,11 +47,13 @@ func (ss *SQLStore) SearchOrgs(ctx context.Context, query *models.SearchOrgsQuer
sess.Cols("id", "name") sess.Cols("id", "name")
err := sess.Find(&query.Result) err := sess.Find(&query.Result)
return err return err
})
} }
func (ss *SQLStore) GetOrgById(ctx context.Context, query *models.GetOrgByIdQuery) error { func (ss *SQLStore) GetOrgById(ctx context.Context, query *models.GetOrgByIdQuery) error {
return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
var org models.Org var org models.Org
exists, err := x.Id(query.Id).Get(&org) exists, err := dbSession.ID(query.Id).Get(&org)
if err != nil { if err != nil {
return err return err
} }
@ -61,11 +64,13 @@ func (ss *SQLStore) GetOrgById(ctx context.Context, query *models.GetOrgByIdQuer
query.Result = &org query.Result = &org
return nil return nil
})
} }
func (ss *SQLStore) GetOrgByNameHandler(ctx context.Context, query *models.GetOrgByNameQuery) error { func (ss *SQLStore) GetOrgByNameHandler(ctx context.Context, query *models.GetOrgByNameQuery) error {
return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
var org models.Org var org models.Org
exists, err := x.Where("name=?", query.Name).Get(&org) exists, err := dbSession.Where("name=?", query.Name).Get(&org)
if err != nil { if err != nil {
return err return err
} }
@ -76,6 +81,7 @@ func (ss *SQLStore) GetOrgByNameHandler(ctx context.Context, query *models.GetOr
query.Result = &org query.Result = &org
return nil return nil
})
} }
// GetOrgByName gets an organization by name. // GetOrgByName gets an organization by name.