diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-09-19 19:49:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-19 19:49:59 +0800 |
| commit | a4bfef265d9e512830350635a0489c2cdcd6508f (patch) | |
| tree | 1e3c2ec94276dfcb2f8ba73a2ac075ba39c4a34a /integrations/migration-test | |
| parent | 462306e263db5a809dbe2cdf62e99307aeff28de (diff) | |
| download | gitea-a4bfef265d9e512830350635a0489c2cdcd6508f.tar.gz gitea-a4bfef265d9e512830350635a0489c2cdcd6508f.zip | |
Move db related basic functions to models/db (#17075)
* Move db related basic functions to models/db
* Fix lint
* Fix lint
* Fix test
* Fix lint
* Fix lint
* revert unnecessary change
* Fix test
* Fix wrong replace string
* Use *Context
* Correct committer spelling and fix wrong replaced words
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'integrations/migration-test')
| -rw-r--r-- | integrations/migration-test/migration_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/integrations/migration-test/migration_test.go b/integrations/migration-test/migration_test.go index 209ff5a058..66aca0ef70 100644 --- a/integrations/migration-test/migration_test.go +++ b/integrations/migration-test/migration_test.go @@ -19,7 +19,7 @@ import ( "testing" "code.gitea.io/gitea/integrations" - "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/migrations" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/charset" @@ -256,13 +256,13 @@ func doMigrationTest(t *testing.T, version string) { setting.NewXORMLogService(false) - err := models.NewEngine(context.Background(), wrappedMigrate) + err := db.NewEngine(context.Background(), wrappedMigrate) assert.NoError(t, err) currentEngine.Close() - beans, _ := models.NamesToBean() + beans, _ := db.NamesToBean() - err = models.NewEngine(context.Background(), func(x *xorm.Engine) error { + err = db.NewEngine(context.Background(), func(x *xorm.Engine) error { currentEngine = x return migrations.RecreateTables(beans...)(x) }) @@ -270,7 +270,7 @@ func doMigrationTest(t *testing.T, version string) { currentEngine.Close() // We do this a second time to ensure that there is not a problem with retained indices - err = models.NewEngine(context.Background(), func(x *xorm.Engine) error { + err = db.NewEngine(context.Background(), func(x *xorm.Engine) error { currentEngine = x return migrations.RecreateTables(beans...)(x) }) |