Skip to content

Commit 1492d4d

Browse files
authored
Fixed AddDescending implementation. (#7978)
1 parent 217b2e0 commit 1492d4d

11 files changed

+139
-139
lines changed

src/GreenDonut/src/GreenDonut.Data.Primitives/SortDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public SortDefinition<T> AddDescending<TResult>(
9292
throw new ArgumentNullException(nameof(keySelector));
9393
}
9494

95-
var operations = Operations.Add(SortBy<T>.Ascending(keySelector));
95+
var operations = Operations.Add(SortBy<T>.Descending(keySelector));
9696
return new SortDefinition<T>(operations);
9797
}
9898

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/__snapshots__/IntegrationTests.Query_Brands.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,44 @@
88
"brands": {
99
"nodes": [
1010
{
11-
"id": "QnJhbmQ6OQ==",
12-
"name": "AirStrider"
11+
"id": "QnJhbmQ6MTE=",
12+
"name": "Zephyr"
1313
},
1414
{
15-
"id": "QnJhbmQ6NQ==",
16-
"name": "B&R"
15+
"id": "QnJhbmQ6MTM=",
16+
"name": "XE"
1717
},
1818
{
19-
"id": "QnJhbmQ6MQ==",
20-
"name": "Daybird"
19+
"id": "QnJhbmQ6Mw==",
20+
"name": "WildRunner"
2121
},
2222
{
23-
"id": "QnJhbmQ6Mg==",
24-
"name": "Gravitator"
23+
"id": "QnJhbmQ6Nw==",
24+
"name": "Solstix"
2525
},
2626
{
27-
"id": "QnJhbmQ6MTA=",
28-
"name": "Green Equipment"
27+
"id": "QnJhbmQ6Ng==",
28+
"name": "Raptor Elite"
2929
},
3030
{
31-
"id": "QnJhbmQ6OA==",
32-
"name": "Grolltex"
31+
"id": "QnJhbmQ6NA==",
32+
"name": "Quester"
3333
},
3434
{
3535
"id": "QnJhbmQ6MTI=",
3636
"name": "Legend"
3737
},
3838
{
39-
"id": "QnJhbmQ6NA==",
40-
"name": "Quester"
39+
"id": "QnJhbmQ6OA==",
40+
"name": "Grolltex"
4141
},
4242
{
43-
"id": "QnJhbmQ6Ng==",
44-
"name": "Raptor Elite"
43+
"id": "QnJhbmQ6MTA=",
44+
"name": "Green Equipment"
4545
},
4646
{
47-
"id": "QnJhbmQ6Nw==",
48-
"name": "Solstix"
47+
"id": "QnJhbmQ6Mg==",
48+
"name": "Gravitator"
4949
}
5050
]
5151
}
@@ -59,7 +59,7 @@
5959
-- @__p_0='11'
6060
SELECT b."Id", b."Name"
6161
FROM "Brands" AS b
62-
ORDER BY b."Name", b."Id"
62+
ORDER BY b."Name" DESC, b."Id"
6363
LIMIT @__p_0
6464
```
6565

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/__snapshots__/IntegrationTests.Query_Brands_First_2.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
"brands": {
99
"nodes": [
1010
{
11-
"id": "QnJhbmQ6OQ==",
12-
"name": "AirStrider"
11+
"id": "QnJhbmQ6MTE=",
12+
"name": "Zephyr"
1313
},
1414
{
15-
"id": "QnJhbmQ6NQ==",
16-
"name": "B&R"
15+
"id": "QnJhbmQ6MTM=",
16+
"name": "XE"
1717
}
1818
]
1919
}
@@ -27,7 +27,7 @@
2727
-- @__p_0='3'
2828
SELECT b."Id", b."Name"
2929
FROM "Brands" AS b
30-
ORDER BY b."Name", b."Id"
30+
ORDER BY b."Name" DESC, b."Id"
3131
LIMIT @__p_0
3232
```
3333

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/__snapshots__/IntegrationTests.Query_Brands_First_2_And_Products_First_2.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,33 @@
88
"brands": {
99
"nodes": [
1010
{
11-
"id": "QnJhbmQ6OQ==",
12-
"name": "AirStrider",
11+
"id": "QnJhbmQ6MTE=",
12+
"name": "Zephyr",
1313
"products": {
1414
"nodes": [
1515
{
16-
"id": "UHJvZHVjdDo5",
17-
"name": "VenturePro GPS Watch"
16+
"id": "UHJvZHVjdDoxMg==",
17+
"name": "Powder Pro Snowboard"
1818
},
1919
{
20-
"id": "UHJvZHVjdDozNA==",
21-
"name": "Velocity Red Bike Helmet"
20+
"id": "UHJvZHVjdDoyMw==",
21+
"name": "Summit Pro Climbing Harness"
2222
}
2323
]
2424
}
2525
},
2626
{
27-
"id": "QnJhbmQ6NQ==",
28-
"name": "B&R",
27+
"id": "QnJhbmQ6MTM=",
28+
"name": "XE",
2929
"products": {
3030
"nodes": [
3131
{
32-
"id": "UHJvZHVjdDo1",
33-
"name": "Blizzard Rider Snowboard"
32+
"id": "UHJvZHVjdDo3Nw==",
33+
"name": "Survivor 2-Person Tent"
3434
},
3535
{
36-
"id": "UHJvZHVjdDoyMA==",
37-
"name": "Explorer Biking Computer"
36+
"id": "UHJvZHVjdDo4MA==",
37+
"name": "Pathfinder GPS Watch"
3838
}
3939
]
4040
}
@@ -51,14 +51,14 @@
5151
-- @__p_0='3'
5252
SELECT b."Id", b."Name"
5353
FROM "Brands" AS b
54-
ORDER BY b."Name", b."Id"
54+
ORDER BY b."Name" DESC, b."Id"
5555
LIMIT @__p_0
5656
```
5757

5858
## Query 2
5959

6060
```sql
61-
-- @__brandIds_0={ '5', '9' } (DbType = Object)
61+
-- @__brandIds_0={ '11', '13' } (DbType = Object)
6262
SELECT p1."BrandId", p3."Id", p3."Name", p3."BrandId"
6363
FROM (
6464
SELECT p."BrandId"

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/__snapshots__/IntegrationTests.Query_Brands_First_2_And_Products_First_2_Name_Desc.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,33 @@
88
"brands": {
99
"nodes": [
1010
{
11-
"id": "QnJhbmQ6OQ==",
12-
"name": "AirStrider",
11+
"id": "QnJhbmQ6MTE=",
12+
"name": "Zephyr",
1313
"products": {
1414
"nodes": [
1515
{
16-
"id": "UHJvZHVjdDo5",
17-
"name": "VenturePro GPS Watch"
16+
"id": "UHJvZHVjdDoxMg==",
17+
"name": "Powder Pro Snowboard"
1818
},
1919
{
20-
"id": "UHJvZHVjdDozNA==",
21-
"name": "Velocity Red Bike Helmet"
20+
"id": "UHJvZHVjdDoyMw==",
21+
"name": "Summit Pro Climbing Harness"
2222
}
2323
]
2424
}
2525
},
2626
{
27-
"id": "QnJhbmQ6NQ==",
28-
"name": "B&R",
27+
"id": "QnJhbmQ6MTM=",
28+
"name": "XE",
2929
"products": {
3030
"nodes": [
3131
{
32-
"id": "UHJvZHVjdDo1",
33-
"name": "Blizzard Rider Snowboard"
32+
"id": "UHJvZHVjdDo3Nw==",
33+
"name": "Survivor 2-Person Tent"
3434
},
3535
{
36-
"id": "UHJvZHVjdDoyMA==",
37-
"name": "Explorer Biking Computer"
36+
"id": "UHJvZHVjdDo4MA==",
37+
"name": "Pathfinder GPS Watch"
3838
}
3939
]
4040
}
@@ -51,14 +51,14 @@
5151
-- @__p_0='3'
5252
SELECT b."Id", b."Name"
5353
FROM "Brands" AS b
54-
ORDER BY b."Name", b."Id"
54+
ORDER BY b."Name" DESC, b."Id"
5555
LIMIT @__p_0
5656
```
5757

5858
## Query 2
5959

6060
```sql
61-
-- @__brandIds_0={ '5', '9' } (DbType = Object)
61+
-- @__brandIds_0={ '11', '13' } (DbType = Object)
6262
SELECT p1."BrandId", p3."Id", p3."Name", p3."BrandId"
6363
FROM (
6464
SELECT p."BrandId"

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/__snapshots__/IntegrationTests.Query_Brands_First_2_And_Products_First_2_Name_Desc_Brand_Name.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,42 @@
88
"brands": {
99
"nodes": [
1010
{
11-
"id": "QnJhbmQ6OQ==",
11+
"id": "QnJhbmQ6MTE=",
1212
"products": {
1313
"nodes": [
1414
{
15-
"id": "UHJvZHVjdDo5",
16-
"name": "VenturePro GPS Watch",
15+
"id": "UHJvZHVjdDoxMg==",
16+
"name": "Powder Pro Snowboard",
1717
"brand": {
18-
"name": "AirStrider"
18+
"name": "Zephyr"
1919
}
2020
},
2121
{
22-
"id": "UHJvZHVjdDozNA==",
23-
"name": "Velocity Red Bike Helmet",
22+
"id": "UHJvZHVjdDoyMw==",
23+
"name": "Summit Pro Climbing Harness",
2424
"brand": {
25-
"name": "AirStrider"
25+
"name": "Zephyr"
2626
}
2727
}
2828
]
2929
}
3030
},
3131
{
32-
"id": "QnJhbmQ6NQ==",
32+
"id": "QnJhbmQ6MTM=",
3333
"products": {
3434
"nodes": [
3535
{
36-
"id": "UHJvZHVjdDo1",
37-
"name": "Blizzard Rider Snowboard",
36+
"id": "UHJvZHVjdDo3Nw==",
37+
"name": "Survivor 2-Person Tent",
3838
"brand": {
39-
"name": "B&R"
39+
"name": "XE"
4040
}
4141
},
4242
{
43-
"id": "UHJvZHVjdDoyMA==",
44-
"name": "Explorer Biking Computer",
43+
"id": "UHJvZHVjdDo4MA==",
44+
"name": "Pathfinder GPS Watch",
4545
"brand": {
46-
"name": "B&R"
46+
"name": "XE"
4747
}
4848
}
4949
]
@@ -61,14 +61,14 @@
6161
-- @__p_0='3'
6262
SELECT b."Id", b."Name"
6363
FROM "Brands" AS b
64-
ORDER BY b."Name", b."Id"
64+
ORDER BY b."Name" DESC, b."Id"
6565
LIMIT @__p_0
6666
```
6767

6868
## Query 2
6969

7070
```sql
71-
-- @__brandIds_0={ '5', '9' } (DbType = Object)
71+
-- @__brandIds_0={ '11', '13' } (DbType = Object)
7272
SELECT p1."BrandId", p3."Id", p3."Name", p3."BrandId"
7373
FROM (
7474
SELECT p."BrandId"
@@ -91,7 +91,7 @@ ORDER BY p1."BrandId"
9191
## Query 3
9292

9393
```sql
94-
-- @__ids_0={ '5', '9' } (DbType = Object)
94+
-- @__ids_0={ '11', '13' } (DbType = Object)
9595
SELECT b."Id", b."Name"
9696
FROM "Brands" AS b
9797
WHERE b."Id" = ANY (@__ids_0)

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/__snapshots__/IntegrationTests.Query_Brands_First_2_And_Products_First_2_Name_Desc_Brand_Name__net_8_0.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,42 @@
88
"brands": {
99
"nodes": [
1010
{
11-
"id": "QnJhbmQ6OQ==",
11+
"id": "QnJhbmQ6MTE=",
1212
"products": {
1313
"nodes": [
1414
{
15-
"id": "UHJvZHVjdDo5",
16-
"name": "VenturePro GPS Watch",
15+
"id": "UHJvZHVjdDoxMg==",
16+
"name": "Powder Pro Snowboard",
1717
"brand": {
18-
"name": "AirStrider"
18+
"name": "Zephyr"
1919
}
2020
},
2121
{
22-
"id": "UHJvZHVjdDozNA==",
23-
"name": "Velocity Red Bike Helmet",
22+
"id": "UHJvZHVjdDoyMw==",
23+
"name": "Summit Pro Climbing Harness",
2424
"brand": {
25-
"name": "AirStrider"
25+
"name": "Zephyr"
2626
}
2727
}
2828
]
2929
}
3030
},
3131
{
32-
"id": "QnJhbmQ6NQ==",
32+
"id": "QnJhbmQ6MTM=",
3333
"products": {
3434
"nodes": [
3535
{
36-
"id": "UHJvZHVjdDo1",
37-
"name": "Blizzard Rider Snowboard",
36+
"id": "UHJvZHVjdDo3Nw==",
37+
"name": "Survivor 2-Person Tent",
3838
"brand": {
39-
"name": "B&R"
39+
"name": "XE"
4040
}
4141
},
4242
{
43-
"id": "UHJvZHVjdDoyMA==",
44-
"name": "Explorer Biking Computer",
43+
"id": "UHJvZHVjdDo4MA==",
44+
"name": "Pathfinder GPS Watch",
4545
"brand": {
46-
"name": "B&R"
46+
"name": "XE"
4747
}
4848
}
4949
]
@@ -61,14 +61,14 @@
6161
-- @__p_0='3'
6262
SELECT b."Id", b."Name"
6363
FROM "Brands" AS b
64-
ORDER BY b."Name", b."Id"
64+
ORDER BY b."Name" DESC, b."Id"
6565
LIMIT @__p_0
6666
```
6767

6868
## Query 2
6969

7070
```sql
71-
-- @__brandIds_0={ '5', '9' } (DbType = Object)
71+
-- @__brandIds_0={ '11', '13' } (DbType = Object)
7272
SELECT t."BrandId", t0."Id", t0."Name", t0."BrandId"
7373
FROM (
7474
SELECT p."BrandId"
@@ -91,7 +91,7 @@ ORDER BY t."BrandId"
9191
## Query 3
9292

9393
```sql
94-
-- @__ids_0={ '5', '9' } (DbType = Object)
94+
-- @__ids_0={ '11', '13' } (DbType = Object)
9595
SELECT b."Id", b."Name"
9696
FROM "Brands" AS b
9797
WHERE b."Id" = ANY (@__ids_0)

0 commit comments

Comments
 (0)