zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix/issue#1447 (#1458)

Browse Source 
* Add data for template to render

* fix #1447

Co-authored-by: anqiansong <anqiansong@bytedance.com>
This commit is contained in:
anqiansong
2022-01-18 10:36:38 +08:00
committed by GitHub
parent bf2feee5b7
commit e57fa8ff53
12 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/goctl/model/sql/gen/gen.go
View File

@@ -217,17 +217,17 @@ func (g *defaultGenerator) genModel(in parser.Table, withCache bool) (string, er
primaryKey, uniqueKey := genCacheKeys(in)
importsCode, err := genImports(withCache, in.ContainsTime())
if err != nil {
return "", err
}
var table Table
table.Table = in
table.PrimaryCacheKey = primaryKey
table.UniqueCacheKey = uniqueKey
table.ContainsUniqueCacheKey = len(uniqueKey) > 0
importsCode, err := genImports(withCache, in.ContainsTime(), table)
if err != nil {
return "", err
}
varsCode, err := genVars(table, withCache, g.isPostgreSql)
if err != nil {
return "", err
@@ -284,7 +284,7 @@ func (g *defaultGenerator) genModel(in parser.Table, withCache bool) (string, er
cacheExtra: ret.cacheExtra,
}
output, err := g.executeModel(code)
output, err := g.executeModel(table, code)
if err != nil {
return "", err
}
@@ -292,7 +292,7 @@ func (g *defaultGenerator) genModel(in parser.Table, withCache bool) (string, er
return output.String(), nil
}
func (g *defaultGenerator) executeModel(code *code) (*bytes.Buffer, error) {
func (g *defaultGenerator) executeModel(table Table, code *code) (*bytes.Buffer, error) {
text, err := pathx.LoadTemplate(category, modelTemplateFile, template.Model)
if err != nil {
return nil, err
@@ -311,6 +311,7 @@ func (g *defaultGenerator) executeModel(code *code) (*bytes.Buffer, error) {
"update": code.updateCode,
"delete": code.deleteCode,
"extraMethod": code.cacheExtra,
"data": table,
})
if err != nil {
return nil, err