golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-24 09:31:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

entc/gen: less sophisticated naming logic (#774)

Browse Source 
Closed #772
This commit is contained in:
Ariel Mashraki
2020-09-17 09:19:55 +03:00
committed by GitHub
parent 235973cc2d
commit 17abe2d60f
225 changed files with 5542 additions and 1679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
entc/gen/template/dialect/sql/create.tmpl
View File

@@ -10,7 +10,7 @@ in the LICENSE file in the root directory of this source tree.
{{ $mutation := print $receiver ".mutation" }}
func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) (*{{ $.Name }}, error) {
{{ $.Receiver }}, _spec := {{ $receiver }}.createSpec()
_node, _spec := {{ $receiver }}.createSpec()
if err := sqlgraph.CreateNode(ctx, {{ $receiver }}.driver, _spec); err != nil {
if cerr, ok := isSQLConstraintError(err); ok {
err = cerr
@@ -21,20 +21,20 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) (*{{ $.Name
{{- /* Do nothing, because these 2 types must be supplied by the user. */ -}}
{{- else }}
{{- if $.ID.UserDefined }}
if {{ $.Receiver }}.ID == 0 {
if _node.ID == 0 {
{{- end }}
id := _spec.ID.Value.(int64)
{{ $.Receiver }}.ID = {{ $.ID.Type }}(id)
_node.ID = {{ $.ID.Type }}(id)
{{- if $.ID.UserDefined }}
}
{{- end }}
{{- end }}
return {{ $.Receiver }}, nil
return _node, nil
}
func ({{ $receiver }} *{{ $builder }}) createSpec() (*{{ $.Name }}, *sqlgraph.CreateSpec) {
var (
{{ $.Receiver }} = &{{ $.Name }}{config: {{ $receiver }}.config}
_node = &{{ $.Name }}{config: {{ $receiver }}.config}
_spec = &sqlgraph.CreateSpec{
Table: {{ $.Package }}.Table,
ID: &sqlgraph.FieldSpec{
@@ -45,7 +45,7 @@ func ({{ $receiver }} *{{ $builder }}) createSpec() (*{{ $.Name }}, *sqlgraph.Cr
)
{{- if $.ID.UserDefined }}
if id, ok := {{ $mutation }}.{{ $.ID.MutationGet }}(); ok {
{{ $.Receiver }}.ID = id
_node.ID = id
_spec.ID.Value = id
}
{{- end }}
@@ -56,7 +56,7 @@ func ({{ $receiver }} *{{ $builder }}) createSpec() (*{{ $.Name }}, *sqlgraph.Cr
Value: value,
Column: {{ $.Package }}.{{ $f.Constant }},
})
{{ $.Receiver }}.{{ $f.StructField }} = {{ if $f.Nillable }}&{{ end }}value
_node.{{ $f.StructField }} = {{ if $f.Nillable }}&{{ end }}value
}
{{- end }}
{{- range $e := $.Edges }}
@@ -67,7 +67,7 @@ func ({{ $receiver }} *{{ $builder }}) createSpec() (*{{ $.Name }}, *sqlgraph.Cr
_spec.Edges = append(_spec.Edges, edge)
}
{{- end }}
return {{ $.Receiver }}, _spec
return _node, _spec
}
{{ end }}

2
entc/gen/template/dialect/sql/update.tmpl
View File

@@ -11,7 +11,7 @@ in the LICENSE file in the root directory of this source tree.
{{ $mutation := print $receiver ".mutation" }}
{{ $one := hasSuffix $builder "One" }}
{{- $zero := 0 }}{{ if $one }}{{ $zero = "nil" }}{{ end }}
{{- $ret := "n" }}{{ if $one }}{{ $ret = $.Receiver }}{{ end }}
{{- $ret := "n" }}{{ if $one }}{{ $ret = "_node" }}{{ end }}
func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) ({{ $ret }} {{ if $one }}*{{ $.Name }}{{ else }}int{{ end }}, err error) {
_spec := &sqlgraph.UpdateSpec{