golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-04-28 21:50:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

dialect/sql/sqlgraph: catch selector errors before query execution

Browse Source
This commit is contained in:
Ariel Mashraki
2020-09-10 20:57:25 +03:00
committed by Ariel Mashraki
parent 09be472be8
commit 9743213860
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dialect/sql/sqlgraph/graph.go
View File

@@ -547,7 +547,11 @@ type query struct {
func (q *query) nodes(ctx context.Context, drv dialect.Driver) error {
rows := &sql.Rows{}
query, args := q.selector().Query()
selector, err := q.selector()
if err != nil {
return err
}
query, args := selector.Query()
if err := drv.Query(ctx, query, args, rows); err != nil {
return err
}
@@ -566,7 +570,10 @@ func (q *query) nodes(ctx context.Context, drv dialect.Driver) error {
func (q *query) count(ctx context.Context, drv dialect.Driver) (int, error) {
rows := &sql.Rows{}
selector := q.selector()
selector, err := q.selector()
if err != nil {
return 0, err
}
selector.Count(selector.C(q.Node.ID.Column))
if q.Unique {
selector.SetDistinct(false)
@@ -580,7 +587,7 @@ func (q *query) count(ctx context.Context, drv dialect.Driver) (int, error) {
return sql.ScanInt(rows)
}
func (q *query) selector() *sql.Selector {
func (q *query) selector() (*sql.Selector, error) {
selector := q.builder.Select().From(q.builder.Table(q.Node.Table))
if q.From != nil {
selector = q.From
@@ -603,7 +610,10 @@ func (q *query) selector() *sql.Selector {
if q.Unique {
selector.Distinct()
}
return selector
if err := selector.Err(); err != nil {
return nil, err
}
return selector, nil
}
type updater struct {