From 170c3be87d1b4451ea045f382880d46d0e093063 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 15 Nov 2021 10:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8C=BA=E5=88=86=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/custom_migrations.go | 13 +++++++++++++
 models/models.go            |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/models/custom_migrations.go b/models/custom_migrations.go
index b196c5a8b..0b9a0d552 100644
--- a/models/custom_migrations.go
+++ b/models/custom_migrations.go
@@ -14,6 +14,8 @@ var customMigrations = []CustomMigration{
 	{"Custom v1 Topic struct change to support chinese", syncTopicStruct},
 }
 
+var customMigrationsStatic = []CustomMigration{}
+
 func MigrateCustom(x *xorm.Engine) {
 
 	for _, m := range customMigrations {
@@ -27,6 +29,17 @@ func MigrateCustom(x *xorm.Engine) {
 
 }
 
+func MigrateCustomStatic(x *xorm.Engine) {
+	for _, m := range customMigrationsStatic {
+		log.Info("Migration: %s", m.Description)
+		if err := m.Migrate(x); err != nil {
+
+			log.Error("Migration: %v", err)
+
+		}
+	}
+}
+
 func syncTopicStruct(x *xorm.Engine) error {
 
 	query := "ALTER TABLE topic ALTER COLUMN name TYPE varchar(105);"
diff --git a/models/models.go b/models/models.go
index 696d0949b..ad027cd24 100755
--- a/models/models.go
+++ b/models/models.go
@@ -190,7 +190,7 @@ func setEngine(engine *xorm.Engine, table []interface{}, database *setting.DBInf
 	engine.SetMaxIdleConns(setting.Database.MaxIdleConns)
 	engine.SetConnMaxLifetime(setting.Database.ConnMaxLifetime)
 	engine.Sync2(table...)
-	MigrateCustom(engine)
+
 	return nil
 }
 
@@ -202,6 +202,7 @@ func SetEngine() (err error) {
 	if err = setEngine(x, tables, setting.Database); err != nil {
 		return err
 	}
+	MigrateCustom(x)
 
 	xStatistic, err = getEngine(setting.DatabaseStatistic)
 	if err != nil {
@@ -210,7 +211,7 @@ func SetEngine() (err error) {
 	if err = setEngine(xStatistic, tablesStatistic, setting.DatabaseStatistic); err != nil {
 		return err
 	}
-
+	MigrateCustomStatic(xStatistic)
 	return nil
 }