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 /contrib | |
| 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 'contrib')
| -rw-r--r-- | contrib/fixtures/fixture_generation.go | 5 | ||||
| -rw-r--r-- | contrib/pr/checkout.go | 15 |
2 files changed, 11 insertions, 9 deletions
diff --git a/contrib/fixtures/fixture_generation.go b/contrib/fixtures/fixture_generation.go index 802a2ca30c..1665dab643 100644 --- a/contrib/fixtures/fixture_generation.go +++ b/contrib/fixtures/fixture_generation.go @@ -11,6 +11,7 @@ import ( "path/filepath" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" ) // To generate derivative fixtures, execute the following from Gitea's repository base dir: @@ -31,11 +32,11 @@ var ( func main() { pathToGiteaRoot := "." fixturesDir = filepath.Join(pathToGiteaRoot, "models", "fixtures") - if err := models.CreateTestEngine(fixturesDir); err != nil { + if err := db.CreateTestEngine(fixturesDir); err != nil { fmt.Printf("CreateTestEngine: %+v", err) os.Exit(1) } - if err := models.PrepareTestDatabase(); err != nil { + if err := db.PrepareTestDatabase(); err != nil { fmt.Printf("PrepareTestDatabase: %+v\n", err) os.Exit(1) } diff --git a/contrib/pr/checkout.go b/contrib/pr/checkout.go index 902c9ea623..44c3fd5176 100644 --- a/contrib/pr/checkout.go +++ b/contrib/pr/checkout.go @@ -26,6 +26,7 @@ import ( "time" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" gitea_git "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/external" @@ -87,27 +88,27 @@ func runPR() { setting.Database.Path = ":memory:" setting.Database.Timeout = 500 */ - db := setting.Cfg.Section("database") - db.NewKey("DB_TYPE", "sqlite3") - db.NewKey("PATH", ":memory:") + dbCfg := setting.Cfg.Section("database") + dbCfg.NewKey("DB_TYPE", "sqlite3") + dbCfg.NewKey("PATH", ":memory:") routers.NewServices() setting.Database.LogSQL = true //x, err = xorm.NewEngine("sqlite3", "file::memory:?cache=shared") - models.NewEngine(context.Background(), func(_ *xorm.Engine) error { + db.NewEngine(context.Background(), func(_ *xorm.Engine) error { return nil }) - models.HasEngine = true + db.HasEngine = true //x.ShowSQL(true) - err = models.InitFixtures( + err = db.InitFixtures( path.Join(curDir, "models/fixtures/"), ) if err != nil { fmt.Printf("Error initializing test database: %v\n", err) os.Exit(1) } - models.LoadFixtures() + db.LoadFixtures() util.RemoveAll(setting.RepoRootPath) util.RemoveAll(models.LocalCopyPath()) util.CopyDir(path.Join(curDir, "integrations/gitea-repositories-meta"), setting.RepoRootPath) |