Skip to content

Commit 87d4704

Browse files
authored
Chore/template model (#439)
* chore(jzero): gen remove model-new-original * chore(jzero): update model template
1 parent 250342f commit 87d4704

4 files changed

Lines changed: 2 additions & 54 deletions

File tree

cmd/jzero/.template/go-zero/model/find-one-by-field.tpl

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,33 +28,6 @@ func (m *default{{.upperStartCamelObject}}Model) FindOneBy{{.upperField}}(ctx co
2828
return nil, err
2929
}
3030
}
31-
32-
{{if .withCacheEnabled}}
33-
func (m *default{{.upperStartCamelObject}}Model) FindOneNoCacheBy{{.upperField}}(ctx context.Context, session sqlx.Session, {{.in}}) (*{{.upperStartCamelObject}}, error) {
34-
var resp {{.upperStartCamelObject}}
35-
var err error
36-
37-
sb := sqlbuilder.Select({{.lowerStartCamelObject}}Rows).From(m.table)
38-
condition.SelectByWhereRawSql(sb, "{{.originalField}}", {{.lowerStartCamelField}})
39-
sb.Limit(1)
40-
41-
sql, args := sb.BuildWithFlavor(m.flavor)
42-
43-
if session != nil {
44-
err = session.QueryRowCtx(ctx, &resp, sql, args...)
45-
} else {
46-
err = m.conn.QueryRowCtx(ctx, &resp, sql, args...)
47-
}
48-
49-
switch err {
50-
case nil:
51-
return &resp, nil
52-
case sqlx.ErrNotFound:
53-
return nil, ErrNotFound
54-
default:
55-
return nil, err
56-
}
57-
}{{end}}
5831
{{else}}
5932
func (m *default{{.upperStartCamelObject}}Model) FindOneBy{{.upperField}}(ctx context.Context, session sqlx.Session, {{.in}}) (*{{.upperStartCamelObject}}, error) {
6033
var resp {{.upperStartCamelObject}}

cmd/jzero/.template/go-zero/model/find-one.tpl

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,6 @@ func (m *default{{.upperStartCamelObject}}Model) FindOne(ctx context.Context, se
2020
return nil, err
2121
}
2222
}
23-
24-
{{if .withCacheEnabled}}
25-
func (m *default{{.upperStartCamelObject}}Model) FindOneNoCache(ctx context.Context, session sqlx.Session, {{.lowerStartCamelPrimaryKey}} {{.dataType}}) (*{{.upperStartCamelObject}}, error) {
26-
sb := sqlbuilder.Select({{.lowerStartCamelObject}}Rows).From(m.table)
27-
sb.Where(sb.EQ(condition.QuoteWithFlavor(m.flavor, "{{.originalPrimaryKey}}"), {{.lowerStartCamelPrimaryKey}}))
28-
sb.Limit(1)
29-
sql, args := sb.BuildWithFlavor(m.flavor)
30-
var resp {{.upperStartCamelObject}}
31-
var err error
32-
if session != nil {
33-
err = session.QueryRowCtx(ctx, &resp, sql, args...)
34-
} else {
35-
err = m.conn.QueryRowCtx(ctx, &resp, sql, args...)
36-
}
37-
switch err {
38-
case nil:
39-
return &resp, nil
40-
case sqlx.ErrNotFound:
41-
return nil, ErrNotFound
42-
default:
43-
return nil, err
44-
}
45-
}{{end}}
4623
{{else}}
4724
func (m *default{{.upperStartCamelObject}}Model) FindOne(ctx context.Context, session sqlx.Session, {{.lowerStartCamelPrimaryKey}} {{.dataType}}) (*{{.upperStartCamelObject}}, error) {
4825
sb := sqlbuilder.Select({{.lowerStartCamelObject}}Rows).From(m.table)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
FindOneBy{{.upperField}}(ctx context.Context, session sqlx.Session, {{.in}}) (*{{.upperStartCamelObject}}, error){{if .withCache}}
2-
FindOneNoCacheBy{{.upperField}}(ctx context.Context, session sqlx.Session, {{.in}}) (*{{.upperStartCamelObject}}, error){{end}}
1+
FindOneBy{{.upperField}}(ctx context.Context, session sqlx.Session, {{.in}}) (*{{.upperStartCamelObject}}, error)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
FindOne(ctx context.Context, session sqlx.Session, {{.lowerStartCamelPrimaryKey}} {{.dataType}}) (*{{.upperStartCamelObject}}, error){{ if .withCache }}
2-
FindOneNoCache(ctx context.Context, session sqlx.Session, {{.lowerStartCamelPrimaryKey}} {{.dataType}}) (*{{.upperStartCamelObject}}, error){{end}}
1+
FindOne(ctx context.Context, session sqlx.Session, {{.lowerStartCamelPrimaryKey}} {{.dataType}}) (*{{.upperStartCamelObject}}, error)

0 commit comments

Comments
 (0)