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

33
entc/integration/ent/task_query.go
View File

@@ -25,6 +25,7 @@ type TaskQuery struct {
limit *int
offset *int
order []OrderFunc
fields []string
predicates []predicate.Task
// intermediate query (i.e. traversal path).
sql *sql.Selector
@@ -276,18 +277,16 @@ func (tq *TaskQuery) GroupBy(field string, fields ...string) *TaskGroupBy {
// Scan(ctx, &v)
//
func (tq *TaskQuery) Select(field string, fields ...string) *TaskSelect {
selector := &TaskSelect{config: tq.config}
selector.fields = append([]string{field}, fields...)
selector.path = func(ctx context.Context) (prev *sql.Selector, err error) {
if err := tq.prepareQuery(ctx); err != nil {
return nil, err
}
return tq.sqlQuery(), nil
}
return selector
tq.fields = append([]string{field}, fields...)
return &TaskSelect{TaskQuery: tq}
}
func (tq *TaskQuery) prepareQuery(ctx context.Context) error {
for _, f := range tq.fields {
if !task.ValidColumn(f) {
return &ValidationError{Name: f, err: fmt.Errorf("ent: invalid field %q for query", f)}
}
}
if tq.path != nil {
prev, err := tq.path(ctx)
if err != nil {
@@ -650,20 +649,17 @@ func (tgb *TaskGroupBy) sqlQuery() *sql.Selector {
// TaskSelect is the builder for select fields of Task entities.
type TaskSelect struct {
config
fields []string
*TaskQuery
// intermediate query (i.e. traversal path).
sql *sql.Selector
path func(context.Context) (*sql.Selector, error)
sql *sql.Selector
}
// Scan applies the selector query and scan the result into the given value.
func (ts *TaskSelect) Scan(ctx context.Context, v interface{}) error {
query, err := ts.path(ctx)
if err != nil {
if err := ts.prepareQuery(ctx); err != nil {
return err
}
ts.sql = query
ts.sql = ts.TaskQuery.sqlQuery()
return ts.sqlScan(ctx, v)
}
@@ -863,11 +859,6 @@ func (ts *TaskSelect) BoolX(ctx context.Context) bool {
}
func (ts *TaskSelect) sqlScan(ctx context.Context, v interface{}) error {
for _, f := range ts.fields {
if !task.ValidColumn(f) {
return &ValidationError{Name: f, err: fmt.Errorf("invalid field %q for selection", f)}
}
}
rows := &sql.Rows{}
query, args := ts.sqlQuery().Query()
if err := ts.driver.Query(ctx, query, args, rows); err != nil {