use recreate since it just WORKS

Author: 6543

models/migrations/v167.go

@@ -12,9 +12,66 @@ import (
 
 func recreateUserTableToFixDefaultValues(x *xorm.Engine) error {
 	type User struct {
-		ID                  int64 `xorm:"pk autoincr"`
-		KeepActivityPrivate bool  `xorm:"NOT NULL DEFAULT false"`
-		TmpCol              bool  `xorm:"NOT NULL DEFAULT false"`
+		ID                           int64  `xorm:"pk autoincr"`
+		LowerName                    string `xorm:"UNIQUE NOT NULL"`
+		Name                         string `xorm:"UNIQUE NOT NULL"`
+		FullName                     string
+		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 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"`
+
+		LastRepoVisibility bool
+		MaxRepoCreation    int `xorm:"NOT NULL DEFAULT -1"`
+
+		// Permissions
+		IsActive                bool `xorm:"INDEX"`
+		IsAdmin                 bool
+		IsRestricted            bool `xorm:"NOT NULL DEFAULT false"`
+		AllowGitHook            bool
+		AllowImportLocal        bool
+		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"`
 	}
 
 	if _, err := x.Where(builder.IsNull{"keep_activity_private"}).
@@ -33,12 +90,6 @@ func recreateUserTableToFixDefaultValues(x *xorm.Engine) error {
 		}
 		_, err := x.Exec("ALTER TABLE `user` ALTER COLUMN keep_activity_private SET DEFAULT false;")
 		return err
-	case schemas.MSSQL:
-		if _, err := x.Exec("ALTER TABLE `user` ADD  DEFAULT 0 FOR keep_activity_private GO;"); err != nil {
-			return err
-		}
-		_, err := x.Exec("ALTER TABLE `user` ALTER COLUMN keep_activity_private bit NOT NULL GO;")
-		return err
 	}
 
 	sess := x.NewSession()
@@ -47,27 +98,7 @@ func recreateUserTableToFixDefaultValues(x *xorm.Engine) error {
 		return err
 	}
 
-	if err := sess.Sync2(new(User)); err != nil {
-		return err
-	}
-
-	if _, err := sess.Exec("UPDATE `user` SET tmp_col=keep_activity_private;"); err != nil {
-		return err
-	}
-
-	if err := dropTableColumns(sess, "user", "keep_activity_private"); err != nil {
-		return err
-	}
-
-	if err := sess.Sync2(new(User)); err != nil {
-		return err
-	}
-
-	if _, err := sess.Exec("UPDATE `user` SET keep_activity_private=tmp_col;"); err != nil {
-		return err
-	}
-
-	if err := dropTableColumns(sess, "user", "tmp_col"); err != nil {
+	if err := recreateTable(sess, new(User)); err != nil {
 		return err
 	}