Skip to content

Commit fcfbab9

Browse files
authored
Set the name Mapper in migrations (#14526)
Migrations currently uses the default Xorm mapper which is not the same as the mapper Gitea actually uses. This means that there is a difference between the struct parsing and mapping to database tables in migrations as compared to normal Sync2. This was the cause for the catastrophic problem in v168 - untagged fields are not mapped in the same way in migrations as compared to outside of migrations. This is also likely the cause of some weird subtle failures in other migrations as any untagged field may not be being mapped exactly the same way. This PR suggests that we ensure that the mapper is set at the start of the migrations code - but also enforces a strict clean mapper between each migration. Signed-off-by: Andrew Thornton <art27@cantab.net>
1 parent eea4197 commit fcfbab9

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

models/migrations/migrations.go

+5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"code.gitea.io/gitea/modules/setting"
1818

1919
"xorm.io/xorm"
20+
"xorm.io/xorm/names"
2021
"xorm.io/xorm/schemas"
2122
)
2223

@@ -333,6 +334,8 @@ func EnsureUpToDate(x *xorm.Engine) error {
333334

334335
// Migrate database to current version
335336
func Migrate(x *xorm.Engine) error {
337+
// Set a new clean the default mapper to GonicMapper as that is the default for Gitea.
338+
x.SetMapper(names.GonicMapper{})
336339
if err := x.Sync(new(Version)); err != nil {
337340
return fmt.Errorf("sync: %v", err)
338341
}
@@ -371,6 +374,8 @@ Please try upgrading to a lower version first (suggested v1.6.4), then upgrade t
371374
// Migrate
372375
for i, m := range migrations[v-minDBVersion:] {
373376
log.Info("Migration[%d]: %s", v+int64(i), m.Description())
377+
// Reset the mapper between each migration - migrations are not supposed to depend on each other
378+
x.SetMapper(names.GonicMapper{})
374379
if err = m.Migrate(x); err != nil {
375380
return fmt.Errorf("do migrate: %v", err)
376381
}

0 commit comments

Comments
 (0)