From 31a0553b8211c3b6d36ff160ea6df08377c2058b Mon Sep 17 00:00:00 2001 From: Jinzhu Date: Sun, 7 Jun 2020 18:27:12 +0800 Subject: [PATCH] Fix FileWithLineNum on windows --- utils/utils.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/utils.go b/utils/utils.go index ce42b218..81d2dc34 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -3,8 +3,8 @@ package utils import ( "database/sql/driver" "fmt" - "path/filepath" "reflect" + "regexp" "runtime" "strconv" "strings" @@ -15,7 +15,7 @@ var gormSourceDir string func init() { _, file, _, _ := runtime.Caller(0) - gormSourceDir = filepath.Dir(filepath.Dir(file)) + gormSourceDir = regexp.MustCompile("utils.utils\\.go").ReplaceAllString(file, "") } func FileWithLineNum() string { @@ -23,7 +23,7 @@ func FileWithLineNum() string { _, file, line, ok := runtime.Caller(i) if ok && (!strings.HasPrefix(file, gormSourceDir) || strings.HasSuffix(file, "_test.go")) { - return fmt.Sprintf("%v:%v", file, line) + return file + ":" + strconv.FormatInt(int64(line), 10) } } return ""