root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 236 Packages Projects Releases Wiki Activity

SQLStore: Remove call to deleted `store.NewSession()` (#56025)

This commit is contained in:
Sofia Papagiannaki 2022-09-29 17:17:33 +03:00 committed by GitHub
parent 6bc09a6390
commit 6099e55e62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cmd/grafana-cli/commands/conflict_user_command.go
View File

@ -278,8 +278,7 @@ func (r *ConflictResolver) MergeConflictingUsers(ctx context.Context) error {
// creating a session for each block of users
// we want to rollback incase something happens during update / delete
sess := r.Store.NewSession(ctx)
defer sess.Close()
if err := r.Store.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
err := sess.Begin()
if err != nil {
return fmt.Errorf("could not open a db session: %w", err)
@ -332,6 +331,11 @@ func (r *ConflictResolver) MergeConflictingUsers(ctx context.Context) error {
if updateErr != nil {
return fmt.Errorf("could not update user: %w", updateErr)
}
return nil
}); err != nil {
return err
}
}
return nil
}