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

dialect/sql/sqlgraph: allow selecting order by terms (#3439)

Browse Source
This commit is contained in:
Ariel Mashraki
2023-04-04 14:00:35 +03:00
committed by GitHub
parent 4c332f7bba
commit 0e7203655e
3 changed files with 69 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -969,6 +969,21 @@ func TestOrderByNeighborsCount(t *testing.T) {
require.Empty(t, args)
require.Equal(t, `SELECT "users"."name" FROM "users" ORDER BY "owner_id" IS NOT NULL`, query)
})
t.Run("Selected", func(t *testing.T) {
s := s.Clone()
OrderByNeighborsCount(s, NewOrderBy(
NewStep(
From("users", "id"),
To("pets", "owner_id"),
Edge(O2M, false, "pets", "owner_id"),
),
OrderByExprDesc(nil, "count_pets"),
OrderBySelected(),
))
query, args := s.Query()
require.Empty(t, args)
require.Equal(t, `SELECT "users"."name", "count_pets" FROM "users" LEFT JOIN (SELECT "pets"."owner_id", COUNT(*) AS "count_pets" FROM "pets" GROUP BY "pets"."owner_id") AS "t1" ON "users"."id" = "t1"."owner_id" ORDER BY "t1"."count_pets" DESC NULLS LAST`, query)
})
}
func TestOrderByNeighborTerms(t *testing.T) {
@@ -1028,6 +1043,28 @@ func TestOrderByNeighborTerms(t *testing.T) {
require.Empty(t, args)
require.Equal(t, `SELECT "users"."name" FROM "users" LEFT JOIN (SELECT "user_id", (SUM("num_users")) AS "total_users" FROM "group" JOIN "user_groups" AS "t1" ON "group"."id" = "t1"."group_id" GROUP BY "user_id") AS "t1" ON "users"."id" = "t1"."user_id" ORDER BY "t1"."total_users" NULLS FIRST`, query)
})
t.Run("Selected", func(t *testing.T) {
t1 := build.Table("users")
s := build.Select(t1.C("name")).
From(t1)
OrderByNeighborTerms(s, NewOrderBy(
NewStep(
From("users", "id"),
To("group", "id"),
Edge(M2M, false, "user_groups", "user_id", "group_id"),
),
OrderByExpr(
sql.ExprFunc(func(b *sql.Builder) {
b.S("SUM(").Ident("num_users").S(")")
}),
"total_users",
),
OrderBySelected(),
))
query, args := s.Query()
require.Empty(t, args)
require.Equal(t, `SELECT "users"."name", "total_users" FROM "users" LEFT JOIN (SELECT "user_id", (SUM("num_users")) AS "total_users" FROM "group" JOIN "user_groups" AS "t1" ON "group"."id" = "t1"."group_id" GROUP BY "user_id") AS "t1" ON "users"."id" = "t1"."user_id" ORDER BY "t1"."total_users" NULLS FIRST`, query)
})
}
func TestCreateNode(t *testing.T) {