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

Restructure the org upsert method (#64763)

Browse Source
This commit is contained in:
linoman 2023-04-06 16:48:31 +02:00 committed by GitHub
parent 55553322c8
commit 3e85c90759
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,6 +146,9 @@ func verifyExistingOrg(sess *DBSession, orgId int64) error {
func (ss *SQLStore) getOrCreateOrg(sess *DBSession, orgName string) (int64, error) {
var org org.Org
org.Created = time.Now()
org.Updated = org.Created
if ss.Cfg.AutoAssignOrg {
has, err := sess.Where("id=?", ss.Cfg.AutoAssignOrgId).Get(&org)
if err != nil {
@ -164,18 +167,11 @@ func (ss *SQLStore) getOrCreateOrg(sess *DBSession, orgName string) (int64, erro
org.Name = mainOrgName
org.ID = int64(ss.Cfg.AutoAssignOrgId)
} else {
org.Name = orgName
}
org.Created = time.Now()
org.Updated = time.Now()
if org.ID != 0 {
if err := sess.InsertId(&org, ss.Dialect); err != nil {
return 0, err
}
} else {
org.Name = orgName
if _, err := sess.InsertOne(&org); err != nil {
return 0, err
}