一些小修复 (#1085)

* chore: 去掉初始化中误加的额外表

* chore: 修复初始化不应使用的GVA_DB
This commit is contained in:
pnck
2022-05-26 14:45:20 +08:00
committed by GitHub
parent 98dc95d105
commit 95fd9f92cd
4 changed files with 19 additions and 18 deletions

View File

@@ -67,14 +67,18 @@ func (a *initMenuViewPg) MigrateTable(ctx context.Context) (context.Context, err
sql = strings.ReplaceAll(sql, "@table_name", sysModel.SysMenu{}.TableName())
sql = strings.ReplaceAll(sql, "@menus", sysModel.SysBaseMenu{}.TableName())
sql = strings.ReplaceAll(sql, "@authorities_menus", joinTableName)
if err := global.GVA_DB.Exec(sql).Error; err != nil {
if err := db.Exec(sql).Error; err != nil {
return ctx, errors.Wrap(err, sysModel.SysMenu{}.TableName()+"视图创建失败!")
}
return ctx, nil
}
func (a *initMenuViewPg) TableCreated(ctx context.Context) bool {
err1 := global.GVA_DB.Find(&[]sysModel.SysMenu{}).Error
db, ok := ctx.Value("db").(*gorm.DB)
if !ok {
return false
}
err1 := db.Find(&[]sysModel.SysMenu{}).Error
err2 := errors.New(fmt.Sprintf("Error 1146: Table '%v.%v' doesn't exist",
global.GVA_CONFIG.Pgsql.Dbname, sysModel.SysMenu{}.TableName()))
if errors.As(err1, &err2) {