From a4bfef265d9e512830350635a0489c2cdcd6508f Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 19 Sep 2021 19:49:59 +0800 Subject: 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 --- models/fixture_generation.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'models/fixture_generation.go') diff --git a/models/fixture_generation.go b/models/fixture_generation.go index 64cf160365..49cf5ad6a6 100644 --- a/models/fixture_generation.go +++ b/models/fixture_generation.go @@ -7,13 +7,15 @@ package models import ( "fmt" "strings" + + "code.gitea.io/gitea/models/db" ) // GetYamlFixturesAccess returns a string containing the contents // for the access table, as recalculated using repo.RecalculateAccesses() func GetYamlFixturesAccess() (string, error) { repos := make([]*Repository, 0, 50) - if err := x.Find(&repos); err != nil { + if err := db.DefaultContext().Engine().Find(&repos); err != nil { return "", err } @@ -27,7 +29,7 @@ func GetYamlFixturesAccess() (string, error) { var b strings.Builder accesses := make([]*Access, 0, 200) - if err := x.OrderBy("user_id, repo_id").Find(&accesses); err != nil { + if err := db.DefaultContext().Engine().OrderBy("user_id, repo_id").Find(&accesses); err != nil { return "", err } -- cgit v1.2.3