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

dialect/sql: allow appending select columns to query

Browse Source
This commit is contained in:
Ariel Mashraki
2021-06-01 11:35:59 +03:00
committed by Ariel Mashraki
parent fdc5f2b7e9
commit f5c284787f
88 changed files with 621 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/o2m2types/ent/pet_query.go
View File

@@ -481,10 +481,14 @@ func (pq *PetQuery) querySpec() *sqlgraph.QuerySpec {
func (pq *PetQuery) sqlQuery(ctx context.Context) *sql.Selector {
builder := sql.Dialect(pq.driver.Dialect())
t1 := builder.Table(pet.Table)
selector := builder.Select(t1.Columns(pet.Columns...)...).From(t1)
columns := pq.fields
if len(columns) == 0 {
columns = pet.Columns
}
selector := builder.Select(t1.Columns(columns...)...).From(t1)
if pq.sql != nil {
selector = pq.sql
selector.Select(selector.Columns(pet.Columns...)...)
selector.Select(selector.Columns(columns...)...)
}
for _, p := range pq.predicates {
p(selector)
@@ -985,16 +989,10 @@ func (ps *PetSelect) BoolX(ctx context.Context) bool {
func (ps *PetSelect) sqlScan(ctx context.Context, v interface{}) error {
rows := &sql.Rows{}
query, args := ps.sqlQuery().Query()
query, args := ps.sql.Query()
if err := ps.driver.Query(ctx, query, args, rows); err != nil {
return err
}
defer rows.Close()
return sql.ScanSlice(rows, v)
}
func (ps *PetSelect) sqlQuery() sql.Querier {
selector := ps.sql
selector.Select(selector.Columns(ps.fields...)...)
return selector
}

16
examples/o2m2types/ent/user_query.go
View File

@@ -474,10 +474,14 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec {
func (uq *UserQuery) sqlQuery(ctx context.Context) *sql.Selector {
builder := sql.Dialect(uq.driver.Dialect())
t1 := builder.Table(user.Table)
selector := builder.Select(t1.Columns(user.Columns...)...).From(t1)
columns := uq.fields
if len(columns) == 0 {
columns = user.Columns
}
selector := builder.Select(t1.Columns(columns...)...).From(t1)
if uq.sql != nil {
selector = uq.sql
selector.Select(selector.Columns(user.Columns...)...)
selector.Select(selector.Columns(columns...)...)
}
for _, p := range uq.predicates {
p(selector)
@@ -978,16 +982,10 @@ func (us *UserSelect) BoolX(ctx context.Context) bool {
func (us *UserSelect) sqlScan(ctx context.Context, v interface{}) error {
rows := &sql.Rows{}
query, args := us.sqlQuery().Query()
query, args := us.sql.Query()
if err := us.driver.Query(ctx, query, args, rows); err != nil {
return err
}
defer rows.Close()
return sql.ScanSlice(rows, v)
}
func (us *UserSelect) sqlQuery() sql.Querier {
selector := us.sql
selector.Select(selector.Columns(us.fields...)...)
return selector
}