chore: rename 'migrations' to 'gitea_migrations'

.air.toml

@@ -11,7 +11,7 @@ include_file = ["main.go"]
 include_dir = ["cmd", "models", "modules", "options", "routers", "services"]
 exclude_dir = [
   "models/fixtures",
-  "models/migrations/fixtures",
+  "models/gitea_migrations/fixtures",
   "modules/avatar/identicon/testdata",
   "modules/avatar/testdata",
   "modules/git/tests",

.golangci.yml

@@ -120,7 +120,7 @@ linters:
           - errcheck
           - gocyclo
           - gosec
-        path: models/migrations/v
+        path: models/gitea_migrations/v
       - linters:
           - forbidigo
         path: cmd

Makefile

@@ -287,14 +287,14 @@ show-version-api: verify-version
 .PHONY: compute-go-test-packages
 compute-go-test-packages:
 ifeq ($(HAS_GO), yes)
-	$(eval GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list forgejo.org/models/migrations/...) $(shell $(GO) list forgejo.org/models/forgejo_migrations/...) forgejo.org/tests/integration/migration-test forgejo.org/tests forgejo.org/tests/integration forgejo.org/tests/e2e,$(shell $(GO) list ./...)))
+	$(eval GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list forgejo.org/models/gitea_migrations/...) $(shell $(GO) list forgejo.org/models/forgejo_migrations/...) forgejo.org/tests/integration/migration-test forgejo.org/tests forgejo.org/tests/integration forgejo.org/tests/e2e,$(shell $(GO) list ./...)))
 endif
 
 # Target to compute MIGRATION_PACKAGES - only runs when needed
 .PHONY: compute-migration-packages
 compute-migration-packages:
 ifeq ($(HAS_GO), yes)
-	$(eval MIGRATION_PACKAGES := $(shell $(GO) list forgejo.org/models/migrations/... forgejo.org/models/forgejo_migrations/...))
+	$(eval MIGRATION_PACKAGES := $(shell $(GO) list forgejo.org/models/gitea_migrations/... forgejo.org/models/forgejo_migrations/...))
 endif
 
 ###
@@ -778,7 +778,7 @@ migrations.individual.mysql.test: $(GO_SOURCES) | compute-migration-packages
 
 .PHONY: migrations.individual.sqlite.test\#%
 migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite
-	GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' forgejo.org/models/migrations/$*
+	GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' forgejo.org/models/gitea_migrations/$*
 
 .PHONY: migrations.individual.pgsql.test
 migrations.individual.pgsql.test: $(GO_SOURCES) | compute-migration-packages
@@ -788,7 +788,7 @@ migrations.individual.pgsql.test: $(GO_SOURCES) | compute-migration-packages
 
 .PHONY: migrations.individual.pgsql.test\#%
 migrations.individual.pgsql.test\#%: $(GO_SOURCES) generate-ini-pgsql
-	GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' forgejo.org/models/migrations/$*
+	GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' forgejo.org/models/gitea_migrations/$*
 
 .PHONY: migrations.individual.sqlite.test
 migrations.individual.sqlite.test: $(GO_SOURCES) generate-ini-sqlite | compute-migration-packages
@@ -798,7 +798,7 @@ migrations.individual.sqlite.test: $(GO_SOURCES) generate-ini-sqlite | compute-m
 
 .PHONY: migrations.individual.sqlite.test\#%
 migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite
-	GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' forgejo.org/models/migrations/$*
+	GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' forgejo.org/models/gitea_migrations/$*
 
 e2e.mysql.test: $(GO_SOURCES)
 	$(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/e2e -o e2e.mysql.test

build/code-batch-process.go

@@ -74,7 +74,7 @@ func newFileCollector(fileFilter string, batchSize int) (*fileCollector, error)
 		co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`tests/integration/migration-test`))
 		co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`modules/git/tests`))
 		co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`models/fixtures`))
-		co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`models/migrations/fixtures`))
+		co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`models/gitea_migrations/fixtures`))
 		co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`services/gitdiff/testdata`))
 	}
 

cmd/doctor.go

@@ -15,8 +15,8 @@ import (
 	"text/tabwriter"
 
 	"forgejo.org/models/db"
-	"forgejo.org/models/migrations"
-	migrate_base "forgejo.org/models/migrations/base"
+	"forgejo.org/models/gitea_migrations"
+	migrate_base "forgejo.org/models/gitea_migrations/base"
 	repo_model "forgejo.org/models/repo"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/container"
@@ -159,7 +159,7 @@ func runRecreateTable(stdCtx context.Context, ctx *cli.Command) error {
 			return err
 		}
 
-		if err := migrations.EnsureUpToDate(engine); err != nil {
+		if err := gitea_migrations.EnsureUpToDate(engine); err != nil {
 			return err
 		}
 

cmd/migrate.go

@@ -7,7 +7,7 @@ import (
 	"context"
 
 	"forgejo.org/models/db"
-	"forgejo.org/models/migrations"
+	"forgejo.org/models/gitea_migrations"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
 
@@ -44,7 +44,7 @@ func runMigrate(stdCtx context.Context, ctx *cli.Command) error {
 		if err != nil {
 			return err
 		}
-		return migrations.Migrate(masterEngine)
+		return gitea_migrations.Migrate(masterEngine)
 	}); err != nil {
 		log.Fatal("Failed to initialize ORM engine: %v", err)
 		return err

cmd/migrate_storage.go

@@ -13,7 +13,7 @@ import (
 	actions_model "forgejo.org/models/actions"
 	"forgejo.org/models/db"
 	git_model "forgejo.org/models/git"
-	"forgejo.org/models/migrations"
+	"forgejo.org/models/gitea_migrations"
 	packages_model "forgejo.org/models/packages"
 	repo_model "forgejo.org/models/repo"
 	user_model "forgejo.org/models/user"
@@ -200,7 +200,7 @@ func runMigrateStorage(stdCtx context.Context, ctx *cli.Command) error {
 	log.Info("Configuration file: %s", setting.CustomConf)
 
 	if err := db.InitEngineWithMigration(context.Background(), func(e db.Engine) error {
-		return migrations.Migrate(e.(*xorm.Engine))
+		return gitea_migrations.Migrate(e.(*xorm.Engine))
 	}); err != nil {
 		log.Fatal("Failed to initialize ORM engine: %v", err)
 		return err

contrib/coverage-helper.sh

@@ -8,7 +8,7 @@ PS4='${BASH_SOURCE[0]}:$LINENO: ${FUNCNAME[0]}:  '
 # Those must be explicitly required and are excluded from the full list of packages because they
 # would interfere with the testing fixtures.
 #
-excluded+='forgejo.org/models/migrations|'                # must be run before database specific tests
+excluded+='forgejo.org/models/gitea_migrations|'                # must be run before database specific tests
 excluded+='forgejo.org/models/forgejo_migrations|'        # must be run before database specific tests
 excluded+='forgejo.org/tests/integration/migration-test|' # must be run before database specific tests
 excluded+='forgejo.org/tests|'                            # only tests, no coverage to get there

models/db/foreign_keys.go

@@ -117,7 +117,7 @@ func TableNameInsertionOrderSortFunc(table1, table2 string) int {
 	}
 
 	// Since this is typically used by `slices.SortFunc` it can't return an error.  If a table is referenced that isn't
-	// a registered model then it will be sorted at the beginning -- this case is used in models/migrations/test.
+	// a registered model then it will be sorted at the beginning -- this case is used in models/gitea_migrations/test.
 	val1, ok := lookupMap[table1]
 	if !ok {
 		val1 = -1

models/forgejo_migrations/main_test.go

@@ -6,7 +6,7 @@ package forgejo_migrations
 import (
 	"testing"
 
-	migration_tests "forgejo.org/models/migrations/test"
+	migration_tests "forgejo.org/models/gitea_migrations/test"
 )
 
 func TestMain(m *testing.M) {

models/forgejo_migrations/migrate_test.go

@@ -6,7 +6,7 @@ package forgejo_migrations
 import (
 	"testing"
 
-	migration_tests "forgejo.org/models/migrations/test"
+	migration_tests "forgejo.org/models/gitea_migrations/test"
 
 	"github.com/stretchr/testify/require"
 )

models/forgejo_migrations/v14.go

@@ -4,7 +4,7 @@
 package forgejo_migrations
 
 import (
-	"forgejo.org/models/migrations/base"
+	"forgejo.org/models/gitea_migrations/base"
 
 	"xorm.io/xorm"
 )

models/forgejo_migrations/v1_22/main_test.go

@@ -6,7 +6,7 @@ package v1_22
 import (
 	"testing"
 
-	migration_tests "forgejo.org/models/migrations/test"
+	migration_tests "forgejo.org/models/gitea_migrations/test"
 )
 
 func TestMain(m *testing.M) {

models/forgejo_migrations/v1_22/v8_test.go

@@ -6,7 +6,7 @@ package v1_22
 import (
 	"testing"
 
-	migration_tests "forgejo.org/models/migrations/test"
+	migration_tests "forgejo.org/models/gitea_migrations/test"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

models/forgejo_migrations/v25.go

@@ -23,7 +23,7 @@ func MigrateTwoFactorToKeying(x *xorm.Engine) error {
 	var err error
 
 	// When upgrading from Forgejo v9 to v10, this migration will already be
-	// called from models/migrations/migrations.go migration 304 and must not
+	// called from models/gitea_migrations/migrations.go migration 304 and must not
 	// be run twice.
 	var version int
 	_, err = x.Table("version").Where("`id` = 1").Select("version").Get(&version)

models/forgejo_migrations/v25_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"forgejo.org/models/auth"
-	migration_tests "forgejo.org/models/migrations/test"
+	migration_tests "forgejo.org/models/gitea_migrations/test"
 	"forgejo.org/modules/keying"
 	"forgejo.org/modules/timeutil"
 

models/forgejo_migrations/v30.go

@@ -6,7 +6,7 @@ package forgejo_migrations
 import (
 	"time"
 
-	"forgejo.org/models/migrations/base"
+	"forgejo.org/models/gitea_migrations/base"
 	"forgejo.org/modules/forgefed"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/timeutil"

models/forgejo_migrations/v30_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	migration_tests "forgejo.org/models/migrations/test"
+	migration_tests "forgejo.org/models/gitea_migrations/test"
 	"forgejo.org/modules/timeutil"
 
 	"github.com/stretchr/testify/require"

models/forgejo_migrations/v31_test.go

@@ -6,7 +6,7 @@ package forgejo_migrations
 import (
 	"testing"
 
-	migration_tests "forgejo.org/models/migrations/test"
+	migration_tests "forgejo.org/models/gitea_migrations/test"
 
 	"github.com/stretchr/testify/require"
 )

models/forgejo_migrations/v32_test.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	migration_tests "forgejo.org/models/migrations/test"
+	migration_tests "forgejo.org/models/gitea_migrations/test"
 	"forgejo.org/models/packages"
 
 	"github.com/stretchr/testify/assert"

models/forgejo_migrations/v33_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	migration_tests "forgejo.org/models/migrations/test"
+	migration_tests "forgejo.org/models/gitea_migrations/test"
 	"forgejo.org/modules/log"
 	ft "forgejo.org/modules/test"
 

models/forgejo_migrations/v39_test.go

@@ -6,7 +6,7 @@ package forgejo_migrations
 import (
 	"testing"
 
-	migration_tests "forgejo.org/models/migrations/test"
+	migration_tests "forgejo.org/models/gitea_migrations/test"
 	"forgejo.org/models/secret"
 	"forgejo.org/modules/keying"
 	"forgejo.org/modules/timeutil"

models/gitea_migrations/base/db_test.go

@@ -6,7 +6,7 @@ package base
 import (
 	"testing"
 
-	migrations_tests "forgejo.org/models/migrations/test"
+	migrations_tests "forgejo.org/models/gitea_migrations/test"
 	"forgejo.org/modules/timeutil"
 
 	"xorm.io/xorm/names"

models/gitea_migrations/base/main_test.go

@@ -6,7 +6,7 @@ package base
 import (
 	"testing"
 
-	migrations_tests "forgejo.org/models/migrations/test"
+	migrations_tests "forgejo.org/models/gitea_migrations/test"
 )
 
 func TestMain(m *testing.M) {

models/gitea_migrations/migrations.go

@@ -2,7 +2,7 @@
 // Copyright 2017 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package migrations
+package gitea_migrations
 
 import (
 	"context"
@@ -11,24 +11,24 @@ import (
 
 	"forgejo.org/models/db"
 	"forgejo.org/models/forgejo_migrations"
-	"forgejo.org/models/migrations/v1_10"
-	"forgejo.org/models/migrations/v1_11"
-	"forgejo.org/models/migrations/v1_12"
-	"forgejo.org/models/migrations/v1_13"
-	"forgejo.org/models/migrations/v1_14"
-	"forgejo.org/models/migrations/v1_15"
-	"forgejo.org/models/migrations/v1_16"
-	"forgejo.org/models/migrations/v1_17"
-	"forgejo.org/models/migrations/v1_18"
-	"forgejo.org/models/migrations/v1_19"
-	"forgejo.org/models/migrations/v1_20"
-	"forgejo.org/models/migrations/v1_21"
-	"forgejo.org/models/migrations/v1_22"
-	"forgejo.org/models/migrations/v1_23"
-	"forgejo.org/models/migrations/v1_6"
-	"forgejo.org/models/migrations/v1_7"
-	"forgejo.org/models/migrations/v1_8"
-	"forgejo.org/models/migrations/v1_9"
+	"forgejo.org/models/gitea_migrations/v1_10"
+	"forgejo.org/models/gitea_migrations/v1_11"
+	"forgejo.org/models/gitea_migrations/v1_12"
+	"forgejo.org/models/gitea_migrations/v1_13"
+	"forgejo.org/models/gitea_migrations/v1_14"
+	"forgejo.org/models/gitea_migrations/v1_15"
+	"forgejo.org/models/gitea_migrations/v1_16"
+	"forgejo.org/models/gitea_migrations/v1_17"
+	"forgejo.org/models/gitea_migrations/v1_18"
+	"forgejo.org/models/gitea_migrations/v1_19"
+	"forgejo.org/models/gitea_migrations/v1_20"
+	"forgejo.org/models/gitea_migrations/v1_21"
+	"forgejo.org/models/gitea_migrations/v1_22"
+	"forgejo.org/models/gitea_migrations/v1_23"
+	"forgejo.org/models/gitea_migrations/v1_6"
+	"forgejo.org/models/gitea_migrations/v1_7"
+	"forgejo.org/models/gitea_migrations/v1_8"
+	"forgejo.org/models/gitea_migrations/v1_9"
 	"forgejo.org/modules/git"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"

models/gitea_migrations/migrations_test.go

@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package migrations
+package gitea_migrations
 
 import (
 	"testing"

models/gitea_migrations/test/tests.go

@@ -31,7 +31,7 @@ import (
 // PrepareTestEnv prepares the test environment and reset the database. The skip parameter should usually be 0.
 // Provide models to be sync'd with the database - in particular any models you expect fixtures to be loaded from.
 //
-// fixtures in `models/migrations/fixtures/<TestName>` will be loaded automatically
+// fixtures in `models/gitea_migrations/fixtures/<TestName>` will be loaded automatically
 func PrepareTestEnv(t *testing.T, skip int, syncModels ...any) (*xorm.Engine, func()) {
 	t.Helper()
 	ourSkip := 2
@@ -89,7 +89,7 @@ func PrepareTestEnv(t *testing.T, skip int, syncModels ...any) (*xorm.Engine, fu
 		}
 	}
 
-	fixturesDir := filepath.Join(filepath.Dir(setting.AppPath), "models", "migrations", "fixtures", t.Name())
+	fixturesDir := filepath.Join(filepath.Dir(setting.AppPath), "models", "gitea_migrations", "fixtures", t.Name())
 
 	if _, err := os.Stat(fixturesDir); err == nil {
 		t.Logf("initializing fixtures from: %s", fixturesDir)

models/gitea_migrations/v1_11/v102.go

@@ -4,7 +4,7 @@
 package v1_11
 
 import (
-	"forgejo.org/models/migrations/base"
+	"forgejo.org/models/gitea_migrations/base"
 
 	"xorm.io/xorm"
 )

models/gitea_migrations/v1_11/v104.go

@@ -4,7 +4,7 @@
 package v1_11
 
 import (
-	"forgejo.org/models/migrations/base"
+	"forgejo.org/models/gitea_migrations/base"
 
 	"xorm.io/xorm"
 )