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: wrap nillable fields with custom go-type with sql.nullscanner

Browse Source
This commit is contained in:
Ariel Mashraki
2021-04-17 10:06:10 +03:00
committed by Ariel Mashraki
parent 762e6aeff9
commit 2480b5c0ef
41 changed files with 181 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,15 +9,15 @@ in the LICENSE file in the root directory of this source tree.
{{ define "dialect/sql/decode/one" }}
{{ $receiver := $.Receiver }}
{{ $idnulltype := $.ID.NullType }}{{ if not $.ID.UserDefined }}{{ $idnulltype = "sql.NullInt64" }}{{ end }}
{{ $ctypes := dict $idnulltype (list $.ID.Constant) }}
{{ $idscantype := $.ID.NewScanType }}{{ if not $.ID.UserDefined }}{{ $idscantype = "new(sql.NullInt64)" }}{{ end }}
{{ $ctypes := dict $idscantype (list $.ID.Constant) }}
{{ range $f := $.Fields }}
{{ $names := list }}
{{ if hasKey $ctypes $f.NullType }}
{{ $names = get $ctypes $f.NullType }}
{{ if hasKey $ctypes $f.NewScanType }}
{{ $names = get $ctypes $f.NewScanType }}
{{ end }}
{{ $names = append $names $f.Constant }}
{{ $ctypes = set $ctypes $f.NullType $names }}
{{ $ctypes = set $ctypes $f.NewScanType $names }}
{{ end }}
// scanValues returns the types for scanning values from sql.Rows.
@@ -27,12 +27,12 @@ func (*{{ $.Name }}) scanValues(columns []string) ([]interface{}, error) {
switch columns[i] {
{{- range $type, $columns := $ctypes }}
case {{ range $i, $c := $columns }}{{ if ne $i 0 }},{{ end }}{{ $.Package }}.{{ $c }}{{ end }}:
values[i] = new({{ $type }})
values[i] = {{ $type }}
{{- end }}
{{- range $i, $fk := $.UnexportedForeignKeys }}
{{- $f := $fk.Field }}
case {{ $.Package }}.ForeignKeys[{{ $i }}]: // {{ $f.Name }}
values[i] = new({{ if not $f.UserDefined }}sql.NullInt64{{ else }}{{ $f.NullType }}{{ end }})
values[i] = {{ if not $f.UserDefined }}new(sql.NullInt64){{ else }}{{ $f.NewScanType }}{{ end }}
{{- end }}
default:
return nil, fmt.Errorf("unexpected column %q for type {{ $.Name }}", columns[i])
@@ -94,9 +94,9 @@ func ({{ $receiver }} *{{ $.Name }}) assignValues(columns []string, values []int
{{- $i := $.Scope.Idx -}}
{{- $f := $.Scope.Field -}}
{{- $ret := $.Scope.Rec -}}
{{- $field := $f.StructField }}{{ with $.Scope.StructField }}{{ $field = . }}{{ end }}
{{- if $f.IsJSON }}
if value, ok := values[{{ $i }}].(*{{ $f.NullType }}); !ok {
{{- $field := $f.StructField }}{{ with $.Scope.StructField }}{{ $field = . }}{{ end -}}
{{- if $f.IsJSON -}}
if value, ok := values[{{ $i }}].(*{{ $f.ScanType }}); !ok {
return fmt.Errorf("unexpected type %T for field {{ $f.Name }}", values[{{ $i }}])
} else if value != nil && len(*value) > 0 {
if err := json.Unmarshal(*value, &{{ $ret }}.{{ $field }}); err != nil {
@@ -104,16 +104,16 @@ func ({{ $receiver }} *{{ $.Name }}) assignValues(columns []string, values []int
}
}
{{- else }}
{{- $nulltype := $f.NullType -}}
if value, ok := values[{{ $i }}].(*{{ $nulltype }}); !ok {
{{- $scantype := $f.ScanType -}}
if value, ok := values[{{ $i }}].(*{{ $scantype }}); !ok {
return fmt.Errorf("unexpected type %T for field {{ $f.Name }}", values[{{ $i }}])
{{- if and (not $f.Type.ValueScanner) (hasPrefix $nulltype "sql") }}
{{- if hasPrefix $scantype "sql.Null" }}
} else if value.Valid {
{{- if $f.NillableValue }}
{{ $ret }}.{{ $field }} = new({{ $f.Type }})
*{{ $ret }}.{{ $field }} = {{ $f.NullTypeField "value" }}
*{{ $ret }}.{{ $field }} = {{ $f.ScanTypeField "value" }}
{{- else }}
{{ $ret }}.{{ $field }} = {{ $f.NullTypeField "value" }}
{{ $ret }}.{{ $field }} = {{ $f.ScanTypeField "value" }}
{{- end }}
{{- else }}
} else if value != nil {

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

@@ -280,10 +280,10 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery(ctx context.Context) *sql.Select
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues({{ $.Package }}.{{ $e.PKConstant }}[{{ if $e.IsInverse }}1{{ else }}0{{ end }}], fks...))
},
{{- $out := "sql.NullInt64" }}{{ if $.ID.UserDefined }}{{ $out = $.ID.NullType }}{{ end }}
{{- $in := "sql.NullInt64" }}{{ if $e.Type.ID.UserDefined }}{{ $in = $e.Type.ID.NullType }}{{ end }}
{{- $out := "sql.NullInt64" }}{{ if $.ID.UserDefined }}{{ $out = $.ID.ScanType }}{{ end }}
{{- $in := "sql.NullInt64" }}{{ if $e.Type.ID.UserDefined }}{{ $in = $e.Type.ID.ScanType }}{{ end }}
ScanValues: func() [2]interface{}{
return [2]interface{}{&{{ $out }}{}, &{{ $in }}{}}
return [2]interface{}{new({{ $out }}), new({{ $in }})}
},
Assign: func(out, in interface{}) error {
eout, ok := out.(*{{ $out }})
@@ -294,8 +294,8 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery(ctx context.Context) *sql.Select
if !ok || ein == nil {
return fmt.Errorf("unexpected id value for edge-in")
}
outValue := {{ with extend $ "Arg" "eout" "Field" $.ID "NullType" $out }}{{ template "dialect/sql/query/eagerloading/m2massign" . }}{{ end }}
inValue := {{ with extend $ "Arg" "ein" "Field" $e.Type.ID "NullType" $in }}{{ template "dialect/sql/query/eagerloading/m2massign" . }}{{ end }}
outValue := {{ with extend $ "Arg" "eout" "Field" $.ID "ScanType" $out }}{{ template "dialect/sql/query/eagerloading/m2massign" . }}{{ end }}
inValue := {{ with extend $ "Arg" "ein" "Field" $e.Type.ID "ScanType" $in }}{{ template "dialect/sql/query/eagerloading/m2massign" . }}{{ end }}
node, ok := ids[outValue]
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
@@ -401,9 +401,9 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery(ctx context.Context) *sql.Select
{{ define "dialect/sql/query/eagerloading/m2massign" }}
{{- $arg := $.Scope.Arg }}
{{- $field := $.Scope.Field }}
{{- $nulltype := $.Scope.NullType }}
{{- if hasPrefix $nulltype "sql" -}}
{{ $field.NullTypeField $arg -}}
{{- $scantype := $.Scope.ScanType }}
{{- if hasPrefix $scantype "sql" -}}
{{ $field.ScanTypeField $arg -}}
{{- else -}}
{{ if not $field.Nillable }}*{{ end }}{{ $arg }}
{{- end }}