Merge pull request #634 from defool/bugfix/throw_error_on_migrate

Throw error if migrate failed
This commit is contained in:
wenjianzhang authored and GitHub committed 2022-06-05 10:33:08 +08:00
commit 1cd31079d7
2 files changed
+11 -6

No files matched your search

+8 -3
View File
@@ -3,10 +3,11 @@ package models
import ( import (
"fmt" "fmt"
"go-admin/common/global" "go-admin/common/global"
"gorm.io/gorm"
"io/ioutil" "io/ioutil"
"log" "log"
"strings" "strings"
"gorm.io/gorm"
) )
func InitDb(db *gorm.DB) (err error) { func InitDb(db *gorm.DB) (err error) {
@@ -16,9 +17,13 @@ func InitDb(db *gorm.DB) (err error) {
err = ExecSql(db, filePath) err = ExecSql(db, filePath)
} else if global.Driver == "mysql" { } else if global.Driver == "mysql" {
filePath = "config/db-begin-mysql.sql" filePath = "config/db-begin-mysql.sql"
err = ExecSql(db, filePath) if err = ExecSql(db, filePath); err != nil {
return err
}
filePath = "config/db.sql" filePath = "config/db.sql"
err = ExecSql(db, filePath) if err = ExecSql(db, filePath); err != nil {
return err
}
filePath = "config/db-end-mysql.sql" filePath = "config/db-end-mysql.sql"
err = ExecSql(db, filePath) err = ExecSql(db, filePath)
} else { } else {
@@ -3,11 +3,11 @@ package version
import ( import (
"runtime" "runtime"
"gorm.io/gorm"
"go-admin/cmd/migrate/migration" "go-admin/cmd/migrate/migration"
"go-admin/cmd/migrate/migration/models" "go-admin/cmd/migrate/migration/models"
common "go-admin/common/models" common "go-admin/common/models"
"gorm.io/gorm"
) )
func init() { func init() {
@@ -41,7 +41,7 @@ func _1599190683659Tables(db *gorm.DB, version string) error {
return err return err
} }
if err := models.InitDb(tx); err != nil { if err := models.InitDb(tx); err != nil {
return err
} }
return tx.Create(&common.Migration{ return tx.Create(&common.Migration{
Version: version, Version: version,