use dropTableColumns instead of recreateTable

Author: 6543

models/migrations/v167.go

@@ -7,109 +7,37 @@ package migrations
 import (
 	"xorm.io/builder"
 	"xorm.io/xorm"
-	"xorm.io/xorm/schemas"
 )
 
 func recreateUserTableToFixDefaultValues(x *xorm.Engine) error {
 	type User struct {
-		ID        int64  `xorm:"pk autoincr"`
-		LowerName string `xorm:"UNIQUE NOT NULL"`
-		Name      string `xorm:"UNIQUE NOT NULL"`
-		FullName  string
-		// Email is the primary email address (to be used for communication)
-		Email                        string `xorm:"NOT NULL"`
-		KeepEmailPrivate             bool
-		EmailNotificationsPreference string `xorm:"VARCHAR(20) NOT NULL DEFAULT 'enabled'"`
-		Passwd                       string `xorm:"NOT NULL"`
-		PasswdHashAlgo               string `xorm:"NOT NULL DEFAULT 'argon2'"`
-
-		// MustChangePassword is an attribute that determines if a user
-		// is to change his/her password after registration.
-		MustChangePassword bool `xorm:"NOT NULL DEFAULT false"`
-
-		LoginType   int
-		LoginSource int64 `xorm:"NOT NULL DEFAULT 0"`
-		LoginName   string
-		Type        int
-		Location    string
-		Website     string
-		Rands       string `xorm:"VARCHAR(10)"`
-		Salt        string `xorm:"VARCHAR(10)"`
-		Language    string `xorm:"VARCHAR(5)"`
-		Description string
-
-		CreatedUnix   int64 `xorm:"INDEX created"`
-		UpdatedUnix   int64 `xorm:"INDEX updated"`
-		LastLoginUnix int64 `xorm:"INDEX"`
-
-		// Remember visibility choice for convenience, true for private
-		LastRepoVisibility bool
-		// Maximum repository creation limit, -1 means use global default
-		MaxRepoCreation int `xorm:"NOT NULL DEFAULT -1"`
-
-		// Permissions
-		IsActive                bool `xorm:"INDEX"` // Activate primary email
-		IsAdmin                 bool
-		IsRestricted            bool `xorm:"NOT NULL DEFAULT false"`
-		AllowGitHook            bool
-		AllowImportLocal        bool // Allow migrate repository by local path
-		AllowCreateOrganization bool `xorm:"DEFAULT true"`
-		ProhibitLogin           bool `xorm:"NOT NULL DEFAULT false"`
-
-		// Avatar
-		Avatar          string `xorm:"VARCHAR(2048) NOT NULL"`
-		AvatarEmail     string `xorm:"NOT NULL"`
-		UseCustomAvatar bool
-
-		// Counters
-		NumFollowers int
-		NumFollowing int `xorm:"NOT NULL DEFAULT 0"`
-		NumStars     int
-		NumRepos     int
-
-		// For organization
-		NumTeams                  int
-		NumMembers                int
-		Visibility                int  `xorm:"NOT NULL DEFAULT 0"`
-		RepoAdminChangeTeamAccess bool `xorm:"NOT NULL DEFAULT false"`
-
-		// Preferences
-		DiffViewStyle       string `xorm:"NOT NULL DEFAULT ''"`
-		Theme               string `xorm:"NOT NULL DEFAULT ''"`
-		KeepActivityPrivate bool   `xorm:"NOT NULL DEFAULT false"`
+		ID                  int64 `xorm:"pk autoincr"`
+		KeepActivityPrivate bool  `xorm:"NOT NULL DEFAULT false"`
 	}
 
-	if err := x.Sync2(new(User)); err != nil {
+	sess := x.NewSession()
+	defer sess.Close()
+	if err := sess.Begin(); err != nil {
 		return err
 	}
 
-	if _, err := x.Where(builder.Eq{"keep_activity_private": nil}).
-		Cols("keep_activity_private").
-		Update(&User{KeepActivityPrivate: false}); err != nil {
+	var activityPrivateUsers []int64
+	if err := sess.Select("id").Table("user").Where(builder.Eq{"keep_activity_private": true}).Find(&activityPrivateUsers); err != nil {
 		return err
 	}
 
-	switch x.Dialect().URI().DBType {
-	case schemas.MYSQL:
-		_, err := x.Exec("ALTER TABLE `user` MODIFY COLUMN keep_activity_private tinyint(1) DEFAULT 0 NOT NULL;")
-		return err
-	case schemas.MSSQL:
-		_, err := x.Exec("ALTER TABLE `user` MODIFY COLUMN keep_activity_private BIT DEFAULT 0 NOT NULL;")
-		return err
-	case schemas.POSTGRES:
-		_, err := x.Exec("ALTER TABLE `user` ALTER COLUMN keep_activity_private SET DEFAULT false NOT NULL;")
+	if err := dropTableColumns(sess, "user", "keep_activity_private"); err != nil {
 		return err
 	}
 
-	// handle SQLite
-	sess := x.NewSession()
-	defer sess.Close()
-	if err := sess.Begin(); err != nil {
+	if err := sess.Sync2(new(User)); err != nil {
 		return err
 	}
 
-	if err := recreateTable(sess, new(User)); err != nil {
-		return err
+	for _, uid := range activityPrivateUsers {
+		if _, err := sess.ID(uid).Cols("keep_activity_private").Update(&User{KeepActivityPrivate: true}); err != nil {
+			return err
+		}
 	}
 
 	return sess.Commit()