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>

5 files changed, 17 insertions, 12 deletions

diff --git a/modules/doctor/dbconsistency.go b/modules/doctor/dbconsistency.go
index 0d84c63976..fef3ae67a3 100644
--- a/modules/doctor/dbconsistency.go
+++ b/modules/doctor/dbconsistency.go
@@ -8,6 +8,7 @@ import (
 	"context"
 
 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/migrations"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
@@ -15,7 +16,7 @@ import (
 
 func checkDBConsistency(logger log.Logger, autofix bool) error {
 	// make sure DB version is uptodate
-	if err := models.NewEngine(context.Background(), migrations.EnsureUpToDate); err != nil {
+	if err := db.NewEngine(context.Background(), migrations.EnsureUpToDate); err != nil {
 		logger.Critical("Model version on the database does not match the current Gitea version. Model consistency will not be checked until the database is upgraded")
 		return err
 	}
@@ -225,14 +226,14 @@ func checkDBConsistency(logger log.Logger, autofix bool) error {
 	// TODO: function to recalc all counters
 
 	if setting.Database.UsePostgreSQL {
-		count, err = models.CountBadSequences()
+		count, err = db.CountBadSequences()
 		if err != nil {
 			logger.Critical("Error: %v whilst checking sequence values", err)
 			return err
 		}
 		if count > 0 {
 			if autofix {
-				err := models.FixBadSequences()
+				err := db.FixBadSequences()
 				if err != nil {
 					logger.Critical("Error: %v whilst attempting to fix sequences", err)
 					return err
diff --git a/modules/doctor/dbversion.go b/modules/doctor/dbversion.go
index c5cac3bf91..acc564bdb0 100644
--- a/modules/doctor/dbversion.go
+++ b/modules/doctor/dbversion.go
@@ -7,13 +7,13 @@ package doctor
 import (
 	"context"
 
-	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/migrations"
 	"code.gitea.io/gitea/modules/log"
 )
 
 func checkDBVersion(logger log.Logger, autofix bool) error {
-	if err := models.NewEngine(context.Background(), migrations.EnsureUpToDate); err != nil {
+	if err := db.NewEngine(context.Background(), migrations.EnsureUpToDate); err != nil {
 		if !autofix {
 			logger.Critical("Error: %v during ensure up to date", err)
 			return err
@@ -21,7 +21,7 @@ func checkDBVersion(logger log.Logger, autofix bool) error {
 		logger.Warn("Got Error: %v during ensure up to date", err)
 		logger.Warn("Attempting to migrate to the latest DB version to fix this.")
 
-		err = models.NewEngine(context.Background(), migrations.Migrate)
+		err = db.NewEngine(context.Background(), migrations.Migrate)
 		if err != nil {
 			logger.Critical("Error: %v during migration", err)
 		}
diff --git a/modules/doctor/doctor.go b/modules/doctor/doctor.go
index 8c0d467304..d5cc4a1850 100644
--- a/modules/doctor/doctor.go
+++ b/modules/doctor/doctor.go
@@ -9,7 +9,7 @@ import (
 	"sort"
 	"strings"
 
-	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 )
@@ -47,7 +47,7 @@ func initDBDisableConsole(disableConsole bool) error {
 	setting.InitDBConfig()
 
 	setting.NewXORMLogService(disableConsole)
-	if err := models.SetEngine(); err != nil {
+	if err := db.SetEngine(); err != nil {
 		return fmt.Errorf("models.SetEngine: %v", err)
 	}
 	return nil
diff --git a/modules/doctor/mergebase.go b/modules/doctor/mergebase.go
index 7e9a065b77..e792c2b2fd 100644
--- a/modules/doctor/mergebase.go
+++ b/modules/doctor/mergebase.go
@@ -9,14 +9,16 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
+
 	"xorm.io/builder"
 )
 
 func iteratePRs(repo *models.Repository, each func(*models.Repository, *models.PullRequest) error) error {
-	return models.Iterate(
-		models.DefaultDBContext(),
+	return db.Iterate(
+		db.DefaultContext(),
 		new(models.PullRequest),
 		builder.Eq{"base_repo_id": repo.ID},
 		func(idx int, bean interface{}) error {
diff --git a/modules/doctor/misc.go b/modules/doctor/misc.go
index 47fee8f7fd..25bc3c3a72 100644
--- a/modules/doctor/misc.go
+++ b/modules/doctor/misc.go
@@ -12,19 +12,21 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/repository"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/util"
+
 	lru "github.com/hashicorp/golang-lru"
 	"xorm.io/builder"
 )
 
 func iterateRepositories(each func(*models.Repository) error) error {
-	err := models.Iterate(
-		models.DefaultDBContext(),
+	err := db.Iterate(
+		db.DefaultContext(),
 		new(models.Repository),
 		builder.Gt{"id": 0},
 		func(idx int, bean interface{}) error {