Fix migration from Gogs

Author: lafriks

models/migrations/v15.go

@@ -10,21 +10,15 @@ import (
 	"github.com/go-xorm/xorm"
 )
 
-// UserV15 describes the added field for User
-type UserV15 struct {
-	KeepEmailPrivate        bool
-	AllowCreateOrganization bool
-}
-
-// TableName will be invoked by XORM to customrize the table name
-func (*UserV15) TableName() string {
-	return "user"
-}
-
 func createAllowCreateOrganizationColumn(x *xorm.Engine) error {
-	if err := x.Sync2(new(UserV15)); err != nil {
+	type User struct {
+		KeepEmailPrivate        bool
+		AllowCreateOrganization bool
+	}
+
+	if err := x.Sync2(new(User)); err != nil {
 		return fmt.Errorf("Sync2: %v", err)
-	} else if _, err = x.Where("type=0").Cols("allow_create_organization").Update(&UserV15{AllowCreateOrganization: true}); err != nil {
+	} else if _, err = x.Where("`type`=0").Cols("allow_create_organization").Update(&User{AllowCreateOrganization: true}); err != nil {
 		return fmt.Errorf("set allow_create_organization: %v", err)
 	}
 	return nil

models/migrations/v37.go

@@ -7,15 +7,18 @@ package migrations
 import (
 	"html"
 
-	"code.gitea.io/gitea/models"
-
 	"github.com/go-xorm/xorm"
 )
 
 func unescapeUserFullNames(x *xorm.Engine) (err error) {
+	type User struct {
+		ID       int64 `xorm:"pk autoincr"`
+		FullName string
+	}
+
 	const batchSize = 100
 	for start := 0; ; start += batchSize {
-		users := make([]*models.User, 0, batchSize)
+		users := make([]*User, 0, batchSize)
 		if err := x.Limit(start, batchSize).Find(users); err != nil {
 			return err
 		}
@@ -24,7 +27,7 @@ func unescapeUserFullNames(x *xorm.Engine) (err error) {
 		}
 		for _, user := range users {
 			user.FullName = html.UnescapeString(user.FullName)
-			if _, err := x.Cols("full_name").Update(user); err != nil {
+			if _, err := x.Where("`id` = ?", user.ID).Cols("full_name").Update(user); err != nil {
 				return err
 			}
 		}

models/migrations/v39.go

@@ -69,8 +69,8 @@ func addTimetracking(x *xorm.Engine) error {
 		return fmt.Errorf("Sync2: %v", err)
 	}
 	//Updating existing issue units
-	var units []*RepoUnit
-	x.Where("type = ?", V16UnitTypeIssues).Find(&units)
+	units := make([]*RepoUnit, 0, 100)
+	x.Where("`type` = ?", V16UnitTypeIssues).Find(units)
 	for _, unit := range units {
 		if unit.Config != nil {
 			continue