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: add struct field name to fields and edges

Browse Source 
Summary: avoig logic in templates

Reviewed By: alexsn

Differential Revision: D17926168

fbshipit-source-id: d583e800fb4a45cf939e9788cea6d45e126c61fe
This commit is contained in:
Ariel Mashraki
2019-10-15 06:41:29 -07:00
committed by Facebook Github Bot
parent 64ed7580c0
commit 36a3971f3d
13 changed files with 96 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,14 +13,14 @@ func ({{ $receiver }} *{{ $.Name }}) FromRows(rows *sql.Rows) error {
var {{ $scan }} struct {
ID {{ if $.ID.IsString }}int{{ else }}{{ $.ID.Type }}{{ end }}
{{ range $_, $f := $.Fields }}
{{- pascal $f.Name }} {{ $f.NullType }}
{{- $f.StructField }} {{ $f.NullType }}
{{ end }}
}
// the order here should be the same as in the `{{ $.Package }}.Columns`.
if err := rows.Scan(
&{{ $scan }}.ID,
{{- range $_, $f := $.Fields }}
&{{ $scan }}.{{- pascal $f.Name }},
&{{ $scan }}.{{ $f.StructField }},
{{- end }}
); err != nil {
return err
@@ -28,18 +28,18 @@ func ({{ $receiver }} *{{ $.Name }}) FromRows(rows *sql.Rows) error {
{{ $receiver }}.ID = {{ if $.ID.IsString }}strconv.Itoa({{ $scan }}.ID){{ else }}{{ $scan }}.ID{{ end }}
{{- range $_, $f := $.Fields }}
{{- if $f.IsJSON }}
if value := {{ $scan }}.{{ pascal $f.Name }}; len(value) > 0 {
if err := json.Unmarshal(value, &{{ $receiver }}.{{ pascal $f.Name }}); err != nil {
if value := {{ $scan }}.{{ $f.StructField }}; len(value) > 0 {
if err := json.Unmarshal(value, &{{ $receiver }}.{{ $f.StructField }}); err != nil {
return fmt.Errorf("unmarshal field {{ $f.Name }}: %v", err)
}
}
{{- else if $f.Nillable }}
if {{ $scan }}.{{- pascal $f.Name }}.Valid {
{{ $receiver }}.{{ pascal $f.Name }} = new({{ $f.Type }})
*{{ $receiver }}.{{ pascal $f.Name }} = {{ printf "%s.%s" $scan (pascal $f.Name) | $f.NullTypeField }}
if {{ $scan }}.{{ $f.StructField }}.Valid {
{{ $receiver }}.{{ $f.StructField }} = new({{ $f.Type }})
*{{ $receiver }}.{{ $f.StructField }} = {{ printf "%s.%s" $scan $f.StructField | $f.NullTypeField }}
}
{{- else }}
{{ $receiver }}.{{ pascal $f.Name }} = {{ printf "%s.%s" $scan (pascal $f.Name) | $f.NullTypeField }}
{{ $receiver }}.{{ $f.StructField }} = {{ printf "%s.%s" $scan $f.StructField | $f.NullTypeField }}
{{- end }}
{{- end }}
return nil