public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 18:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/wenjianzhang/go-admin into dev

Browse Source
This commit is contained in:
zhangwenjian
2020-09-12 01:08:35 +08:00
parent 2d15f91f2e 3a6a06f52a
commit b8f8bfd400
5 changed files with 36 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/migrate/migration/init.go
+2 -2
View File
@@ -41,7 +41,7 @@ func (e *Migration) Migrate() {
var err error
var count int64
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 {
log.Fatalln(err)
}
@@ -50,7 +50,7 @@ func (e *Migration) Migrate() {
count = 0
continue
}
err = (e.version[v])(e.db, v)
err = (e.version[v])(e.db.Debug(), v)
if err != nil {
log.Fatalln(err)
}
cmd/migrate/migration/version/1599190683659_tables.go
+29 -31
View File
@@ -18,35 +18,33 @@ func init() {
}
func _1599190683659Tables(db *gorm.DB, version string) error {
return db.Transaction(func(tx *gorm.DB) error {
//
err := tx.Migrator().AutoMigrate(
new(models.CasbinRule),
new(models.SysDept),
new(models.SysConfig),
new(tools.SysTables),
new(tools.SysColumns),
new(models.Menu),
new(models.LoginLog),
new(models.SysOperLog),
new(models.RoleMenu),
new(models.SysRoleDept),
new(models.SysUser),
new(models.SysRole),
new(models.Post),
new(models.DictData),
new(models.DictType),
new(models.SysJob),
new(models.SysConfig),
new(models.SysSetting),
new(models.SysFileDir),
new(models.SysCategory),
new(models.SysContent))
if err != nil {
return err
}
return tx.Create(&common.Migration{
Version: version,
}).Error
})
err := db.Migrator().AutoMigrate(
new(models.CasbinRule),
new(models.SysDept),
new(models.SysConfig),
new(tools.SysTables),
new(tools.SysColumns),
new(models.Menu),
new(models.LoginLog),
new(models.SysOperLog),
new(models.RoleMenu),
new(models.SysRoleDept),
new(models.SysUser),
new(models.SysRole),
new(models.Post),
new(models.DictData),
new(models.DictType),
new(models.SysJob),
new(models.SysConfig),
new(models.SysSetting),
new(models.SysFileDir),
new(models.SysCategory),
new(models.SysContent),
)
if err != nil {
return err
}
return db.Create(&common.Migration{
Version: version,
}).Error
}