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

SQLStore: Fix wrong usage of xorm's insert functions in tests (#63850)

Browse Source 
* SQLStore: Fix InsertId

* Prefs: Fix Insert return value

* Fix tests

* Add guidelines
This commit is contained in:
Sofia Papagiannaki
2023-03-02 13:01:36 +02:00
committed by GitHub
parent afd5f41780
commit 89569be3a6
7 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/infra/db/sqlbuilder_test.go
View File

@@ -217,7 +217,8 @@ func createDummyUser(t *testing.T, sqlStore DB) *user.User {
err := sqlStore.WithDbSession(context.Background(), func(sess *Session) error {
sess.UseBool("is_admin")
var err error
id, err = sess.Insert(usr)
_, err = sess.Insert(usr)
id = usr.ID
return err
})
require.NoError(t, err)

5
pkg/infra/serverlock/serverlock_test.go
View File

@@ -106,9 +106,10 @@ func TestLockAndRelease(t *testing.T) {
// inserting a row with lock in the past
err := sl.SQLStore.WithTransactionalDbSession(context.Background(), func(sess *db.Session) error {
r, err := sess.Insert(lock)
affectedRows, err := sess.Insert(&lock)
require.NoError(t, err)
require.Equal(t, int64(1), r)
require.Equal(t, int64(1), affectedRows)
require.Equal(t, int64(1), lock.Id)
return nil
})
require.NoError(t, err)