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: skip selecting group-by fields if they already selected

Browse Source
This commit is contained in:
Ariel Mashraki
2021-04-19 16:17:57 +03:00
committed by Ariel Mashraki
parent 5421d6c628
commit 497fca4c96
82 changed files with 167 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/start/ent/car_query.go
View File

@@ -752,14 +752,14 @@ func (cgb *CarGroupBy) sqlScan(ctx context.Context, v interface{}) error {
}
func (cgb *CarGroupBy) sqlQuery() *sql.Selector {
selector := cgb.sql
selector := cgb.sql.Select()
aggregation := make([]string, 0, len(cgb.fns))
for _, fn := range cgb.fns {
aggregation = append(aggregation, fn(selector))
}
// If no columns were selected in a custom aggregation function, the default
// selection is the fields used for "group-by", and the aggregation functions.
if len(selector.Columns()) == 0 {
if len(selector.SelectedColumns()) == 0 {
columns := make([]string, 0, len(cgb.fields)+len(cgb.fns))
for _, f := range cgb.fields {
columns = append(columns, selector.C(f))

4
examples/start/ent/group_query.go
View File

@@ -781,14 +781,14 @@ func (ggb *GroupGroupBy) sqlScan(ctx context.Context, v interface{}) error {
}
func (ggb *GroupGroupBy) sqlQuery() *sql.Selector {
selector := ggb.sql
selector := ggb.sql.Select()
aggregation := make([]string, 0, len(ggb.fns))
for _, fn := range ggb.fns {
aggregation = append(aggregation, fn(selector))
}
// If no columns were selected in a custom aggregation function, the default
// selection is the fields used for "group-by", and the aggregation functions.
if len(selector.Columns()) == 0 {
if len(selector.SelectedColumns()) == 0 {
columns := make([]string, 0, len(ggb.fields)+len(ggb.fns))
for _, f := range ggb.fields {
columns = append(columns, selector.C(f))

4
examples/start/ent/user_query.go
View File

@@ -847,14 +847,14 @@ func (ugb *UserGroupBy) sqlScan(ctx context.Context, v interface{}) error {
}
func (ugb *UserGroupBy) sqlQuery() *sql.Selector {
selector := ugb.sql
selector := ugb.sql.Select()
aggregation := make([]string, 0, len(ugb.fns))
for _, fn := range ugb.fns {
aggregation = append(aggregation, fn(selector))
}
// If no columns were selected in a custom aggregation function, the default
// selection is the fields used for "group-by", and the aggregation functions.
if len(selector.Columns()) == 0 {
if len(selector.SelectedColumns()) == 0 {
columns := make([]string, 0, len(ugb.fields)+len(ugb.fns))
for _, f := range ugb.fields {
columns = append(columns, selector.C(f))