re
/
gorm
forked from mirror/gorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug in windows (#5844) 

* fix bug in windows

* fix file name bug

* test in unix like platform
This commit is contained in:
kvii 2022-11-21 10:48:13 +08:00 committed by GitHub
parent cef3de694d
commit b6836c2d3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/utils.go
View File

@ -27,7 +27,7 @@ func sourceDir(file string) string {
if filepath.Base(s) != "gorm.io" {
s = dir
}
return s + string(filepath.Separator)
return filepath.ToSlash(s) + "/"
}
// FileWithLineNum return the file name and line number of the current file

7
utils/utils_unix_test.go
View File

@ -1,6 +1,11 @@
//go:build unix
// +build unix
package utils
import "testing"
import (
"testing"
)
func TestSourceDir(t *testing.T) {
cases := []struct {

20
utils/utils_windows_test.go
View File

@ -1,6 +1,8 @@
package utils
import "testing"
import (
"testing"
)
func TestSourceDir(t *testing.T) {
cases := []struct {
@ -8,20 +10,20 @@ func TestSourceDir(t *testing.T) {
want string
}{
{
file: `C:\Users\name\go\pkg\mod\gorm.io\gorm@v1.20.8\utils\utils.go`,
want: `C:\Users\name\go\pkg\mod\gorm.io`,
file: `C:/Users/name/go/pkg/mod/gorm.io/gorm@v1.2.3/utils/utils.go`,
want: `C:/Users/name/go/pkg/mod/gorm.io/`,
},
{
file: `C:\go\work\proj\gorm\utils\utils.go`,
want: `C:\go\work\proj\gorm`,
file: `C:/go/work/proj/gorm/utils/utils.go`,
want: `C:/go/work/proj/gorm/`,
},
{
file: `C:\go\work\proj\gorm_alias\utils\utils.go`,
want: `C:\go\work\proj\gorm_alias`,
file: `C:/go/work/proj/gorm_alias/utils/utils.go`,
want: `C:/go/work/proj/gorm_alias/`,
},
{
file: `C:\go\work\proj\my.gorm.io\gorm\utils\utils.go`,
want: `C:\go\work\proj\my.gorm.io\gorm`,
file: `C:/go/work/proj/my.gorm.io/gorm@v1.2.3/utils/utils.go`,
want: `C:/go/work/proj/my.gorm.io/gorm@v1.2.3/`,
},
}
for _, c := range cases {