Skip to content

Commit 2679a9d

Browse files
rojiroji
committed
Bump dependencies
1 parent be797de commit 2679a9d

23 files changed

+1666
-72
lines changed

‎Directory.Packages.props‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project>
22
<PropertyGroup>
3-
<EFCoreVersion>10.0.0</EFCoreVersion>
4-
<MicrosoftExtensionsVersion>10.0.0</MicrosoftExtensionsVersion>
5-
<NpgsqlVersion>10.0.0</NpgsqlVersion>
3+
<EFCoreVersion>10.0.4</EFCoreVersion>
4+
<MicrosoftExtensionsVersion>10.0.4</MicrosoftExtensionsVersion>
5+
<NpgsqlVersion>10.0.2</NpgsqlVersion>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<!--
1010
Dependencies on EF preview versions should be locked to a specific version (as provider-facing breaking changes are frequent).
1111
For released versions, depend on anything in the current major version to allow users to update to higher patch versions.
1212
-->
13-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="[10.0.0,11.0.0)" />
14-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="[10.0.0,11.0.0)" />
15-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Abstractions" Version="[10.0.0,11.0.0)" />
16-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="[10.0.0,11.0.0)" />
17-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="[10.0.0,11.0.0)" />
13+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="[10.0.4,11.0.0)" />
14+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="[10.0.4,11.0.0)" />
15+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Abstractions" Version="[10.0.4,11.0.0)" />
16+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="[10.0.4,11.0.0)" />
17+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="[10.0.4,11.0.0)" />
1818

1919
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsVersion)" />
2020
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsVersion)" />
@@ -25,12 +25,12 @@
2525
<PackageVersion Include="Npgsql.NetTopologySuite" Version="$(NpgsqlVersion)" />
2626
<PackageVersion Include="Npgsql.DependencyInjection" Version="$(NpgsqlVersion)" />
2727

28-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
29-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
28+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.200" />
29+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
3030
<PackageVersion Include="xunit" Version="2.9.3" />
3131
<PackageVersion Include="xunit.assert" Version="2.9.3" />
3232
<PackageVersion Include="xunit.core" Version="2.9.3" />
3333
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
34-
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
34+
<PackageVersion Include="GitHubActionsTestLogger" Version="3.0.1" />
3535
</ItemGroup>
3636
</Project>

‎test/EFCore.PG.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesNpgsqlTest.cs‎

Lines changed: 50 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ public override async Task Delete_Where_Skip_Take_Skip_Take_causing_subquery(boo
256256
AssertSql(
257257
"""
258258
@p='100'
259-
@p2='5'
260-
@p1='20'
259+
@p3='5'
260+
@p2='20'
261261
262262
DELETE FROM "Order Details" AS o
263263
WHERE EXISTS (
@@ -270,7 +270,7 @@ SELECT 1
270270
WHERE o1."OrderID" < 10300
271271
LIMIT @p OFFSET @p
272272
) AS o0
273-
LIMIT @p2 OFFSET @p1
273+
LIMIT @p3 OFFSET @p2
274274
) AS o2
275275
WHERE o2."OrderID" = o."OrderID" AND o2."ProductID" = o."ProductID")
276276
""");
@@ -495,7 +495,7 @@ public override async Task Delete_with_join(bool async)
495495

496496
AssertSql(
497497
"""
498-
@p0='100'
498+
@p1='100'
499499
@p='0'
500500
501501
DELETE FROM "Order Details" AS o
@@ -504,7 +504,7 @@ SELECT o0."OrderID"
504504
FROM "Orders" AS o0
505505
WHERE o0."OrderID" < 10300
506506
ORDER BY o0."OrderID" NULLS FIRST
507-
LIMIT @p0 OFFSET @p
507+
LIMIT @p1 OFFSET @p
508508
) AS o1
509509
WHERE o."OrderID" = o1."OrderID"
510510
""");
@@ -516,7 +516,7 @@ public override async Task Delete_with_LeftJoin(bool async)
516516

517517
AssertSql(
518518
"""
519-
@p0='100'
519+
@p1='100'
520520
@p='0'
521521
522522
DELETE FROM "Order Details" AS o
@@ -528,7 +528,7 @@ SELECT o2."OrderID"
528528
FROM "Orders" AS o2
529529
WHERE o2."OrderID" < 10300
530530
ORDER BY o2."OrderID" NULLS FIRST
531-
LIMIT @p0 OFFSET @p
531+
LIMIT @p1 OFFSET @p
532532
) AS o1 ON o0."OrderID" = o1."OrderID"
533533
WHERE o0."OrderID" < 10276 AND o0."OrderID" = o."OrderID" AND o0."ProductID" = o."ProductID")
534534
""");
@@ -540,7 +540,7 @@ public override async Task Delete_with_LeftJoin_via_flattened_GroupJoin(bool asy
540540

541541
AssertSql(
542542
"""
543-
@p0='100'
543+
@p1='100'
544544
@p='0'
545545
546546
DELETE FROM "Order Details" AS o
@@ -552,7 +552,7 @@ SELECT o2."OrderID"
552552
FROM "Orders" AS o2
553553
WHERE o2."OrderID" < 10300
554554
ORDER BY o2."OrderID" NULLS FIRST
555-
LIMIT @p0 OFFSET @p
555+
LIMIT @p1 OFFSET @p
556556
) AS o1 ON o0."OrderID" = o1."OrderID"
557557
WHERE o0."OrderID" < 10276 AND o0."OrderID" = o."OrderID" AND o0."ProductID" = o."ProductID")
558558
""");
@@ -627,7 +627,7 @@ public override async Task Delete_with_RightJoin(bool async)
627627

628628
AssertSql(
629629
"""
630-
@p0='100'
630+
@p1='100'
631631
@p='0'
632632
633633
DELETE FROM "Order Details" AS o
@@ -639,7 +639,7 @@ SELECT o2."OrderID"
639639
FROM "Orders" AS o2
640640
WHERE o2."OrderID" < 10300
641641
ORDER BY o2."OrderID" NULLS FIRST
642-
LIMIT @p0 OFFSET @p
642+
LIMIT @p1 OFFSET @p
643643
) AS o1 ON o0."OrderID" = o1."OrderID"
644644
WHERE o0."OrderID" < 10276 AND o0."OrderID" = o."OrderID" AND o0."ProductID" = o."ProductID")
645645
""");
@@ -817,11 +817,11 @@ public override async Task Update_Where_OrderBy_Skip_set_constant(bool async)
817817

818818
AssertExecuteUpdateSql(
819819
"""
820-
@p0='Updated'
820+
@p1='Updated'
821821
@p='4'
822822
823823
UPDATE "Customers" AS c0
824-
SET "ContactName" = @p0
824+
SET "ContactName" = @p1
825825
FROM (
826826
SELECT c."CustomerID"
827827
FROM "Customers" AS c
@@ -839,11 +839,11 @@ public override async Task Update_Where_OrderBy_Take_set_constant(bool async)
839839

840840
AssertExecuteUpdateSql(
841841
"""
842-
@p0='Updated'
842+
@p1='Updated'
843843
@p='4'
844844
845845
UPDATE "Customers" AS c0
846-
SET "ContactName" = @p0
846+
SET "ContactName" = @p1
847847
FROM (
848848
SELECT c."CustomerID"
849849
FROM "Customers" AS c
@@ -861,18 +861,18 @@ public override async Task Update_Where_OrderBy_Skip_Take_set_constant(bool asyn
861861

862862
AssertExecuteUpdateSql(
863863
"""
864-
@p1='Updated'
865-
@p0='4'
864+
@p2='Updated'
865+
@p1='4'
866866
@p='2'
867867
868868
UPDATE "Customers" AS c0
869-
SET "ContactName" = @p1
869+
SET "ContactName" = @p2
870870
FROM (
871871
SELECT c."CustomerID"
872872
FROM "Customers" AS c
873873
WHERE c."CustomerID" LIKE 'F%'
874874
ORDER BY c."City" NULLS FIRST
875-
LIMIT @p0 OFFSET @p
875+
LIMIT @p1 OFFSET @p
876876
) AS c1
877877
WHERE c0."CustomerID" = c1."CustomerID"
878878
""");
@@ -884,20 +884,20 @@ public override async Task Update_Where_OrderBy_Skip_Take_Skip_Take_set_constant
884884

885885
AssertExecuteUpdateSql(
886886
"""
887-
@p3='Updated'
888-
@p0='6'
887+
@p4='Updated'
888+
@p1='6'
889889
@p='2'
890890
891891
UPDATE "Customers" AS c1
892-
SET "ContactName" = @p3
892+
SET "ContactName" = @p4
893893
FROM (
894894
SELECT c0."CustomerID"
895895
FROM (
896896
SELECT c."CustomerID", c."City"
897897
FROM "Customers" AS c
898898
WHERE c."CustomerID" LIKE 'F%'
899899
ORDER BY c."City" NULLS FIRST
900-
LIMIT @p0 OFFSET @p
900+
LIMIT @p1 OFFSET @p
901901
) AS c0
902902
ORDER BY c0."City" NULLS FIRST
903903
LIMIT @p OFFSET @p
@@ -1611,6 +1611,33 @@ await AssertUpdate(
16111611
""");
16121612
}
16131613

1614+
public override async Task Update_with_PK_pushdown_and_join_and_multiple_setters(bool async)
1615+
{
1616+
await base.Update_with_PK_pushdown_and_join_and_multiple_setters(async);
1617+
1618+
AssertExecuteUpdateSql(
1619+
"""
1620+
@p='1'
1621+
@p2='10'
1622+
1623+
UPDATE "Order Details" AS o2
1624+
SET "Quantity" = @p::smallint,
1625+
"UnitPrice" = @p2
1626+
FROM (
1627+
SELECT o1."OrderID", o1."ProductID"
1628+
FROM (
1629+
SELECT o."OrderID", o."ProductID"
1630+
FROM "Order Details" AS o
1631+
ORDER BY o."OrderID" NULLS FIRST
1632+
OFFSET @p
1633+
) AS o1
1634+
INNER JOIN "Orders" AS o0 ON o1."OrderID" = o0."OrderID"
1635+
WHERE o0."CustomerID" = 'ALFKI'
1636+
) AS s
1637+
WHERE o2."OrderID" = s."OrderID" AND o2."ProductID" = s."ProductID"
1638+
""");
1639+
}
1640+
16141641
[ConditionalFact]
16151642
public virtual void Check_all_tests_overridden()
16161643
=> TestHelpers.AssertAllMethodsOverridden(GetType());

‎test/EFCore.PG.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesNpgsqlTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,11 @@ public override async Task Update_base_and_derived_types(bool async)
174174
AssertExecuteUpdateSql(
175175
"""
176176
@p='Kiwi'
177-
@p0='0'
177+
@p1='0'
178178
179179
UPDATE "Kiwi" AS k
180180
SET "Name" = @p,
181-
"FoundOn" = @p0
181+
"FoundOn" = @p1
182182
WHERE k."CountryId" = 1
183183
""");
184184
}

‎test/EFCore.PG.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesNpgsqlTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,11 @@ public override async Task Update_base_and_derived_types(bool async)
172172
AssertExecuteUpdateSql(
173173
"""
174174
@p='Kiwi'
175-
@p0='0'
175+
@p1='0'
176176
177177
UPDATE "Kiwi" AS k
178178
SET "Name" = @p,
179-
"FoundOn" = @p0
179+
"FoundOn" = @p1
180180
""");
181181
}
182182

‎test/EFCore.PG.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesNpgsqlTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public override async Task Delete_where_hierarchy_subquery(bool async)
132132

133133
AssertSql(
134134
"""
135-
@p0='3'
135+
@p1='3'
136136
@p='0'
137137
138138
DELETE FROM "Animals" AS a
@@ -141,7 +141,7 @@ SELECT a0."Id"
141141
FROM "Animals" AS a0
142142
WHERE a0."CountryId" = 1 AND a0."Name" = 'Great spotted kiwi'
143143
ORDER BY a0."Name" NULLS FIRST
144-
LIMIT @p0 OFFSET @p
144+
LIMIT @p1 OFFSET @p
145145
)
146146
""");
147147
}
@@ -188,11 +188,11 @@ public override async Task Update_base_and_derived_types(bool async)
188188
AssertExecuteUpdateSql(
189189
"""
190190
@p='Kiwi'
191-
@p0='0'
191+
@p1='0'
192192
193193
UPDATE "Animals" AS a
194194
SET "Name" = @p,
195-
"FoundOn" = @p0
195+
"FoundOn" = @p1
196196
WHERE a."Discriminator" = 'Kiwi' AND a."CountryId" = 1
197197
""");
198198
}

‎test/EFCore.PG.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesNpgsqlTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public override async Task Delete_where_hierarchy_subquery(bool async)
9696

9797
AssertSql(
9898
"""
99-
@p0='3'
99+
@p1='3'
100100
@p='0'
101101
102102
DELETE FROM "Animals" AS a
@@ -105,7 +105,7 @@ SELECT a0."Id"
105105
FROM "Animals" AS a0
106106
WHERE a0."Name" = 'Great spotted kiwi'
107107
ORDER BY a0."Name" NULLS FIRST
108-
LIMIT @p0 OFFSET @p
108+
LIMIT @p1 OFFSET @p
109109
)
110110
""");
111111
}
@@ -198,11 +198,11 @@ public override async Task Update_base_and_derived_types(bool async)
198198
AssertExecuteUpdateSql(
199199
"""
200200
@p='Kiwi'
201-
@p0='0'
201+
@p1='0'
202202
203203
UPDATE "Animals" AS a
204204
SET "Name" = @p,
205-
"FoundOn" = @p0
205+
"FoundOn" = @p1
206206
WHERE a."Discriminator" = 'Kiwi'
207207
""");
208208
}

‎test/EFCore.PG.FunctionalTests/Query/AdHocComplexTypeQueryNpgsqlTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Microsoft.EntityFrameworkCore.Query;
22

3-
public class AdHocComplexTypeQueryNpgsqlTest(NonSharedFixture fixture) : AdHocComplexTypeQueryTestBase(fixture)
3+
public class AdHocComplexTypeQueryNpgsqlTest(NonSharedFixture fixture) : AdHocComplexTypeQueryRelationalTestBase(fixture)
44
{
55
// Test is SQL Server-specific and being removed, https://github.com/dotnet/efcore/pull/37177
66
public override Task Complex_type_equality_with_non_default_type_mapping()

‎test/EFCore.PG.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonBulkUpdateNpgsqlTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,10 +361,10 @@ public override async Task Update_multiple_properties_inside_same_associate()
361361
AssertExecuteUpdateSql(
362362
"""
363363
@p='?'
364-
@p0='?' (DbType = Int32)
364+
@p1='?' (DbType = Int32)
365365
366366
UPDATE "RootEntity" AS r
367-
SET "RequiredAssociate" = jsonb_set(jsonb_set(r."RequiredAssociate", '{String}', to_jsonb(@p)), '{Int}', to_jsonb(@p0))
367+
SET "RequiredAssociate" = jsonb_set(jsonb_set(r."RequiredAssociate", '{String}', to_jsonb(@p)), '{Int}', to_jsonb(@p1))
368368
""");
369369
}
370370

‎test/EFCore.PG.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonCollectionNpgsqlTest.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,18 @@ public override async Task Index_column()
161161
""");
162162
}
163163

164+
public override async Task Index_on_nested_collection()
165+
{
166+
await base.Index_on_nested_collection();
167+
168+
AssertSql(
169+
"""
170+
SELECT r."Id", r."Name", r."AssociateCollection", r."OptionalAssociate", r."RequiredAssociate"
171+
FROM "RootEntity" AS r
172+
WHERE (CAST(r."RequiredAssociate" #>> '{NestedCollection,0,Int}' AS integer)) = 8
173+
""");
174+
}
175+
164176
public override async Task Index_out_of_bounds()
165177
{
166178
await base.Index_out_of_bounds();

‎test/EFCore.PG.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousNpgsqlTest.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,19 @@ public override async Task Where_HasValue_on_nullable_value_type()
8686

8787
#endregion Value types
8888

89+
public override async Task FromSql_on_root()
90+
{
91+
await base.FromSql_on_root();
92+
93+
AssertSql(
94+
"""
95+
SELECT m."Id", m."Name", m."AssociateCollection", m."OptionalAssociate", m."RequiredAssociate"
96+
FROM (
97+
SELECT * FROM "RootEntity"
98+
) AS m
99+
""");
100+
}
101+
89102
[ConditionalFact]
90103
public virtual void Check_all_tests_overridden()
91104
=> TestHelpers.AssertAllMethodsOverridden(GetType());

0 commit comments

Comments
 (0)