Skip to content

Commit e72acd5

Browse files
lunnylunny
authored
Split migrations folder (#21549)
There are too many files in `models/migrations` folder so that I split them into sub folders.
1 parent 4827f42 commit e72acd5

File tree

190 files changed

+1711
-1481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+1711
-1481
lines changed

‎Makefile‎

Lines changed: 56 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(G
100100

101101
LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64
102102

103-
GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/models/migrations code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/))
103+
GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/))
104+
GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/))
104105

105106
FOMANTIC_WORK_DIR := web_src/fomantic
106107

@@ -366,7 +367,7 @@ test: test-frontend test-backend
366367
.PHONY: test-backend
367368
test-backend:
368369
@echo "Running go test with $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..."
369-
@$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_PACKAGES)
370+
@$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_TEST_PACKAGES)
370371

371372
.PHONY: test-frontend
372373
test-frontend: node_modules
@@ -387,7 +388,7 @@ test-check:
387388
.PHONY: test\#%
388389
test\#%:
389390
@echo "Running go test with -tags '$(TEST_TAGS)'..."
390-
@$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_PACKAGES)
391+
@$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_TEST_PACKAGES)
391392

392393
.PHONY: coverage
393394
coverage:
@@ -398,7 +399,7 @@ coverage:
398399
.PHONY: unit-test-coverage
399400
unit-test-coverage:
400401
@echo "Running unit-test-coverage $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..."
401-
@$(GO) test $(GOTESTFLAGS) -timeout=20m -tags='$(TEST_TAGS)' -cover -coverprofile coverage.out $(GO_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
402+
@$(GO) test $(GOTESTFLAGS) -timeout=20m -tags='$(TEST_TAGS)' -cover -coverprofile coverage.out $(GO_TEST_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
402403

403404
.PHONY: tidy
404405
tidy:
@@ -442,14 +443,7 @@ test-sqlite\#%: integrations.sqlite.test generate-ini-sqlite
442443
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.sqlite.test -test.run $(subst .,/,$*)
443444

444445
.PHONY: test-sqlite-migration
445-
test-sqlite-migration: migrations.sqlite.test migrations.individual.sqlite.test generate-ini-sqlite
446-
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./migrations.sqlite.test
447-
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./migrations.individual.sqlite.test
448-
449-
.PHONY: test-sqlite-migration\#%
450-
test-sqlite-migration\#%: migrations.sqlite.test migrations.individual.sqlite.test generate-ini-sqlite
451-
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./migrations.individual.sqlite.test -test.run $(subst .,/,$*)
452-
446+
test-sqlite-migration: migrations.sqlite.test migrations.individual.sqlite.test
453447

454448
generate-ini-mysql:
455449
sed -e 's|{{TEST_MYSQL_HOST}}|${TEST_MYSQL_HOST}|g' \
@@ -470,9 +464,7 @@ test-mysql\#%: integrations.mysql.test generate-ini-mysql
470464
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./integrations.mysql.test -test.run $(subst .,/,$*)
471465

472466
.PHONY: test-mysql-migration
473-
test-mysql-migration: migrations.mysql.test migrations.individual.mysql.test generate-ini-mysql
474-
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./migrations.mysql.test
475-
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./migrations.individual.mysql.test
467+
test-mysql-migration: migrations.mysql.test migrations.individual.mysql.test
476468

477469
generate-ini-mysql8:
478470
sed -e 's|{{TEST_MYSQL8_HOST}}|${TEST_MYSQL8_HOST}|g' \
@@ -493,9 +485,7 @@ test-mysql8\#%: integrations.mysql8.test generate-ini-mysql8
493485
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql8.ini ./integrations.mysql8.test -test.run $(subst .,/,$*)
494486

495487
.PHONY: test-mysql8-migration
496-
test-mysql8-migration: migrations.mysql8.test migrations.individual.mysql8.test generate-ini-mysql8
497-
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql8.ini ./migrations.mysql8.test
498-
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql8.ini ./migrations.individual.mysql8.test
488+
test-mysql8-migration: migrations.mysql8.test migrations.individual.mysql8.test
499489

500490
generate-ini-pgsql:
501491
sed -e 's|{{TEST_PGSQL_HOST}}|${TEST_PGSQL_HOST}|g' \
@@ -517,9 +507,7 @@ test-pgsql\#%: integrations.pgsql.test generate-ini-pgsql
517507
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./integrations.pgsql.test -test.run $(subst .,/,$*)
518508

519509
.PHONY: test-pgsql-migration
520-
test-pgsql-migration: migrations.pgsql.test migrations.individual.pgsql.test generate-ini-pgsql
521-
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./migrations.pgsql.test
522-
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./migrations.individual.pgsql.test
510+
test-pgsql-migration: migrations.pgsql.test migrations.individual.pgsql.test
523511

524512
generate-ini-mssql:
525513
sed -e 's|{{TEST_MSSQL_HOST}}|${TEST_MSSQL_HOST}|g' \
@@ -540,9 +528,7 @@ test-mssql\#%: integrations.mssql.test generate-ini-mssql
540528
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini ./integrations.mssql.test -test.run $(subst .,/,$*)
541529

542530
.PHONY: test-mssql-migration
543-
test-mssql-migration: migrations.mssql.test migrations.individual.mssql.test generate-ini-mssql
544-
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini ./migrations.mssql.test -test.failfast
545-
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini ./migrations.individual.mssql.test -test.failfast
531+
test-mssql-migration: migrations.mssql.test migrations.individual.mssql.test
546532

547533
.PHONY: playwright
548534
playwright: $(PLAYWRIGHT_DIR)
@@ -637,50 +623,82 @@ integrations.sqlite.test: git-check $(GO_SOURCES)
637623
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.sqlite.test -tags '$(TEST_TAGS)'
638624

639625
integrations.cover.test: git-check $(GO_SOURCES)
640-
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_PACKAGES) | tr ' ' ',') -o integrations.cover.test
626+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.test
641627

642628
integrations.cover.sqlite.test: git-check $(GO_SOURCES)
643-
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)'
629+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)'
644630

645631
.PHONY: migrations.mysql.test
646-
migrations.mysql.test: $(GO_SOURCES)
632+
migrations.mysql.test: $(GO_SOURCES) generate-ini-mysql
647633
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mysql.test
634+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./migrations.mysql.test
648635

649636
.PHONY: migrations.mysql8.test
650-
migrations.mysql8.test: $(GO_SOURCES)
637+
migrations.mysql8.test: $(GO_SOURCES) generate-ini-mysql8
651638
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mysql8.test
639+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql8.ini ./migrations.mysql8.test
652640

653641
.PHONY: migrations.pgsql.test
654-
migrations.pgsql.test: $(GO_SOURCES)
642+
migrations.pgsql.test: $(GO_SOURCES) generate-ini-pgsql
655643
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.pgsql.test
644+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./migrations.pgsql.test
656645

657646
.PHONY: migrations.mssql.test
658-
migrations.mssql.test: $(GO_SOURCES)
647+
migrations.mssql.test: $(GO_SOURCES) generate-ini-mssql
659648
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mssql.test
649+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini ./migrations.mssql.test
660650

661651
.PHONY: migrations.sqlite.test
662-
migrations.sqlite.test: $(GO_SOURCES)
652+
migrations.sqlite.test: $(GO_SOURCES) generate-ini-sqlite
663653
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)'
654+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./migrations.sqlite.test
664655

665656
.PHONY: migrations.individual.mysql.test
666657
migrations.individual.mysql.test: $(GO_SOURCES)
667-
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/models/migrations -o migrations.individual.mysql.test
658+
for pkg in $(shell $(GO) list code.gitea.io/gitea/models/migrations/...); do \
659+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg; \
660+
done
668661

669662
.PHONY: migrations.individual.mysql8.test
670663
migrations.individual.mysql8.test: $(GO_SOURCES)
671-
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/models/migrations -o migrations.individual.mysql8.test
664+
for pkg in $(shell $(GO) list code.gitea.io/gitea/models/migrations/...); do \
665+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql8.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg; \
666+
done
667+
668+
.PHONY: migrations.individual.mysql8.test\#%
669+
migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite
670+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$*
672671

673672
.PHONY: migrations.individual.pgsql.test
674673
migrations.individual.pgsql.test: $(GO_SOURCES)
675-
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/models/migrations -o migrations.individual.pgsql.test
674+
for pkg in $(shell $(GO) list code.gitea.io/gitea/models/migrations/...); do \
675+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg; \
676+
done
677+
678+
.PHONY: migrations.individual.pgsql.test\#%
679+
migrations.individual.pgsql.test\#%: $(GO_SOURCES) generate-ini-pgsql
680+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$*
681+
676682

677683
.PHONY: migrations.individual.mssql.test
678-
migrations.individual.mssql.test: $(GO_SOURCES)
679-
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/models/migrations -o migrations.individual.mssql.test
684+
migrations.individual.mssql.test: $(GO_SOURCES) generate-ini-mssql
685+
for pkg in $(shell $(GO) list code.gitea.io/gitea/models/migrations/...); do \
686+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg -test.failfast; \
687+
done
688+
689+
.PHONY: migrations.individual.mssql.test\#%
690+
migrations.individual.mssql.test\#%: $(GO_SOURCES) generate-ini-mssql
691+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$*
680692

681693
.PHONY: migrations.individual.sqlite.test
682-
migrations.individual.sqlite.test: $(GO_SOURCES)
683-
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/models/migrations -o migrations.individual.sqlite.test -tags '$(TEST_TAGS)'
694+
migrations.individual.sqlite.test: $(GO_SOURCES) generate-ini-sqlite
695+
for pkg in $(shell $(GO) list code.gitea.io/gitea/models/migrations/...); do \
696+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg; \
697+
done
698+
699+
.PHONY: migrations.individual.sqlite.test\#%
700+
migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite
701+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$*
684702

685703
e2e.mysql.test: $(GO_SOURCES)
686704
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.mysql.test

‎assets/go-licenses.json‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/doctor.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414

1515
"code.gitea.io/gitea/models/db"
1616
"code.gitea.io/gitea/models/migrations"
17+
migrate_base "code.gitea.io/gitea/models/migrations/base"
1718
"code.gitea.io/gitea/modules/doctor"
1819
"code.gitea.io/gitea/modules/log"
1920
"code.gitea.io/gitea/modules/setting"
@@ -114,7 +115,7 @@ func runRecreateTable(ctx *cli.Context) error {
114115
if err != nil {
115116
return err
116117
}
117-
recreateTables := migrations.RecreateTables(beans...)
118+
recreateTables := migrate_base.RecreateTables(beans...)
118119

119120
return db.InitEngineWithMigration(stdCtx, func(x *xorm.Engine) error {
120121
if err := migrations.EnsureUpToDate(x); err != nil {

0 commit comments

Comments
 (0)