修改数据表迁移用法

This commit is contained in:
linwenxiang
2020-09-12 00:15:23 +08:00
parent 317d417824
commit 3a6a06f52a
3 changed files with 33 additions and 34 deletions
+2 -1
View File
@@ -3,9 +3,11 @@ package models
import ( import (
orm "go-admin/common/global" orm "go-admin/common/global"
"go-admin/tools" "go-admin/tools"
"gorm.io/gorm"
) )
type SysFileDir struct { type SysFileDir struct {
gorm.Model
Id int `json:"id" gorm:"type:int(11);primary_key;AUTO_INCREMENT"` // Id int `json:"id" gorm:"type:int(11);primary_key;AUTO_INCREMENT"` //
Label string `json:"label" gorm:"type:varchar(255);"` // 名称 Label string `json:"label" gorm:"type:varchar(255);"` // 名称
PId int `json:"pId" gorm:"type:int(11);"` // 父id PId int `json:"pId" gorm:"type:int(11);"` // 父id
@@ -16,7 +18,6 @@ type SysFileDir struct {
Children []SysFileDir `json:"children" gorm:"-"` Children []SysFileDir `json:"children" gorm:"-"`
DataScope string `json:"dataScope" gorm:"-"` DataScope string `json:"dataScope" gorm:"-"`
Params string `json:"params" gorm:"-"` Params string `json:"params" gorm:"-"`
BaseModel
} }
func (SysFileDir) TableName() string { func (SysFileDir) TableName() string {
+2 -2
View File
@@ -41,7 +41,7 @@ func (e *Migration) Migrate() {
var err error var err error
var count int64 var count int64
for _, v := range versions { for _, v := range versions {
err = e.db.Table("sys_migration").Where("version = ?", v).Count(&count).Error err = e.db.Debug().Table("sys_migration").Where("version = ?", v).Count(&count).Error
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@@ -50,7 +50,7 @@ func (e *Migration) Migrate() {
count = 0 count = 0
continue continue
} }
err = (e.version[v])(e.db, v) err = (e.version[v])(e.db.Debug(), v)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@@ -18,35 +18,33 @@ func init() {
} }
func _1599190683659Tables(db *gorm.DB, version string) error { func _1599190683659Tables(db *gorm.DB, version string) error {
return db.Transaction(func(tx *gorm.DB) error { err := db.Migrator().AutoMigrate(
// new(models.CasbinRule),
err := tx.Migrator().AutoMigrate( new(models.SysDept),
new(models.CasbinRule), new(models.SysConfig),
new(models.SysDept), new(tools.SysTables),
new(models.SysConfig), new(tools.SysColumns),
new(tools.SysTables), new(models.Menu),
new(tools.SysColumns), new(models.LoginLog),
new(models.Menu), new(models.SysOperLog),
new(models.LoginLog), new(models.RoleMenu),
new(models.SysOperLog), new(models.SysRoleDept),
new(models.RoleMenu), new(models.SysUser),
new(models.SysRoleDept), new(models.SysRole),
new(models.SysUser), new(models.Post),
new(models.SysRole), new(models.DictData),
new(models.Post), new(models.DictType),
new(models.DictData), new(models.SysJob),
new(models.DictType), new(models.SysConfig),
new(models.SysJob), new(models.SysSetting),
new(models.SysConfig), new(models.SysFileDir),
new(models.SysSetting), new(models.SysCategory),
new(models.SysFileDir), new(models.SysContent),
new(models.SysCategory), )
new(models.SysContent)) if err != nil {
if err != nil { return err
return err }
} return db.Create(&common.Migration{
return tx.Create(&common.Migration{ Version: version,
Version: version, }).Error
}).Error
})
} }