jager/gormt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #142 from gh73962/master

Browse Source 
修复表前缀的灵活性,修复windows下包名获取异常
This commit is contained in:
xxj
2021-05-31 17:57:33 +08:00
committed by GitHub
parent add7017224 ae72f8d9a3
commit 26254de0d8
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/view/model/common.go
View File

@@ -52,7 +52,7 @@ func GetTablePrefixName(name string) string { //
tablePrefix := config.GetTablePrefix() tablePrefix := config.GetTablePrefix()
//如果设置了表前缀 //如果设置了表前缀
if tablePrefix != "" { if tablePrefix != "" {
return fmt.Sprintf("%v.%v", tablePrefix, name) name = tablePrefix + name
} }
return name return name

4
data/view/model/gencnf/gencnf.go
View File

@@ -98,7 +98,9 @@ func (m *cnfModel) GetPkgName() string {
} }
if len(pkgName) == 0 || pkgName == "." { if len(pkgName) == 0 || pkgName == "." {
list = strings.Split(tools.GetModelPath(), "/") curDir := tools.GetModelPath()
curDir = strings.Replace(curDir, "\\", "/", -1)
list = strings.Split(curDir, "/")
if len(list) > 0 { if len(list) > 0 {
pkgName = list[len(list)-1] pkgName = list[len(list)-1]
} }

4
data/view/model/model.go
View File

@@ -57,12 +57,12 @@ func (m *_Model) GetPackage() genstruct.GenPackage {
var pkg genstruct.GenPackage var pkg genstruct.GenPackage
pkg.SetPackage(m.info.PackageName) //package name pkg.SetPackage(m.info.PackageName) //package name
// tablePrefix := config.GetTablePrefix() tablePrefix := config.GetTablePrefix()
for _, tab := range m.info.TabList { for _, tab := range m.info.TabList {
var sct genstruct.GenStruct var sct genstruct.GenStruct
sct.SetTableName(tab.Name) sct.SetTableName(tablePrefix + tab.Name)
//如果设置了表前缀 //如果设置了表前缀
// if tablePrefix != "" { // if tablePrefix != "" {