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

entc/gen: support count with field selection

Browse Source 
Fixed https://github.com/ent/ent/issues/2036
This commit is contained in:
Ariel Mashraki
2021-10-17 18:48:17 +03:00
committed by Ariel Mashraki
parent 732b2a7d6e
commit 3e6c40886d
92 changed files with 406 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -599,10 +599,20 @@ func (q *query) count(ctx context.Context, drv dialect.Driver) (int, error) {
if err != nil {
return 0, err
}
selector.Count(selector.C(q.Node.ID.Column))
// If no columns were selected in count,
// the default selection is by node ids.
columns := q.Node.Columns
if len(columns) == 0 {
columns = append(columns, q.Node.ID.Column)
}
for i, c := range columns {
columns[i] = selector.C(c)
}
if q.Unique {
selector.SetDistinct(false)
selector.Count(sql.Distinct(selector.C(q.Node.ID.Column)))
selector.Count(sql.Distinct(columns...))
} else {
selector.Count(columns...)
}
query, args := selector.Query()
if err := drv.Query(ctx, query, args, rows); err != nil {

11
dialect/sql/sqlgraph/graph_test.go
View File

@@ -1893,6 +1893,10 @@ func TestQueryNodes(t *testing.T) {
WithArgs(40).
WillReturnRows(sqlmock.NewRows([]string{"COUNT"}).
AddRow(3))
mock.ExpectQuery(escape("SELECT COUNT(DISTINCT `users`.`name`) FROM `users` WHERE `age` < ? ORDER BY `id` LIMIT 3 OFFSET 4 FOR UPDATE NOWAIT")).
WithArgs(40).
WillReturnRows(sqlmock.NewRows([]string{"COUNT"}).
AddRow(3))
var (
users []*user
@@ -1933,9 +1937,16 @@ func TestQueryNodes(t *testing.T) {
require.Equal(t, &user{id: 3, age: 30, name: "a8m", edges: struct{ fk1, fk2 int }{1, 1}}, users[2])
// Count nodes.
spec.Node.Columns = nil
n, err := CountNodes(context.Background(), sql.OpenDB("", db), spec)
require.NoError(t, err)
require.Equal(t, 3, n)
// Count nodes.
spec.Node.Columns = []string{"name"}
n, err = CountNodes(context.Background(), sql.OpenDB("", db), spec)
require.NoError(t, err)
require.Equal(t, 3, n)
}
func TestQueryNodesSchema(t *testing.T) {