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

Revert "🐞 fix(gen): pg gen of insert (#1591)" (#1598)

Browse Source 
This reverts commit cc4c4928e0.
This commit is contained in:
Kevin Wan
2022-03-01 20:27:59 +08:00
committed by GitHub
parent 168740b64d
commit e31128650e
5 changed files with 12 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,7 +223,7 @@ func (g *defaultGenerator) genModel(in parser.Table, withCache bool) (string, er
table.UniqueCacheKey = uniqueKey
table.ContainsUniqueCacheKey = len(uniqueKey) > 0
importsCode, err := genImports(withCache, in.ContainsTime(), table, g.isPostgreSql)
importsCode, err := genImports(withCache, in.ContainsTime(), table)
if err != nil {
return "", err
}

18
tools/goctl/model/sql/gen/imports.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
)
func genImports(withCache, timeImport bool, table Table, postgreSql bool) (string, error) {
func genImports(withCache, timeImport bool, table Table) (string, error) {
if withCache {
text, err := pathx.LoadTemplate(category, importsTemplateFile, template.Imports)
if err != nil {
@@ -23,18 +23,10 @@ func genImports(withCache, timeImport bool, table Table, postgreSql bool) (strin
return buffer.String(), nil
}
var text string
var err error
if postgreSql {
text, err = pathx.LoadTemplate(category, importsWithNoCacheTemplateFile, template.ImportsNoCachePg)
if err != nil {
return "", err
}
} else {
text, err = pathx.LoadTemplate(category, importsWithNoCacheTemplateFile, template.ImportsNoCache)
if err != nil {
return "", err
}
text, err := pathx.LoadTemplate(category, importsWithNoCacheTemplateFile, template.ImportsNoCache)
if err != nil {
return "", err
}
buffer, err := util.With("import").Parse(text).Execute(map[string]interface{}{

30
tools/goctl/model/sql/gen/insert.go
View File

@@ -46,19 +46,9 @@ func genInsert(table Table, withCache, postgreSql bool) (string, string, error)
}
camel := table.Name.ToCamel()
var text string
var err error
// if database is postgresql
if postgreSql {
text, err = pathx.LoadTemplate(category, insertTemplateFile, template.InsertPg)
if err != nil {
return "", "", err
}
} else {
text, err = pathx.LoadTemplate(category, insertTemplateFile, template.Insert)
if err != nil {
return "", "", err
}
text, err := pathx.LoadTemplate(category, insertTemplateFile, template.Insert)
if err != nil {
return "", "", err
}
output, err := util.With("insert").
@@ -79,17 +69,9 @@ func genInsert(table Table, withCache, postgreSql bool) (string, string, error)
}
// interface method
// if database is postgresql
if postgreSql {
text, err = pathx.LoadTemplate(category, insertTemplateMethodFile, template.InsertMethodPg)
if err != nil {
return "", "", err
}
} else {
text, err = pathx.LoadTemplate(category, insertTemplateMethodFile, template.InsertMethod)
if err != nil {
return "", "", err
}
text, err = pathx.LoadTemplate(category, insertTemplateMethodFile, template.InsertMethod)
if err != nil {
return "", "", err
}
insertMethodOutput, err := util.With("insertMethod").Parse(text).Execute(map[string]interface{}{