Skip to content

Commit

Permalink
add customized.tpl for model template (#4086)
Browse files Browse the repository at this point in the history
Co-authored-by: sudaoxyz <sudaoxyz@gmail.com>
  • Loading branch information
suyhuai and sudaoxyz authored Apr 18, 2024
1 parent 1540bdc commit e1f15ef
Show file tree
Hide file tree
Showing 5 changed files with 144 additions and 20 deletions.
108 changes: 108 additions & 0 deletions tools/goctl/model/sql/gen/customized.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
package gen

import (
"fmt"
"sort"
"strings"

"github.com/zeromicro/go-zero/core/collection"
"github.com/zeromicro/go-zero/tools/goctl/model/sql/template"
"github.com/zeromicro/go-zero/tools/goctl/util"
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
"github.com/zeromicro/go-zero/tools/goctl/util/stringx"
)

// Field describes a table field
type Field struct {
NameOriginal string
UpperName string
LowerName string
DataType string
Comment string
SeqInIndex int
OrdinalPosition int
}

func genCustomized(table Table, withCache, postgreSql bool) (string, error) {
expressions := make([]string, 0)
expressionValues := make([]string, 0)
fields := make([]Field, 0)
var count int
for _, field := range table.Fields {
camel := util.SafeString(field.Name.ToCamel())
if table.isIgnoreColumns(field.Name.Source()) {
continue
}

if field.Name.Source() == table.PrimaryKey.Name.Source() {
if table.PrimaryKey.AutoIncrement {
continue
}
}

count += 1
if postgreSql {
expressions = append(expressions, fmt.Sprintf("$%d", count))
} else {
expressions = append(expressions, "?")
}
expressionValues = append(expressionValues, "data."+camel)

f := Field{
NameOriginal: field.NameOriginal,
UpperName: camel,
LowerName: stringx.From(camel).Untitle(),
DataType: field.DataType,
Comment: field.Comment,
SeqInIndex: field.SeqInIndex,
OrdinalPosition: field.OrdinalPosition,
}
fields = append(fields, f)
}

keySet := collection.NewSet()
keyVariableSet := collection.NewSet()
keySet.AddStr(table.PrimaryCacheKey.KeyExpression)
keyVariableSet.AddStr(table.PrimaryCacheKey.KeyLeft)
for _, key := range table.UniqueCacheKey {
keySet.AddStr(key.DataKeyExpression)
keyVariableSet.AddStr(key.KeyLeft)
}
keys := keySet.KeysStr()
sort.Strings(keys)
keyVars := keyVariableSet.KeysStr()
sort.Strings(keyVars)

camel := table.Name.ToCamel()
text, err := pathx.LoadTemplate(category, customizedTemplateFile, template.Customized)
if err != nil {
return "", err
}

output, err := util.With("customized").
Parse(text).
Execute(map[string]any{
"withCache": withCache,
"containsIndexCache": table.ContainsUniqueCacheKey,
"upperStartCamelObject": camel,
"lowerStartCamelObject": stringx.From(camel).Untitle(),
"lowerStartCamelPrimaryKey": util.EscapeGolangKeyword(stringx.From(table.PrimaryKey.Name.ToCamel()).Untitle()),
"upperStartCamelPrimaryKey": table.PrimaryKey.Name.ToCamel(),
"primaryKeyDataType": table.PrimaryKey.DataType,
"originalPrimaryKey": wrapWithRawString(table.PrimaryKey.Name.Source(), postgreSql),
"primaryCacheKey": table.PrimaryCacheKey.DataKeyExpression,
"primaryKeyVariable": table.PrimaryCacheKey.KeyLeft,
"keys": strings.Join(keys, "\n"),
"keyValues": strings.Join(keyVars, ", "),
"expression": strings.Join(expressions, ", "),
"expressionValues": strings.Join(expressionValues, ", "),
"postgreSql": postgreSql,
"fields": fields,
"data": table,
})
if err != nil {
return "", err
}

return output.String(), nil
}
48 changes: 28 additions & 20 deletions tools/goctl/model/sql/gen/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,17 @@ type (
Option func(generator *defaultGenerator)

code struct {
importsCode string
varsCode string
typesCode string
newCode string
insertCode string
findCode []string
updateCode string
deleteCode string
cacheExtra string
tableName string
importsCode string
varsCode string
typesCode string
newCode string
insertCode string
findCode []string
updateCode string
deleteCode string
cacheExtra string
tableName string
customizedCode string
}

codeTuple struct {
Expand Down Expand Up @@ -323,17 +324,23 @@ func (g *defaultGenerator) genModel(in parser.Table, withCache bool) (string, er
return "", err
}

customizedCode, err := genCustomized(table, withCache, g.isPostgreSql)
if err != nil {
return "", err
}

code := &code{
importsCode: importsCode,
varsCode: varsCode,
typesCode: typesCode,
newCode: newCode,
insertCode: insertCode,
findCode: findCode,
updateCode: updateCode,
deleteCode: deleteCode,
cacheExtra: ret.cacheExtra,
tableName: tableName,
importsCode: importsCode,
varsCode: varsCode,
typesCode: typesCode,
newCode: newCode,
insertCode: insertCode,
findCode: findCode,
updateCode: updateCode,
deleteCode: deleteCode,
cacheExtra: ret.cacheExtra,
tableName: tableName,
customizedCode: customizedCode,
}

output, err := g.executeModel(table, code)
Expand Down Expand Up @@ -387,6 +394,7 @@ func (g *defaultGenerator) executeModel(table Table, code *code) (*bytes.Buffer,
"extraMethod": code.cacheExtra,
"tableName": code.tableName,
"data": table,
"customized": code.customizedCode,
})
if err != nil {
return nil, err
Expand Down
2 changes: 2 additions & 0 deletions tools/goctl/model/sql/gen/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

const (
category = "model"
customizedTemplateFile = "customized.tpl"
deleteTemplateFile = "delete.tpl"
deleteMethodTemplateFile = "interface-delete.tpl"
fieldTemplateFile = "field.tpl"
Expand All @@ -34,6 +35,7 @@ const (
)

var templates = map[string]string{
customizedTemplateFile: template.Customized,
deleteTemplateFile: template.Delete,
deleteMethodTemplateFile: template.DeleteMethod,
fieldTemplateFile: template.Field,
Expand Down
6 changes: 6 additions & 0 deletions tools/goctl/model/sql/template/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import (
"github.com/zeromicro/go-zero/tools/goctl/util"
)

// Customized defines a template for customized in model
//
//go:embed tpl/customized.tpl
var Customized string

// Vars defines a template for var block in model
//
//go:embed tpl/var.tpl
Expand Down Expand Up @@ -51,6 +56,7 @@ package {{.pkg}}
{{.update}}
{{.extraMethod}}
{{.tableName}}
{{.customized}}
`, util.DoNotEditHead)

// Insert defines a template for insert code in model
Expand Down
Empty file.

0 comments on commit e1f15ef

Please sign in to comment.