refactor🎨: 添加error判断返回

This commit is contained in:
zhangwenjian
2022-01-22 23:03:01 +08:00
parent 26ee7b7985
commit 24908a8732
2 changed files with 28 additions and 4 deletions
+2
View File
@@ -3,6 +3,8 @@ PROJECT:=go-admin
.PHONY: build
build:
CGO_ENABLED=0 go build -o go-admin main.go
build-linux:
env GOOS=linux GOARCH=amd64 go build
build-sqlite:
go build -tags sqlite3 -o go-admin main.go
#.PHONY: test
+26 -4
View File
@@ -1,6 +1,7 @@
package models
import (
"errors"
"fmt"
"go-admin/common/global"
"gorm.io/gorm"
@@ -12,19 +13,40 @@ import (
func InitDb(db *gorm.DB) (err error) {
filePath := "config/db.sql"
if global.Driver == "postgres" {
err = ExecSql(db, filePath)
if err != nil {
return err
}
filePath = "config/pg.sql"
err = ExecSql(db, filePath)
if err != nil {
return err
}
} else if global.Driver == "mysql" {
filePath = "config/db-begin-mysql.sql"
err = ExecSql(db, filePath)
if err != nil {
return err
}
filePath = "config/db.sql"
err = ExecSql(db, filePath)
if err != nil {
return err
}
filePath = "config/db-end-mysql.sql"
err = ExecSql(db, filePath)
} else {
if err != nil {
return err
}
} else if global.Driver == "sqlite3" {
err = ExecSql(db, filePath)
if err != nil {
return err
}
} else {
return errors.New("database type is not supported")
}
return err
return nil
}
func ExecSql(db *gorm.DB, filePath string) error {
@@ -39,7 +61,7 @@ func ExecSql(db *gorm.DB, filePath string) error {
fmt.Println(sqlList[i])
continue
}
sql := strings.Replace(sqlList[i]+";", "\n", "", 0)
sql := strings.Replace(sqlList[i]+";", "\n", "", -1)
sql = strings.TrimSpace(sql)
if err = db.Exec(sql).Error; err != nil {
log.Printf("error sql: %s", sql)
@@ -60,4 +82,4 @@ func Ioutil(filePath string) (string, error) {
} else {
return "", err
}
}
}