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
entc/gen/template/dialect/sql/group.tmpl
View File

@@ -31,14 +31,14 @@ func ({{ $receiver }} *{{ $builder }}) sqlScan(ctx context.Context, v interface{
func ({{ $receiver }} *{{ $builder }}) sqlQuery() *sql.Selector {
selector := {{ $receiver }}.sql
selector := {{ $receiver }}.sql.Select()
aggregation := make([]string, 0, len({{ $receiver}}.fns))
for _, fn := range {{ $receiver }}.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({{ $receiver }}.fields) + len({{ $receiver}}.fns))
for _, f := range {{ $receiver }}.fields {
columns = append(columns, selector.C(f))