From 24908a8732afe3ded0d6ad5d4251ab98682673e3 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sat, 22 Jan 2022 23:03:01 +0800 Subject: [PATCH] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E6=B7=BB=E5=8A=A0error?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 ++ cmd/migrate/migration/models/initdb.go | 30 ++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9529012..24509c9 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/cmd/migrate/migration/models/initdb.go b/cmd/migrate/migration/models/initdb.go index 5a37ec5..08fbfa5 100644 --- a/cmd/migrate/migration/models/initdb.go +++ b/cmd/migrate/migration/models/initdb.go @@ -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 } -} \ No newline at end of file +}