public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Database: Make dialects independent of xorm Engine (#69955)

Browse Source 
* make dialects independent of xorm Engine

* goimports
This commit is contained in:
Dan Cech
2023-06-14 16:13:36 -04:00
committed by GitHub
parent e7d8d48407
commit a6279b2d62
9 changed files with 76 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go
+1 -1
View File
@@ -256,7 +256,7 @@ func setupTestDB(t *testing.T) *xorm.Engine {
x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
require.NoError(t, err)
err = migrator.NewDialect(x).CleanDB()
err = migrator.NewDialect(x.DriverName()).CleanDB(x)
require.NoError(t, err)
mg := migrator.NewMigrator(x, &setting.Cfg{
pkg/services/sqlstore/migrations/migrations_test.go
+10 -7
View File
@@ -28,7 +28,7 @@ func TestMigrations(t *testing.T) {
x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
require.NoError(t, err)
err = NewDialect(x).CleanDB()
err = NewDialect(x.DriverName()).CleanDB(x)
require.NoError(t, err)
_, err = x.SQL(query).Get(&result)
@@ -71,14 +71,17 @@ func TestMigrationLock(t *testing.T) {
x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
require.NoError(t, err)
dialect := NewDialect(x)
dialect := NewDialect(x.DriverName())
sess := x.NewSession()
t.Cleanup(func() {
sess.Close()
})
cfg := LockCfg{Session: sess}
cfg := LockCfg{
Session: sess,
Key: "test",
}
t.Run("obtaining lock should succeed", func(t *testing.T) {
err := dialect.Lock(cfg)
@@ -117,7 +120,7 @@ func TestMigrationLock(t *testing.T) {
require.NoError(t, err)
sess2 := x2.NewSession()
d2 := NewDialect(x2)
d2 := NewDialect(x2.DriverName())
err = dialect.Lock(cfg)
require.NoError(t, err)
@@ -139,7 +142,7 @@ func TestMigrationLock(t *testing.T) {
x, err := xorm.NewEngine(testDB.DriverName, replaceDBName(t, testDB.ConnStr, dbType))
require.NoError(t, err)
d := NewDialect(x)
d := NewDialect(x.DriverName())
err = d.Lock(cfg)
require.NoError(t, err)
@@ -165,7 +168,7 @@ func TestMigratorLocking(t *testing.T) {
x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
require.NoError(t, err)
err = NewDialect(x).CleanDB()
err = NewDialect(x.DriverName()).CleanDB(x)
require.NoError(t, err)
mg := NewMigrator(x, &setting.Cfg{})
@@ -202,7 +205,7 @@ func TestDatabaseLocking(t *testing.T) {
x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
require.NoError(t, err)
err = NewDialect(x).CleanDB()
err = NewDialect(x.DriverName()).CleanDB(x)
require.NoError(t, err)
mg1 := NewMigrator(x, &setting.Cfg{})
pkg/services/sqlstore/migrations/ualert/migration_test.go
+1 -1
View File
@@ -627,7 +627,7 @@ func setupTestDB(t *testing.T) *xorm.Engine {
x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
require.NoError(t, err)
err = migrator.NewDialect(x).CleanDB()
err = migrator.NewDialect(x.DriverName()).CleanDB(x)
require.NoError(t, err)
mg := migrator.NewMigrator(x, &setting.Cfg{Raw: ini.Empty()})