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

Merge pull request #118 from panol/master

Browse Source 
feat:通过使用--table_prefix 给表名加前缀
This commit is contained in:
xxj
2021-03-12 20:22:12 +08:00
committed by GitHub
parent a4c817f648 dc8a862255
commit 6a3e380bf0
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/view/genfunc/def.go Normal file → Executable file
View File

@@ -122,12 +122,12 @@ func {{$obj.StructName}}Mgr(db *gorm.DB) *_{{$obj.StructName}}Mgr {
panic(fmt.Errorf("{{$obj.StructName}}Mgr need init by db")) panic(fmt.Errorf("{{$obj.StructName}}Mgr need init by db"))
} }
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
return &_{{$obj.StructName}}Mgr{_BaseMgr: &_BaseMgr{DB: db.Table("{{$obj.TableName}}"), isRelated: globalIsRelated,ctx:ctx,cancel:cancel,timeout:-1}} return &_{{$obj.StructName}}Mgr{_BaseMgr: &_BaseMgr{DB: db.Table("{{GetTablePrefixName $obj.TableName}}"), isRelated: globalIsRelated,ctx:ctx,cancel:cancel,timeout:-1}}
} }
// GetTableName get sql table name.获取数据库名字 // GetTableName get sql table name.获取数据库名字
func (obj *_{{$obj.StructName}}Mgr) GetTableName() string { func (obj *_{{$obj.StructName}}Mgr) GetTableName() string {
return "{{$obj.TableName}}" return "{{GetTablePrefixName $obj.TableName}}"
} }
// Get 获取 // Get 获取

11
data/view/model/common.go Normal file → Executable file
View File

@@ -47,6 +47,17 @@ func CapLowercase(name string) string { // IDAPIID == > idAPIID
return FilterKeywords(re) return FilterKeywords(re)
} }
// GetTablePrefixName 获取带表前缀名字的tablename
func GetTablePrefixName(name string) string { //
tablePrefix := config.GetTablePrefix()
//如果设置了表前缀
if tablePrefix != "" {
return fmt.Sprintf("%v.%v", tablePrefix, name)
}
return name
}
func FilterKeywords(src string) string { func FilterKeywords(src string) string {
if tools.IsKeywords(src) { if tools.IsKeywords(src) {
return "_" + src return "_" + src

20
data/view/model/model.go Normal file → Executable file
View File

@@ -48,7 +48,7 @@ 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
@@ -56,9 +56,9 @@ func (m *_Model) GetPackage() genstruct.GenPackage {
sct.SetTableName(tab.Name) sct.SetTableName(tab.Name)
//如果设置了表前缀 //如果设置了表前缀
if tablePrefix != "" { // if tablePrefix != "" {
tab.Name = strings.TrimLeft(tab.Name, tablePrefix) // tab.Name = strings.TrimLeft(tab.Name, tablePrefix)
} // }
sct.SetStructName(getCamelName(tab.Name)) // Big hump.大驼峰 sct.SetStructName(getCamelName(tab.Name)) // Big hump.大驼峰
sct.SetNotes(tab.Notes) sct.SetNotes(tab.Notes)
@@ -257,11 +257,11 @@ func (m *_Model) generateFunc() (genOut []GenOutInfo) {
// wxw 2021.2.26 17:17 // wxw 2021.2.26 17:17
var data funDef var data funDef
data.TableName = tab.Name data.TableName = tab.Name
tablePrefix := config.GetTablePrefix() // tablePrefix := config.GetTablePrefix()
//如果设置了表前缀 // //如果设置了表前缀
if tablePrefix != "" { // if tablePrefix != "" {
tab.Name = strings.TrimLeft(tab.Name, tablePrefix) // tab.Name = strings.TrimLeft(tab.Name, tablePrefix)
} // }
data.StructName = getCamelName(tab.Name) data.StructName = getCamelName(tab.Name)
var primary, unique, uniqueIndex, index []FList var primary, unique, uniqueIndex, index []FList
@@ -335,7 +335,7 @@ func (m *_Model) generateFunc() (genOut []GenOutInfo) {
data.Primay = append(data.Primay, uniqueIndex...) data.Primay = append(data.Primay, uniqueIndex...)
data.Index = append(data.Index, index...) data.Index = append(data.Index, index...)
tmpl, err := template.New("gen_logic"). tmpl, err := template.New("gen_logic").
Funcs(template.FuncMap{"GenPreloadList": GenPreloadList, "GenFListIndex": GenFListIndex, "CapLowercase": CapLowercase}). Funcs(template.FuncMap{"GenPreloadList": GenPreloadList, "GenFListIndex": GenFListIndex, "CapLowercase": CapLowercase, "GetTablePrefixName": GetTablePrefixName}).
Parse(genfunc.GetGenLogicTemp()) Parse(genfunc.GetGenLogicTemp())
if err != nil { if err != nil {
panic(err) panic(err)