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: remove FromRows decoding

Browse Source
This commit is contained in:
Ariel Mashraki
2019-12-24 10:29:40 +02:00
parent 99510a458d
commit e5c5aec9b5
26 changed files with 2 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,44 +7,6 @@ in the LICENSE file in the root directory of this source tree.
{{ define "dialect/sql/decode/one" }}
{{ $receiver := $.Receiver }}
// FromRows scans the sql response data into {{ $.Name }}.
func ({{ $receiver }} *{{ $.Name }}) FromRows(rows *sql.Rows) error {
{{- $scan := print "scan" $receiver }}
var {{ $scan }} struct {
ID {{ if $.ID.IsString }}int{{ else }}{{ $.ID.Type }}{{ end }}
{{ range $_, $f := $.Fields }}
{{- $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 }}.{{ $f.StructField }},
{{- end }}
); err != nil {
return err
}
{{ $receiver }}.ID = {{ if $.ID.IsString }}strconv.Itoa({{ $scan }}.ID){{ else }}{{ $scan }}.ID{{ end }}
{{- range $_, $f := $.Fields }}
{{- if $f.IsJSON }}
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 }}.{{ $f.StructField }}.Valid {
{{ $receiver }}.{{ $f.StructField }} = new({{ $f.Type }})
*{{ $receiver }}.{{ $f.StructField }} = {{ printf "%s.%s" $scan $f.StructField | $f.NullTypeField }}
}
{{- else }}
{{ $receiver }}.{{ $f.StructField }} = {{ printf "%s.%s" $scan $f.StructField | $f.NullTypeField }}
{{- end }}
{{- end }}
return nil
}
// scanValues returns the types for scanning values from sql.Rows.
func (*{{ $.Name }}) scanValues() []interface{} {
return []interface{} {
@@ -115,19 +77,4 @@ func ({{ $receiver }} *{{ $.Name }}) assignValues(values ...interface{}) error {
{{- end }}
{{ define "dialect/sql/decode/many" }}
{{ $receiver := $.Receiver }}
{{ $slice := $.Scope.Slice }}
// FromRows scans the sql response data into {{ $slice }}.
func ({{ $receiver }} *{{ $slice }}) FromRows(rows *sql.Rows) error {
for rows.Next() {
{{- $scan := print "scan" $receiver }}
{{ $scan }} := &{{ $.Name }}{}
if err := {{ $scan }}.FromRows(rows); err != nil {
return err
}
*{{ $receiver }} = append(*{{ $receiver }}, {{ $scan }})
}
return nil
}
{{ end }}