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: allow selecting specific fields (#1075)

Browse Source
This commit is contained in:
Ariel Mashraki
2020-12-23 17:35:39 +02:00
committed by GitHub
parent 0902673b40
commit da34571560
204 changed files with 3453 additions and 2891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,74 +7,84 @@ in the LICENSE file in the root directory of this source tree.
{{ define "dialect/sql/decode/one" }}
{{ $receiver := $.Receiver }}
// scanValues returns the types for scanning values from sql.Rows.
func (*{{ $.Name }}) scanValues() []interface{} {
return []interface{} {
&{{ if not $.ID.UserDefined }}sql.NullInt64{{ else }}{{ $.ID.NullType }}{{ end }}{}, // {{ $.ID.Name }}
{{- range $_, $f := $.Fields }}
&{{ $f.NullType }}{}, // {{ $f.Name }}
{{- end }}
}
}
{{ $idnulltype := $.ID.NullType }}{{ if not $.ID.UserDefined }}{{ $idnulltype = "sql.NullInt64" }}{{ end }}
{{ $ctypes := dict $idnulltype (list $.ID.Constant) }}
{{ range $f := $.Fields }}
{{ $names := list }}
{{ if hasKey $ctypes $f.NullType }}
{{ $names = get $ctypes $f.NullType }}
{{ end }}
{{ $names = append $names $f.Constant }}
{{ $ctypes = set $ctypes $f.NullType $names }}
{{ end }}
{{- with $.ForeignKeys }}
// fkValues returns the types for scanning foreign-keys values from sql.Rows.
func (*{{ $.Name }}) fkValues() []interface{} {
return []interface{} {
{{- range $fk := . }}
{{- $f := $fk.Field }}
&{{ if not $f.UserDefined }}sql.NullInt64{{ else }}{{ $f.NullType }}{{ end }}{}, // {{ $f.Name }}
// scanValues returns the types for scanning values from sql.Rows.
func (*{{ $.Name }}) scanValues(columns []string) ([]interface{}, error) {
values := make([]interface{}, len(columns))
for i := range columns {
switch columns[i] {
{{- range $type, $columns := $ctypes }}
case {{ range $i, $c := $columns }}{{ if ne $i 0 }},{{ end }}{{ $.Package }}.{{ $c }}{{ end }}:
values[i] = &{{ $type }}{}
{{- end }}
{{- range $i, $fk := $.ForeignKeys }}
{{- $f := $fk.Field }}
case {{ $.Package }}.ForeignKeys[{{ $i }}]: // {{ $f.Name }}
values[i] = &{{ if not $f.UserDefined }}sql.NullInt64{{ else }}{{ $f.NullType }}{{ end }}{}
{{- end }}
default:
return nil, fmt.Errorf("unexpected column %q for type {{ $.Name }}", columns[i])
}
}
{{- end }}
return values, nil
}
// assignValues assigns the values that were returned from sql.Rows (after scanning)
// to the {{ $.Name }} fields.
func ({{ $receiver }} *{{ $.Name }}) assignValues(values ...interface{}) error {
if m, n := len(values), len({{ $.Package }}.Columns); m < n {
return fmt.Errorf("mismatch number of scan values: %d != %d", m, n)
}
{{- if and $.ID.UserDefined (or $.ID.IsString $.ID.IsUUID) }}
{{- with extend $ "Idx" 0 "Field" $.ID "Rec" $receiver }}
{{ template "dialect/sql/decode/field" . }}
{{- end }}
{{- else }}
value, ok := values[0].(*sql.NullInt64)
if !ok {
return fmt.Errorf("unexpected type %T for field id", value)
}
{{ $receiver }}.ID = {{ $.ID.Type }}(value.Int64)
{{- end }}
values = values[1:]
{{- range $i, $f := $.Fields }}
{{- with extend $ "Idx" $i "Field" $f "Rec" $receiver }}
{{ template "dialect/sql/decode/field" . }}
{{- end }}
{{- end }}
{{- with $.ForeignKeys }}
{{- with $.Fields }}
values = values[{{ len . }}:]
{{- end }}
if len(values) == len({{ $.Package }}.ForeignKeys) {
{{- range $i, $fk := . }}
{{- $f := $fk.Field }}
{{- if and $f.UserDefined (or $f.IsString $f.IsUUID) }}
{{- with extend $ "Idx" $i "Field" $f "Rec" $receiver "StructField" $f.Name }}
{{ template "dialect/sql/decode/field" . }}
{{- end }}
{{- else }}
if value, ok := values[{{ $i }}].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for edge-field {{ $f.Name}}", value)
} else if value.Valid {
{{ $receiver }}.{{ $f.Name }} = new({{ $f.Type }})
*{{ $receiver }}.{{ $f.Name }} = {{ $f.Type }}(value.Int64)
}
{{- end }}
func ({{ $receiver }} *{{ $.Name }}) assignValues(columns []string, values []interface{}) error {
if m, n := len(values), len(columns); m < n {
return fmt.Errorf("mismatch number of scan values: %d != %d", m, n)
}
{{- $idx := "i" }}{{ if eq $idx $receiver }}{{ $idx = "j" }}{{ end }}
for {{ $idx }} := range columns {
switch columns[{{ $idx }}] {
case {{ $.Package }}.{{ $.ID.Constant }}:
{{- if and $.ID.UserDefined (or $.ID.IsString $.ID.IsUUID) }}
{{- with extend $ "Idx" $idx "Field" $.ID "Rec" $receiver }}
{{ template "dialect/sql/decode/field" . }}
{{- end }}
{{- else }}
value, ok := values[{{ $idx }}].(*sql.NullInt64)
if !ok {
return fmt.Errorf("unexpected type %T for field id", value)
}
{{ $receiver }}.ID = {{ $.ID.Type }}(value.Int64)
{{- end }}
{{- range $f := $.Fields }}
case {{ $.Package }}.{{ $f.Constant }}:
{{- with extend $ "Idx" $idx "Field" $f "Rec" $receiver }}
{{ template "dialect/sql/decode/field" . }}
{{- end }}
}
{{- end }}
return nil
{{- range $i, $fk := $.ForeignKeys }}
{{- $f := $fk.Field }}
case {{ $.Package }}.ForeignKeys[{{ $i }}]:
{{- if and $f.UserDefined (or $f.IsString $f.IsUUID) }}
{{- with extend $ "Idx" $idx "Field" $f "Rec" $receiver "StructField" $f.Name }}
{{ template "dialect/sql/decode/field" . }}
{{- end }}
{{- else }}
if value, ok := values[{{ $idx }}].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for edge-field {{ $f.Name}}", value)
} else if value.Valid {
{{ $receiver }}.{{ $f.Name }} = new({{ $f.Type }})
*{{ $receiver }}.{{ $f.Name }} = {{ $f.Type }}(value.Int64)
}
{{- end }}
{{- end }}
}
}
return nil
}
{{ end }}

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

@@ -41,18 +41,12 @@ func ({{ $receiver }} *{{ $builder }}) sqlAll(ctx context.Context) ([]*{{ $.Name
_spec.Node.Columns = append(_spec.Node.Columns, {{ $.Package }}.ForeignKeys...)
}
{{- end }}
_spec.ScanValues = func() []interface{} {
_spec.ScanValues = func(columns []string) ([]interface{}, error) {
node := &{{ $.Name }}{config: {{ $receiver }}.config}
nodes = append(nodes, node)
values := node.scanValues()
{{- with $.ForeignKeys }}
if withFKs {
values = append(values, node.fkValues()...)
}
{{- end }}
return values
return node.scanValues(columns)
}
_spec.Assign = func(values ...interface{}) error {
_spec.Assign = func(columns []string, values []interface{}) error {
if len(nodes) == 0 {
return fmt.Errorf("{{ $pkg }}: Assign called without calling ScanValues")
}
@@ -60,7 +54,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlAll(ctx context.Context) ([]*{{ $.Name
{{- with $.Edges }}
node.Edges.loadedTypes = loadedTypes
{{- end }}
return node.assignValues(values...)
return node.assignValues(columns, values)
}
if err := sqlgraph.QueryNodes(ctx, {{ $receiver }}.driver, _spec); err != nil {
return nil, err

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

@@ -92,7 +92,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) ({{ $ret }}
{{- if $one }}
{{ $ret }} = &{{ $.Name }}{config: {{ $receiver }}.config}
_spec.Assign = {{ $ret }}.assignValues
_spec.ScanValues = {{ $ret }}.scanValues()
_spec.ScanValues = {{ $ret }}.scanValues
{{- end }}
{{- if $one }}
if err = sqlgraph.UpdateNode(ctx, {{ $receiver }}.driver, _spec); err != nil {