From ab207c499a378b8ce3fdcc32881fee1f25677917 Mon Sep 17 00:00:00 2001 From: Ariel Mashraki Date: Mon, 8 Nov 2021 14:13:24 +0200 Subject: [PATCH] entc/gen: minor codegen improvements --- entc/gen/template/dialect/sql/group.tmpl | 4 +--- entc/gen/template/migrate/migrate.tmpl | 3 +-- entc/integration/cascadelete/ent/comment_query.go | 4 +--- entc/integration/cascadelete/ent/migrate/migrate.go | 3 +-- entc/integration/cascadelete/ent/post_query.go | 4 +--- entc/integration/cascadelete/ent/user_query.go | 4 +--- entc/integration/config/ent/migrate/migrate.go | 3 +-- entc/integration/config/ent/user_query.go | 4 +--- entc/integration/customid/ent/blob_query.go | 4 +--- entc/integration/customid/ent/car_query.go | 4 +--- entc/integration/customid/ent/device_query.go | 4 +--- entc/integration/customid/ent/doc_query.go | 4 +--- entc/integration/customid/ent/group_query.go | 4 +--- entc/integration/customid/ent/migrate/migrate.go | 3 +-- entc/integration/customid/ent/mixinid_query.go | 4 +--- entc/integration/customid/ent/note_query.go | 4 +--- entc/integration/customid/ent/pet_query.go | 4 +--- entc/integration/customid/ent/session_query.go | 4 +--- entc/integration/customid/ent/user_query.go | 4 +--- entc/integration/edgefield/ent/car_query.go | 4 +--- entc/integration/edgefield/ent/card_query.go | 4 +--- entc/integration/edgefield/ent/info_query.go | 4 +--- entc/integration/edgefield/ent/metadata_query.go | 4 +--- entc/integration/edgefield/ent/migrate/migrate.go | 3 +-- entc/integration/edgefield/ent/node_query.go | 4 +--- entc/integration/edgefield/ent/pet_query.go | 4 +--- entc/integration/edgefield/ent/post_query.go | 4 +--- entc/integration/edgefield/ent/rental_query.go | 4 +--- entc/integration/edgefield/ent/user_query.go | 4 +--- entc/integration/ent/card_query.go | 4 +--- entc/integration/ent/comment_query.go | 4 +--- entc/integration/ent/fieldtype_query.go | 4 +--- entc/integration/ent/file_query.go | 4 +--- entc/integration/ent/filetype_query.go | 4 +--- entc/integration/ent/goods_query.go | 4 +--- entc/integration/ent/group_query.go | 4 +--- entc/integration/ent/groupinfo_query.go | 4 +--- entc/integration/ent/item_query.go | 4 +--- entc/integration/ent/migrate/migrate.go | 3 +-- entc/integration/ent/node_query.go | 4 +--- entc/integration/ent/pet_query.go | 4 +--- entc/integration/ent/spec_query.go | 4 +--- entc/integration/ent/task_query.go | 4 +--- entc/integration/ent/user_query.go | 4 +--- entc/integration/hooks/ent/card_query.go | 4 +--- entc/integration/hooks/ent/migrate/migrate.go | 3 +-- entc/integration/hooks/ent/user_query.go | 4 +--- entc/integration/idtype/ent/migrate/migrate.go | 3 +-- entc/integration/idtype/ent/user_query.go | 4 +--- entc/integration/json/ent/migrate/migrate.go | 3 +-- entc/integration/json/ent/user_query.go | 4 +--- entc/integration/migrate/entv1/car_query.go | 4 +--- entc/integration/migrate/entv1/conversion_query.go | 4 +--- entc/integration/migrate/entv1/customtype_query.go | 4 +--- entc/integration/migrate/entv1/migrate/migrate.go | 3 +-- entc/integration/migrate/entv1/user_query.go | 4 +--- entc/integration/migrate/entv2/car_query.go | 4 +--- entc/integration/migrate/entv2/conversion_query.go | 4 +--- entc/integration/migrate/entv2/customtype_query.go | 4 +--- entc/integration/migrate/entv2/group_query.go | 4 +--- entc/integration/migrate/entv2/media_query.go | 4 +--- entc/integration/migrate/entv2/migrate/migrate.go | 3 +-- entc/integration/migrate/entv2/pet_query.go | 4 +--- entc/integration/migrate/entv2/user_query.go | 4 +--- entc/integration/multischema/ent/group_query.go | 4 +--- entc/integration/multischema/ent/migrate/migrate.go | 3 +-- entc/integration/multischema/ent/pet_query.go | 4 +--- entc/integration/multischema/ent/user_query.go | 4 +--- entc/integration/privacy/ent/migrate/migrate.go | 3 +-- entc/integration/privacy/ent/task_query.go | 4 +--- entc/integration/privacy/ent/team_query.go | 4 +--- entc/integration/privacy/ent/user_query.go | 4 +--- entc/integration/template/ent/group_query.go | 4 +--- entc/integration/template/ent/migrate/migrate.go | 3 +-- entc/integration/template/ent/pet_query.go | 4 +--- entc/integration/template/ent/user_query.go | 4 +--- examples/edgeindex/ent/city_query.go | 4 +--- examples/edgeindex/ent/migrate/migrate.go | 3 +-- examples/edgeindex/ent/street_query.go | 4 +--- examples/entcpkg/ent/migrate/migrate.go | 3 +-- examples/entcpkg/ent/user_query.go | 4 +--- examples/fs/ent/file_query.go | 4 +--- examples/fs/ent/migrate/migrate.go | 3 +-- examples/m2m2types/ent/group_query.go | 4 +--- examples/m2m2types/ent/migrate/migrate.go | 3 +-- examples/m2m2types/ent/user_query.go | 4 +--- examples/m2mbidi/ent/migrate/migrate.go | 3 +-- examples/m2mbidi/ent/user_query.go | 4 +--- examples/m2mrecur/ent/migrate/migrate.go | 3 +-- examples/m2mrecur/ent/user_query.go | 4 +--- examples/o2m2types/ent/migrate/migrate.go | 3 +-- examples/o2m2types/ent/pet_query.go | 4 +--- examples/o2m2types/ent/user_query.go | 4 +--- examples/o2mrecur/ent/migrate/migrate.go | 3 +-- examples/o2mrecur/ent/node_query.go | 4 +--- examples/o2o2types/ent/card_query.go | 4 +--- examples/o2o2types/ent/migrate/migrate.go | 3 +-- examples/o2o2types/ent/user_query.go | 4 +--- examples/o2obidi/ent/migrate/migrate.go | 3 +-- examples/o2obidi/ent/user_query.go | 4 +--- examples/o2orecur/ent/migrate/migrate.go | 3 +-- examples/o2orecur/ent/node_query.go | 4 +--- examples/privacyadmin/ent/migrate/migrate.go | 3 +-- examples/privacyadmin/ent/user_query.go | 4 +--- examples/privacytenant/ent/group_query.go | 4 +--- examples/privacytenant/ent/migrate/migrate.go | 3 +-- examples/privacytenant/ent/tenant_query.go | 4 +--- examples/privacytenant/ent/user_query.go | 4 +--- examples/start/ent/car_query.go | 4 +--- examples/start/ent/group_query.go | 4 +--- examples/start/ent/migrate/migrate.go | 3 +-- examples/start/ent/user_query.go | 4 +--- examples/traversal/ent/group_query.go | 4 +--- examples/traversal/ent/migrate/migrate.go | 3 +-- examples/traversal/ent/pet_query.go | 4 +--- examples/traversal/ent/user_query.go | 4 +--- examples/version/ent/migrate/migrate.go | 3 +-- examples/version/ent/user_query.go | 4 +--- 118 files changed, 118 insertions(+), 324 deletions(-) diff --git a/entc/gen/template/dialect/sql/group.tmpl b/entc/gen/template/dialect/sql/group.tmpl index b43240281..074206d27 100644 --- a/entc/gen/template/dialect/sql/group.tmpl +++ b/entc/gen/template/dialect/sql/group.tmpl @@ -43,9 +43,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery() *sql.Selector { for _, f := range {{ $receiver }}.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns({{ $receiver }}.fields...)...) diff --git a/entc/gen/template/migrate/migrate.tmpl b/entc/gen/template/migrate/migrate.tmpl index 70129556b..1c5972366 100644 --- a/entc/gen/template/migrate/migrate.tmpl +++ b/entc/gen/template/migrate/migrate.tmpl @@ -46,8 +46,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/cascadelete/ent/comment_query.go b/entc/integration/cascadelete/ent/comment_query.go index 573f89873..844169f88 100644 --- a/entc/integration/cascadelete/ent/comment_query.go +++ b/entc/integration/cascadelete/ent/comment_query.go @@ -764,9 +764,7 @@ func (cgb *CommentGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/entc/integration/cascadelete/ent/migrate/migrate.go b/entc/integration/cascadelete/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/cascadelete/ent/migrate/migrate.go +++ b/entc/integration/cascadelete/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/cascadelete/ent/post_query.go b/entc/integration/cascadelete/ent/post_query.go index 646d19d50..745a0f9ad 100644 --- a/entc/integration/cascadelete/ent/post_query.go +++ b/entc/integration/cascadelete/ent/post_query.go @@ -827,9 +827,7 @@ func (pgb *PostGroupBy) sqlQuery() *sql.Selector { for _, f := range pgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(pgb.fields...)...) diff --git a/entc/integration/cascadelete/ent/user_query.go b/entc/integration/cascadelete/ent/user_query.go index fe688eda6..94b5fa712 100644 --- a/entc/integration/cascadelete/ent/user_query.go +++ b/entc/integration/cascadelete/ent/user_query.go @@ -764,9 +764,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/entc/integration/config/ent/migrate/migrate.go b/entc/integration/config/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/config/ent/migrate/migrate.go +++ b/entc/integration/config/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/config/ent/user_query.go b/entc/integration/config/ent/user_query.go index 1e13d3816..ec5606661 100644 --- a/entc/integration/config/ent/user_query.go +++ b/entc/integration/config/ent/user_query.go @@ -696,9 +696,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/entc/integration/customid/ent/blob_query.go b/entc/integration/customid/ent/blob_query.go index 5f7d1d4ad..3dd8747b2 100644 --- a/entc/integration/customid/ent/blob_query.go +++ b/entc/integration/customid/ent/blob_query.go @@ -877,9 +877,7 @@ func (bgb *BlobGroupBy) sqlQuery() *sql.Selector { for _, f := range bgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(bgb.fields...)...) diff --git a/entc/integration/customid/ent/car_query.go b/entc/integration/customid/ent/car_query.go index db2a44659..b9544734e 100644 --- a/entc/integration/customid/ent/car_query.go +++ b/entc/integration/customid/ent/car_query.go @@ -775,9 +775,7 @@ func (cgb *CarGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/entc/integration/customid/ent/device_query.go b/entc/integration/customid/ent/device_query.go index 3a47bbf89..a96410b10 100644 --- a/entc/integration/customid/ent/device_query.go +++ b/entc/integration/customid/ent/device_query.go @@ -818,9 +818,7 @@ func (dgb *DeviceGroupBy) sqlQuery() *sql.Selector { for _, f := range dgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(dgb.fields...)...) diff --git a/entc/integration/customid/ent/doc_query.go b/entc/integration/customid/ent/doc_query.go index 4e2bb3e07..12d17fe39 100644 --- a/entc/integration/customid/ent/doc_query.go +++ b/entc/integration/customid/ent/doc_query.go @@ -841,9 +841,7 @@ func (dgb *DocGroupBy) sqlQuery() *sql.Selector { for _, f := range dgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(dgb.fields...)...) diff --git a/entc/integration/customid/ent/group_query.go b/entc/integration/customid/ent/group_query.go index 9e6c6c3b5..bafb27749 100644 --- a/entc/integration/customid/ent/group_query.go +++ b/entc/integration/customid/ent/group_query.go @@ -780,9 +780,7 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { for _, f := range ggb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ggb.fields...)...) diff --git a/entc/integration/customid/ent/migrate/migrate.go b/entc/integration/customid/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/customid/ent/migrate/migrate.go +++ b/entc/integration/customid/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/customid/ent/mixinid_query.go b/entc/integration/customid/ent/mixinid_query.go index 870f3ad95..3186b1ed3 100644 --- a/entc/integration/customid/ent/mixinid_query.go +++ b/entc/integration/customid/ent/mixinid_query.go @@ -697,9 +697,7 @@ func (migb *MixinIDGroupBy) sqlQuery() *sql.Selector { for _, f := range migb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(migb.fields...)...) diff --git a/entc/integration/customid/ent/note_query.go b/entc/integration/customid/ent/note_query.go index 385b51ac9..68e88f4ba 100644 --- a/entc/integration/customid/ent/note_query.go +++ b/entc/integration/customid/ent/note_query.go @@ -841,9 +841,7 @@ func (ngb *NoteGroupBy) sqlQuery() *sql.Selector { for _, f := range ngb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ngb.fields...)...) diff --git a/entc/integration/customid/ent/pet_query.go b/entc/integration/customid/ent/pet_query.go index fefeb4480..c2ab69fc8 100644 --- a/entc/integration/customid/ent/pet_query.go +++ b/entc/integration/customid/ent/pet_query.go @@ -984,9 +984,7 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { for _, f := range pgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(pgb.fields...)...) diff --git a/entc/integration/customid/ent/session_query.go b/entc/integration/customid/ent/session_query.go index e73d11d76..5136c7469 100644 --- a/entc/integration/customid/ent/session_query.go +++ b/entc/integration/customid/ent/session_query.go @@ -752,9 +752,7 @@ func (sgb *SessionGroupBy) sqlQuery() *sql.Selector { for _, f := range sgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(sgb.fields...)...) diff --git a/entc/integration/customid/ent/user_query.go b/entc/integration/customid/ent/user_query.go index 48cdd6e21..ef778afa2 100644 --- a/entc/integration/customid/ent/user_query.go +++ b/entc/integration/customid/ent/user_query.go @@ -984,9 +984,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/entc/integration/edgefield/ent/car_query.go b/entc/integration/edgefield/ent/car_query.go index 517f146c7..a4ba9c750 100644 --- a/entc/integration/edgefield/ent/car_query.go +++ b/entc/integration/edgefield/ent/car_query.go @@ -765,9 +765,7 @@ func (cgb *CarGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/entc/integration/edgefield/ent/card_query.go b/entc/integration/edgefield/ent/card_query.go index 9d575c486..eb849f63c 100644 --- a/entc/integration/edgefield/ent/card_query.go +++ b/entc/integration/edgefield/ent/card_query.go @@ -764,9 +764,7 @@ func (cgb *CardGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/entc/integration/edgefield/ent/info_query.go b/entc/integration/edgefield/ent/info_query.go index 3707f63df..526dbc07d 100644 --- a/entc/integration/edgefield/ent/info_query.go +++ b/entc/integration/edgefield/ent/info_query.go @@ -764,9 +764,7 @@ func (igb *InfoGroupBy) sqlQuery() *sql.Selector { for _, f := range igb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(igb.fields...)...) diff --git a/entc/integration/edgefield/ent/metadata_query.go b/entc/integration/edgefield/ent/metadata_query.go index edc01b40e..4da1afc16 100644 --- a/entc/integration/edgefield/ent/metadata_query.go +++ b/entc/integration/edgefield/ent/metadata_query.go @@ -888,9 +888,7 @@ func (mgb *MetadataGroupBy) sqlQuery() *sql.Selector { for _, f := range mgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(mgb.fields...)...) diff --git a/entc/integration/edgefield/ent/migrate/migrate.go b/entc/integration/edgefield/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/edgefield/ent/migrate/migrate.go +++ b/entc/integration/edgefield/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/edgefield/ent/node_query.go b/entc/integration/edgefield/ent/node_query.go index 444e2c40f..ffa74b07c 100644 --- a/entc/integration/edgefield/ent/node_query.go +++ b/entc/integration/edgefield/ent/node_query.go @@ -824,9 +824,7 @@ func (ngb *NodeGroupBy) sqlQuery() *sql.Selector { for _, f := range ngb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ngb.fields...)...) diff --git a/entc/integration/edgefield/ent/pet_query.go b/entc/integration/edgefield/ent/pet_query.go index 163bc8951..bb2ac7c44 100644 --- a/entc/integration/edgefield/ent/pet_query.go +++ b/entc/integration/edgefield/ent/pet_query.go @@ -764,9 +764,7 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { for _, f := range pgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(pgb.fields...)...) diff --git a/entc/integration/edgefield/ent/post_query.go b/entc/integration/edgefield/ent/post_query.go index a1c087c95..65d84004e 100644 --- a/entc/integration/edgefield/ent/post_query.go +++ b/entc/integration/edgefield/ent/post_query.go @@ -767,9 +767,7 @@ func (pgb *PostGroupBy) sqlQuery() *sql.Selector { for _, f := range pgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(pgb.fields...)...) diff --git a/entc/integration/edgefield/ent/rental_query.go b/entc/integration/edgefield/ent/rental_query.go index 8bf0da767..2d20fa18e 100644 --- a/entc/integration/edgefield/ent/rental_query.go +++ b/entc/integration/edgefield/ent/rental_query.go @@ -828,9 +828,7 @@ func (rgb *RentalGroupBy) sqlQuery() *sql.Selector { for _, f := range rgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(rgb.fields...)...) diff --git a/entc/integration/edgefield/ent/user_query.go b/entc/integration/edgefield/ent/user_query.go index dfff0dce5..0e6cfcd0e 100644 --- a/entc/integration/edgefield/ent/user_query.go +++ b/entc/integration/edgefield/ent/user_query.go @@ -1195,9 +1195,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/entc/integration/ent/card_query.go b/entc/integration/ent/card_query.go index 0dd3d9d15..100597664 100644 --- a/entc/integration/ent/card_query.go +++ b/entc/integration/ent/card_query.go @@ -921,9 +921,7 @@ func (cgb *CardGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/entc/integration/ent/comment_query.go b/entc/integration/ent/comment_query.go index 493ee054f..35c29b8f3 100644 --- a/entc/integration/ent/comment_query.go +++ b/entc/integration/ent/comment_query.go @@ -739,9 +739,7 @@ func (cgb *CommentGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/entc/integration/ent/fieldtype_query.go b/entc/integration/ent/fieldtype_query.go index 2d9080418..b200ab669 100644 --- a/entc/integration/ent/fieldtype_query.go +++ b/entc/integration/ent/fieldtype_query.go @@ -744,9 +744,7 @@ func (ftgb *FieldTypeGroupBy) sqlQuery() *sql.Selector { for _, f := range ftgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ftgb.fields...)...) diff --git a/entc/integration/ent/file_query.go b/entc/integration/ent/file_query.go index 53ed7621d..4118658cb 100644 --- a/entc/integration/ent/file_query.go +++ b/entc/integration/ent/file_query.go @@ -951,9 +951,7 @@ func (fgb *FileGroupBy) sqlQuery() *sql.Selector { for _, f := range fgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(fgb.fields...)...) diff --git a/entc/integration/ent/filetype_query.go b/entc/integration/ent/filetype_query.go index 3a13fb56e..f0f234a69 100644 --- a/entc/integration/ent/filetype_query.go +++ b/entc/integration/ent/filetype_query.go @@ -811,9 +811,7 @@ func (ftgb *FileTypeGroupBy) sqlQuery() *sql.Selector { for _, f := range ftgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ftgb.fields...)...) diff --git a/entc/integration/ent/goods_query.go b/entc/integration/ent/goods_query.go index ef8e9043d..a5340f481 100644 --- a/entc/integration/ent/goods_query.go +++ b/entc/integration/ent/goods_query.go @@ -715,9 +715,7 @@ func (ggb *GoodsGroupBy) sqlQuery() *sql.Selector { for _, f := range ggb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ggb.fields...)...) diff --git a/entc/integration/ent/group_query.go b/entc/integration/ent/group_query.go index 6838426aa..f36292456 100644 --- a/entc/integration/ent/group_query.go +++ b/entc/integration/ent/group_query.go @@ -1052,9 +1052,7 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { for _, f := range ggb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ggb.fields...)...) diff --git a/entc/integration/ent/groupinfo_query.go b/entc/integration/ent/groupinfo_query.go index 40e8469d7..553acb675 100644 --- a/entc/integration/ent/groupinfo_query.go +++ b/entc/integration/ent/groupinfo_query.go @@ -811,9 +811,7 @@ func (gigb *GroupInfoGroupBy) sqlQuery() *sql.Selector { for _, f := range gigb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(gigb.fields...)...) diff --git a/entc/integration/ent/item_query.go b/entc/integration/ent/item_query.go index bbc962252..117731fef 100644 --- a/entc/integration/ent/item_query.go +++ b/entc/integration/ent/item_query.go @@ -739,9 +739,7 @@ func (igb *ItemGroupBy) sqlQuery() *sql.Selector { for _, f := range igb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(igb.fields...)...) diff --git a/entc/integration/ent/migrate/migrate.go b/entc/integration/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/ent/migrate/migrate.go +++ b/entc/integration/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/ent/node_query.go b/entc/integration/ent/node_query.go index 2b32dd3bf..72dbe2047 100644 --- a/entc/integration/ent/node_query.go +++ b/entc/integration/ent/node_query.go @@ -882,9 +882,7 @@ func (ngb *NodeGroupBy) sqlQuery() *sql.Selector { for _, f := range ngb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ngb.fields...)...) diff --git a/entc/integration/ent/pet_query.go b/entc/integration/ent/pet_query.go index 1887d3679..f3f4788cd 100644 --- a/entc/integration/ent/pet_query.go +++ b/entc/integration/ent/pet_query.go @@ -883,9 +883,7 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { for _, f := range pgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(pgb.fields...)...) diff --git a/entc/integration/ent/spec_query.go b/entc/integration/ent/spec_query.go index d1596c615..3295499c2 100644 --- a/entc/integration/ent/spec_query.go +++ b/entc/integration/ent/spec_query.go @@ -823,9 +823,7 @@ func (sgb *SpecGroupBy) sqlQuery() *sql.Selector { for _, f := range sgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(sgb.fields...)...) diff --git a/entc/integration/ent/task_query.go b/entc/integration/ent/task_query.go index f0022ec7f..5148dc79d 100644 --- a/entc/integration/ent/task_query.go +++ b/entc/integration/ent/task_query.go @@ -739,9 +739,7 @@ func (tgb *TaskGroupBy) sqlQuery() *sql.Selector { for _, f := range tgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(tgb.fields...)...) diff --git a/entc/integration/ent/user_query.go b/entc/integration/ent/user_query.go index 446ca0d4c..b6672126a 100644 --- a/entc/integration/ent/user_query.go +++ b/entc/integration/ent/user_query.go @@ -1614,9 +1614,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/entc/integration/hooks/ent/card_query.go b/entc/integration/hooks/ent/card_query.go index fc6685841..b958d9220 100644 --- a/entc/integration/hooks/ent/card_query.go +++ b/entc/integration/hooks/ent/card_query.go @@ -775,9 +775,7 @@ func (cgb *CardGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/entc/integration/hooks/ent/migrate/migrate.go b/entc/integration/hooks/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/hooks/ent/migrate/migrate.go +++ b/entc/integration/hooks/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/hooks/ent/user_query.go b/entc/integration/hooks/ent/user_query.go index 5cd1e6e35..9774ad09d 100644 --- a/entc/integration/hooks/ent/user_query.go +++ b/entc/integration/hooks/ent/user_query.go @@ -942,9 +942,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/entc/integration/idtype/ent/migrate/migrate.go b/entc/integration/idtype/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/idtype/ent/migrate/migrate.go +++ b/entc/integration/idtype/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/idtype/ent/user_query.go b/entc/integration/idtype/ent/user_query.go index 6d7c9b098..1c921ad7c 100644 --- a/entc/integration/idtype/ent/user_query.go +++ b/entc/integration/idtype/ent/user_query.go @@ -977,9 +977,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/entc/integration/json/ent/migrate/migrate.go b/entc/integration/json/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/json/ent/migrate/migrate.go +++ b/entc/integration/json/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/json/ent/user_query.go b/entc/integration/json/ent/user_query.go index 79bbe04ab..3649a3059 100644 --- a/entc/integration/json/ent/user_query.go +++ b/entc/integration/json/ent/user_query.go @@ -696,9 +696,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/entc/integration/migrate/entv1/car_query.go b/entc/integration/migrate/entv1/car_query.go index dbcc93726..bdec7212f 100644 --- a/entc/integration/migrate/entv1/car_query.go +++ b/entc/integration/migrate/entv1/car_query.go @@ -751,9 +751,7 @@ func (cgb *CarGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/entc/integration/migrate/entv1/conversion_query.go b/entc/integration/migrate/entv1/conversion_query.go index cecbe2a77..d4643ee39 100644 --- a/entc/integration/migrate/entv1/conversion_query.go +++ b/entc/integration/migrate/entv1/conversion_query.go @@ -696,9 +696,7 @@ func (cgb *ConversionGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/entc/integration/migrate/entv1/customtype_query.go b/entc/integration/migrate/entv1/customtype_query.go index 6de089d16..7931f7d66 100644 --- a/entc/integration/migrate/entv1/customtype_query.go +++ b/entc/integration/migrate/entv1/customtype_query.go @@ -696,9 +696,7 @@ func (ctgb *CustomTypeGroupBy) sqlQuery() *sql.Selector { for _, f := range ctgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ctgb.fields...)...) diff --git a/entc/integration/migrate/entv1/migrate/migrate.go b/entc/integration/migrate/entv1/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/migrate/entv1/migrate/migrate.go +++ b/entc/integration/migrate/entv1/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/migrate/entv1/user_query.go b/entc/integration/migrate/entv1/user_query.go index a4a34b1f2..8614f410b 100644 --- a/entc/integration/migrate/entv1/user_query.go +++ b/entc/integration/migrate/entv1/user_query.go @@ -970,9 +970,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/entc/integration/migrate/entv2/car_query.go b/entc/integration/migrate/entv2/car_query.go index f962407f7..d4dc7b3c9 100644 --- a/entc/integration/migrate/entv2/car_query.go +++ b/entc/integration/migrate/entv2/car_query.go @@ -751,9 +751,7 @@ func (cgb *CarGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/entc/integration/migrate/entv2/conversion_query.go b/entc/integration/migrate/entv2/conversion_query.go index 2d8efc60f..2c0a52fca 100644 --- a/entc/integration/migrate/entv2/conversion_query.go +++ b/entc/integration/migrate/entv2/conversion_query.go @@ -696,9 +696,7 @@ func (cgb *ConversionGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/entc/integration/migrate/entv2/customtype_query.go b/entc/integration/migrate/entv2/customtype_query.go index 2d99e4b7c..a003a81ab 100644 --- a/entc/integration/migrate/entv2/customtype_query.go +++ b/entc/integration/migrate/entv2/customtype_query.go @@ -696,9 +696,7 @@ func (ctgb *CustomTypeGroupBy) sqlQuery() *sql.Selector { for _, f := range ctgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ctgb.fields...)...) diff --git a/entc/integration/migrate/entv2/group_query.go b/entc/integration/migrate/entv2/group_query.go index 29554d74e..fa5e702e7 100644 --- a/entc/integration/migrate/entv2/group_query.go +++ b/entc/integration/migrate/entv2/group_query.go @@ -672,9 +672,7 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { for _, f := range ggb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ggb.fields...)...) diff --git a/entc/integration/migrate/entv2/media_query.go b/entc/integration/migrate/entv2/media_query.go index 8c9bf4819..c483d960d 100644 --- a/entc/integration/migrate/entv2/media_query.go +++ b/entc/integration/migrate/entv2/media_query.go @@ -696,9 +696,7 @@ func (mgb *MediaGroupBy) sqlQuery() *sql.Selector { for _, f := range mgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(mgb.fields...)...) diff --git a/entc/integration/migrate/entv2/migrate/migrate.go b/entc/integration/migrate/entv2/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/migrate/entv2/migrate/migrate.go +++ b/entc/integration/migrate/entv2/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/migrate/entv2/pet_query.go b/entc/integration/migrate/entv2/pet_query.go index ebd7f5e09..3d65c39e9 100644 --- a/entc/integration/migrate/entv2/pet_query.go +++ b/entc/integration/migrate/entv2/pet_query.go @@ -751,9 +751,7 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { for _, f := range pgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(pgb.fields...)...) diff --git a/entc/integration/migrate/entv2/user_query.go b/entc/integration/migrate/entv2/user_query.go index f2c9761a2..50dead9e1 100644 --- a/entc/integration/migrate/entv2/user_query.go +++ b/entc/integration/migrate/entv2/user_query.go @@ -934,9 +934,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/entc/integration/multischema/ent/group_query.go b/entc/integration/multischema/ent/group_query.go index 2a081f0a5..f0a30cb5d 100644 --- a/entc/integration/multischema/ent/group_query.go +++ b/entc/integration/multischema/ent/group_query.go @@ -832,9 +832,7 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { for _, f := range ggb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ggb.fields...)...) diff --git a/entc/integration/multischema/ent/migrate/migrate.go b/entc/integration/multischema/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/multischema/ent/migrate/migrate.go +++ b/entc/integration/multischema/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/multischema/ent/pet_query.go b/entc/integration/multischema/ent/pet_query.go index 070891663..aae19c90c 100644 --- a/entc/integration/multischema/ent/pet_query.go +++ b/entc/integration/multischema/ent/pet_query.go @@ -791,9 +791,7 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { for _, f := range pgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(pgb.fields...)...) diff --git a/entc/integration/multischema/ent/user_query.go b/entc/integration/multischema/ent/user_query.go index b9512520b..b860a6a6a 100644 --- a/entc/integration/multischema/ent/user_query.go +++ b/entc/integration/multischema/ent/user_query.go @@ -897,9 +897,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/entc/integration/privacy/ent/migrate/migrate.go b/entc/integration/privacy/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/privacy/ent/migrate/migrate.go +++ b/entc/integration/privacy/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/privacy/ent/task_query.go b/entc/integration/privacy/ent/task_query.go index bf117c22d..6c68751a5 100644 --- a/entc/integration/privacy/ent/task_query.go +++ b/entc/integration/privacy/ent/task_query.go @@ -884,9 +884,7 @@ func (tgb *TaskGroupBy) sqlQuery() *sql.Selector { for _, f := range tgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(tgb.fields...)...) diff --git a/entc/integration/privacy/ent/team_query.go b/entc/integration/privacy/ent/team_query.go index 238d3f70e..b35607a4c 100644 --- a/entc/integration/privacy/ent/team_query.go +++ b/entc/integration/privacy/ent/team_query.go @@ -912,9 +912,7 @@ func (tgb *TeamGroupBy) sqlQuery() *sql.Selector { for _, f := range tgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(tgb.fields...)...) diff --git a/entc/integration/privacy/ent/user_query.go b/entc/integration/privacy/ent/user_query.go index b163520eb..236cbfb14 100644 --- a/entc/integration/privacy/ent/user_query.go +++ b/entc/integration/privacy/ent/user_query.go @@ -876,9 +876,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/entc/integration/template/ent/group_query.go b/entc/integration/template/ent/group_query.go index e78d1a7d7..5bc27aefb 100644 --- a/entc/integration/template/ent/group_query.go +++ b/entc/integration/template/ent/group_query.go @@ -713,9 +713,7 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { for _, f := range ggb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ggb.fields...)...) diff --git a/entc/integration/template/ent/migrate/migrate.go b/entc/integration/template/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/entc/integration/template/ent/migrate/migrate.go +++ b/entc/integration/template/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/entc/integration/template/ent/pet_query.go b/entc/integration/template/ent/pet_query.go index 2ea4a6e0a..6c8751fe4 100644 --- a/entc/integration/template/ent/pet_query.go +++ b/entc/integration/template/ent/pet_query.go @@ -792,9 +792,7 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { for _, f := range pgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(pgb.fields...)...) diff --git a/entc/integration/template/ent/user_query.go b/entc/integration/template/ent/user_query.go index 2e5c42366..5e0559f8e 100644 --- a/entc/integration/template/ent/user_query.go +++ b/entc/integration/template/ent/user_query.go @@ -886,9 +886,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/examples/edgeindex/ent/city_query.go b/examples/edgeindex/ent/city_query.go index 16e2aade8..f00d66d52 100644 --- a/examples/edgeindex/ent/city_query.go +++ b/examples/edgeindex/ent/city_query.go @@ -768,9 +768,7 @@ func (cgb *CityGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/examples/edgeindex/ent/migrate/migrate.go b/examples/edgeindex/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/edgeindex/ent/migrate/migrate.go +++ b/examples/edgeindex/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/edgeindex/ent/street_query.go b/examples/edgeindex/ent/street_query.go index 48dbd706e..f83a04c38 100644 --- a/examples/edgeindex/ent/street_query.go +++ b/examples/edgeindex/ent/street_query.go @@ -775,9 +775,7 @@ func (sgb *StreetGroupBy) sqlQuery() *sql.Selector { for _, f := range sgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(sgb.fields...)...) diff --git a/examples/entcpkg/ent/migrate/migrate.go b/examples/entcpkg/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/entcpkg/ent/migrate/migrate.go +++ b/examples/entcpkg/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/entcpkg/ent/user_query.go b/examples/entcpkg/ent/user_query.go index 0fde0200b..a75d2a8b1 100644 --- a/examples/entcpkg/ent/user_query.go +++ b/examples/entcpkg/ent/user_query.go @@ -696,9 +696,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/examples/fs/ent/file_query.go b/examples/fs/ent/file_query.go index 97477ccc5..03f88e01c 100644 --- a/examples/fs/ent/file_query.go +++ b/examples/fs/ent/file_query.go @@ -825,9 +825,7 @@ func (fgb *FileGroupBy) sqlQuery() *sql.Selector { for _, f := range fgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(fgb.fields...)...) diff --git a/examples/fs/ent/migrate/migrate.go b/examples/fs/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/fs/ent/migrate/migrate.go +++ b/examples/fs/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/m2m2types/ent/group_query.go b/examples/m2m2types/ent/group_query.go index 10db78d7f..b0b3e6c6f 100644 --- a/examples/m2m2types/ent/group_query.go +++ b/examples/m2m2types/ent/group_query.go @@ -804,9 +804,7 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { for _, f := range ggb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ggb.fields...)...) diff --git a/examples/m2m2types/ent/migrate/migrate.go b/examples/m2m2types/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/m2m2types/ent/migrate/migrate.go +++ b/examples/m2m2types/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/m2m2types/ent/user_query.go b/examples/m2m2types/ent/user_query.go index 753a64a2a..02242f77d 100644 --- a/examples/m2m2types/ent/user_query.go +++ b/examples/m2m2types/ent/user_query.go @@ -804,9 +804,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/examples/m2mbidi/ent/migrate/migrate.go b/examples/m2mbidi/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/m2mbidi/ent/migrate/migrate.go +++ b/examples/m2mbidi/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/m2mbidi/ent/user_query.go b/examples/m2mbidi/ent/user_query.go index 3a1c93a0f..479983256 100644 --- a/examples/m2mbidi/ent/user_query.go +++ b/examples/m2mbidi/ent/user_query.go @@ -803,9 +803,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/examples/m2mrecur/ent/migrate/migrate.go b/examples/m2mrecur/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/m2mrecur/ent/migrate/migrate.go +++ b/examples/m2mrecur/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/m2mrecur/ent/user_query.go b/examples/m2mrecur/ent/user_query.go index b67512253..11924dd11 100644 --- a/examples/m2mrecur/ent/user_query.go +++ b/examples/m2mrecur/ent/user_query.go @@ -904,9 +904,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/examples/o2m2types/ent/migrate/migrate.go b/examples/o2m2types/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/o2m2types/ent/migrate/migrate.go +++ b/examples/o2m2types/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/o2m2types/ent/pet_query.go b/examples/o2m2types/ent/pet_query.go index c68501897..5f08a0ed3 100644 --- a/examples/o2m2types/ent/pet_query.go +++ b/examples/o2m2types/ent/pet_query.go @@ -775,9 +775,7 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { for _, f := range pgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(pgb.fields...)...) diff --git a/examples/o2m2types/ent/user_query.go b/examples/o2m2types/ent/user_query.go index 78311d34e..b3599c27d 100644 --- a/examples/o2m2types/ent/user_query.go +++ b/examples/o2m2types/ent/user_query.go @@ -768,9 +768,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/examples/o2mrecur/ent/migrate/migrate.go b/examples/o2mrecur/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/o2mrecur/ent/migrate/migrate.go +++ b/examples/o2mrecur/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/o2mrecur/ent/node_query.go b/examples/o2mrecur/ent/node_query.go index 8355a6670..3cb5945a3 100644 --- a/examples/o2mrecur/ent/node_query.go +++ b/examples/o2mrecur/ent/node_query.go @@ -840,9 +840,7 @@ func (ngb *NodeGroupBy) sqlQuery() *sql.Selector { for _, f := range ngb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ngb.fields...)...) diff --git a/examples/o2o2types/ent/card_query.go b/examples/o2o2types/ent/card_query.go index 1b78c4c26..fc4951dd0 100644 --- a/examples/o2o2types/ent/card_query.go +++ b/examples/o2o2types/ent/card_query.go @@ -775,9 +775,7 @@ func (cgb *CardGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/examples/o2o2types/ent/migrate/migrate.go b/examples/o2o2types/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/o2o2types/ent/migrate/migrate.go +++ b/examples/o2o2types/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/o2o2types/ent/user_query.go b/examples/o2o2types/ent/user_query.go index 1d43fae2c..cbf591fbf 100644 --- a/examples/o2o2types/ent/user_query.go +++ b/examples/o2o2types/ent/user_query.go @@ -767,9 +767,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/examples/o2obidi/ent/migrate/migrate.go b/examples/o2obidi/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/o2obidi/ent/migrate/migrate.go +++ b/examples/o2obidi/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/o2obidi/ent/user_query.go b/examples/o2obidi/ent/user_query.go index a9c7e71e7..b24c823b6 100644 --- a/examples/o2obidi/ent/user_query.go +++ b/examples/o2obidi/ent/user_query.go @@ -774,9 +774,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/examples/o2orecur/ent/migrate/migrate.go b/examples/o2orecur/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/o2orecur/ent/migrate/migrate.go +++ b/examples/o2orecur/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/o2orecur/ent/node_query.go b/examples/o2orecur/ent/node_query.go index d0afdd823..45906fae6 100644 --- a/examples/o2orecur/ent/node_query.go +++ b/examples/o2orecur/ent/node_query.go @@ -839,9 +839,7 @@ func (ngb *NodeGroupBy) sqlQuery() *sql.Selector { for _, f := range ngb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ngb.fields...)...) diff --git a/examples/privacyadmin/ent/migrate/migrate.go b/examples/privacyadmin/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/privacyadmin/ent/migrate/migrate.go +++ b/examples/privacyadmin/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/privacyadmin/ent/user_query.go b/examples/privacyadmin/ent/user_query.go index 8e68ac702..7647f291b 100644 --- a/examples/privacyadmin/ent/user_query.go +++ b/examples/privacyadmin/ent/user_query.go @@ -702,9 +702,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/examples/privacytenant/ent/group_query.go b/examples/privacytenant/ent/group_query.go index 72db01477..8ff6dca8e 100644 --- a/examples/privacytenant/ent/group_query.go +++ b/examples/privacytenant/ent/group_query.go @@ -884,9 +884,7 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { for _, f := range ggb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ggb.fields...)...) diff --git a/examples/privacytenant/ent/migrate/migrate.go b/examples/privacytenant/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/privacytenant/ent/migrate/migrate.go +++ b/examples/privacytenant/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/privacytenant/ent/tenant_query.go b/examples/privacytenant/ent/tenant_query.go index e5c4ddb6e..ce8be1ac4 100644 --- a/examples/privacytenant/ent/tenant_query.go +++ b/examples/privacytenant/ent/tenant_query.go @@ -702,9 +702,7 @@ func (tgb *TenantGroupBy) sqlQuery() *sql.Selector { for _, f := range tgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(tgb.fields...)...) diff --git a/examples/privacytenant/ent/user_query.go b/examples/privacytenant/ent/user_query.go index 28f682560..5258a8c3d 100644 --- a/examples/privacytenant/ent/user_query.go +++ b/examples/privacytenant/ent/user_query.go @@ -884,9 +884,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/examples/start/ent/car_query.go b/examples/start/ent/car_query.go index ed3c24310..7830b2a18 100644 --- a/examples/start/ent/car_query.go +++ b/examples/start/ent/car_query.go @@ -775,9 +775,7 @@ func (cgb *CarGroupBy) sqlQuery() *sql.Selector { for _, f := range cgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(cgb.fields...)...) diff --git a/examples/start/ent/group_query.go b/examples/start/ent/group_query.go index 3087e0266..a91d272f6 100644 --- a/examples/start/ent/group_query.go +++ b/examples/start/ent/group_query.go @@ -804,9 +804,7 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { for _, f := range ggb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ggb.fields...)...) diff --git a/examples/start/ent/migrate/migrate.go b/examples/start/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/start/ent/migrate/migrate.go +++ b/examples/start/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/start/ent/user_query.go b/examples/start/ent/user_query.go index c52c4ff09..f0d8910b2 100644 --- a/examples/start/ent/user_query.go +++ b/examples/start/ent/user_query.go @@ -870,9 +870,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/examples/traversal/ent/group_query.go b/examples/traversal/ent/group_query.go index 7d1ad0712..208107982 100644 --- a/examples/traversal/ent/group_query.go +++ b/examples/traversal/ent/group_query.go @@ -877,9 +877,7 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { for _, f := range ggb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ggb.fields...)...) diff --git a/examples/traversal/ent/migrate/migrate.go b/examples/traversal/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/traversal/ent/migrate/migrate.go +++ b/examples/traversal/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/traversal/ent/pet_query.go b/examples/traversal/ent/pet_query.go index 374f827d9..3ef805558 100644 --- a/examples/traversal/ent/pet_query.go +++ b/examples/traversal/ent/pet_query.go @@ -877,9 +877,7 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { for _, f := range pgb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(pgb.fields...)...) diff --git a/examples/traversal/ent/user_query.go b/examples/traversal/ent/user_query.go index 9d459705b..04f75571e 100644 --- a/examples/traversal/ent/user_query.go +++ b/examples/traversal/ent/user_query.go @@ -1036,9 +1036,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...) diff --git a/examples/version/ent/migrate/migrate.go b/examples/version/ent/migrate/migrate.go index 61ffeff08..711e2f5ea 100644 --- a/examples/version/ent/migrate/migrate.go +++ b/examples/version/ent/migrate/migrate.go @@ -41,8 +41,7 @@ var ( // Schema is the API for creating, migrating and dropping a schema. type Schema struct { - drv dialect.Driver - universalID bool + drv dialect.Driver } // NewSchema creates a new schema client. diff --git a/examples/version/ent/user_query.go b/examples/version/ent/user_query.go index 4562d6ab9..8e286081e 100644 --- a/examples/version/ent/user_query.go +++ b/examples/version/ent/user_query.go @@ -696,9 +696,7 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { for _, f := range ugb.fields { columns = append(columns, selector.C(f)) } - for _, c := range aggregation { - columns = append(columns, c) - } + columns = append(columns, aggregation...) selector.Select(columns...) } return selector.GroupBy(selector.Columns(ugb.fields...)...)