Browse Source

Merge pull request '修改bug,调用升级脚本函数的位置错误' (#807) from fix-674 into V20211115

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/807
Reviewed-by: zouap <zouap@pcl.ac.cn>
pull/817/head
zouap 3 years ago
parent
commit
1a590823db
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      models/models.go

+ 3
- 3
models/models.go View File

@@ -202,7 +202,6 @@ 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 {
@@ -211,7 +210,7 @@ func SetEngine() (err error) {
if err = setEngine(xStatistic, tablesStatistic, setting.DatabaseStatistic); err != nil {
return err
}
MigrateCustomStatic(xStatistic)
return nil
}

@@ -223,7 +222,7 @@ func NewEngine(ctx context.Context, migrateFunc func(*xorm.Engine) error) (err e
if err = newEngine(ctx, migrateFunc, x, tables, setting.Database); err != nil {
return fmt.Errorf("newEngine failed: %v", err)
}
MigrateCustom(x)
xStatistic, err = getEngine(setting.DatabaseStatistic)
if err != nil {
return fmt.Errorf("Failed to connect to database: %v", err)
@@ -231,6 +230,7 @@ func NewEngine(ctx context.Context, migrateFunc func(*xorm.Engine) error) (err e
if err = newEngine(ctx, migrateFunc, xStatistic, tablesStatistic, setting.DatabaseStatistic); err != nil {
return fmt.Errorf("newEngine statistic failed: %v", err)
}
MigrateCustomStatic(xStatistic)

HasEngine = true



Loading…
Cancel
Save