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: move fields selection to top builder (#1093)

Browse Source
This commit is contained in:
Ariel Mashraki
2020-12-28 12:28:07 +02:00
committed by GitHub
parent 0f7ab71e24
commit c4a43bc2be
85 changed files with 909 additions and 1626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,3 +323,13 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery() *sql.Selector {
{{ if not $field.Nillable }}*{{ end }}{{ $arg }}
{{- end }}
{{- end }}
{{ define "dialect/sql/query/preparecheck" }}
{{- $pkg := $.Scope.Package }}
{{- $receiver := $.Scope.Receiver }}
for _, f := range {{ $receiver }}.fields {
if !{{ $.Package }}.ValidColumn(f) {
return &ValidationError{Name: f, err: fmt.Errorf("{{ $pkg }}: invalid field %q for query", f)}
}
}
{{- end }}

5
entc/gen/template/dialect/sql/select.tmpl
View File

@@ -9,11 +9,6 @@ in the LICENSE file in the root directory of this source tree.
{{ $receiver := receiver $builder }}
func ({{ $receiver }} *{{ $builder }}) sqlScan(ctx context.Context, v interface{}) error {
for _, f := range {{ $receiver }}.fields {
if !{{ $.Package }}.ValidColumn(f) {
return &ValidationError{Name: f, err: fmt.Errorf("invalid field %q for selection", f)}
}
}
rows := &sql.Rows{}
query, args := {{ $receiver }}.sqlQuery().Query()
if err := {{ $receiver }}.driver.Query(ctx, query, args, rows); err != nil {