Skip to content

Commit 4e61430

Browse files
rojiroji
committed
Sync to EF 10.0.0-alpha.1.24620.1
1 parent 068a7c6 commit 4e61430

32 files changed

+2124
-2184
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
pull_request:
1212

1313
env:
14-
dotnet_sdk_version: '10.0.100-alpha.1.24620.13'
14+
dotnet_sdk_version: '10.0.100-alpha.1.25059.31'
1515
postgis_version: 3
1616
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
1717

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
- cron: '30 22 * * 6'
2828

2929
env:
30-
dotnet_sdk_version: '10.0.100-alpha.1.24620.13'
30+
dotnet_sdk_version: '10.0.100-alpha.1.25059.31'
3131

3232
jobs:
3333
analyze:

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<EFCoreVersion>10.0.0-alpha.1.24620.1</EFCoreVersion>
4-
<MicrosoftExtensionsVersion>10.0.0-alpha.1.24616.1</MicrosoftExtensionsVersion>
3+
<EFCoreVersion>10.0.0-alpha.1.25070.1</EFCoreVersion>
4+
<MicrosoftExtensionsVersion>10.0.0-alpha.1.25068.1</MicrosoftExtensionsVersion>
55
<NpgsqlVersion>9.0.2</NpgsqlVersion>
66
</PropertyGroup>
77

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-alpha.1.24620.13",
3+
"version": "10.0.100-alpha.1.25059.31",
44
"rollForward": "latestMajor",
55
"allowPrerelease": true
66
}

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

Lines changed: 49 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ public override async Task Update_property_inside_complex_type(bool async)
2929

3030
AssertExecuteUpdateSql(
3131
"""
32+
@p='12345'
33+
3234
UPDATE "Customer" AS c
33-
SET "ShippingAddress_ZipCode" = 12345
35+
SET "ShippingAddress_ZipCode" = @p
3436
WHERE c."ShippingAddress_ZipCode" = 7728
3537
""");
3638
}
@@ -41,8 +43,10 @@ public override async Task Update_property_inside_nested_complex_type(bool async
4143

4244
AssertExecuteUpdateSql(
4345
"""
46+
@p='United States Modified'
47+
4448
UPDATE "Customer" AS c
45-
SET "ShippingAddress_Country_FullName" = 'United States Modified'
49+
SET "ShippingAddress_Country_FullName" = @p
4650
WHERE c."ShippingAddress_Country_Code" = 'US'
4751
""");
4852
}
@@ -53,10 +57,12 @@ public override async Task Update_multiple_properties_inside_multiple_complex_ty
5357

5458
AssertExecuteUpdateSql(
5559
"""
60+
@p='54321'
61+
5662
UPDATE "Customer" AS c
57-
SET "BillingAddress_ZipCode" = 54321,
63+
SET "Name" = c."Name" || 'Modified',
5864
"ShippingAddress_ZipCode" = c."BillingAddress_ZipCode",
59-
"Name" = c."Name" || 'Modified'
65+
"BillingAddress_ZipCode" = @p
6066
WHERE c."ShippingAddress_ZipCode" = 7728
6167
""");
6268
}
@@ -67,8 +73,10 @@ public override async Task Update_projected_complex_type(bool async)
6773

6874
AssertExecuteUpdateSql(
6975
"""
76+
@p='12345'
77+
7078
UPDATE "Customer" AS c
71-
SET "ShippingAddress_ZipCode" = 12345
79+
SET "ShippingAddress_ZipCode" = @p
7280
""");
7381
}
7482

@@ -78,9 +86,11 @@ public override async Task Update_multiple_projected_complex_types_via_anonymous
7886

7987
AssertExecuteUpdateSql(
8088
"""
89+
@p='54321'
90+
8191
UPDATE "Customer" AS c
82-
SET "BillingAddress_ZipCode" = 54321,
83-
"ShippingAddress_ZipCode" = c."BillingAddress_ZipCode"
92+
SET "ShippingAddress_ZipCode" = c."BillingAddress_ZipCode",
93+
"BillingAddress_ZipCode" = @p
8494
""");
8595
}
8696

@@ -97,20 +107,20 @@ public override async Task Update_complex_type_to_parameter(bool async)
97107

98108
AssertExecuteUpdateSql(
99109
"""
100-
@complex_type_newAddress_AddressLine1='New AddressLine1'
101-
@complex_type_newAddress_AddressLine2='New AddressLine2'
102-
@complex_type_newAddress_Tags={ 'new_tag1', 'new_tag2' } (DbType = Object)
103-
@complex_type_newAddress_ZipCode='99999' (Nullable = true)
104-
@complex_type_newAddress_Code='FR'
105-
@complex_type_newAddress_FullName='France'
110+
@complex_type_p_AddressLine1='New AddressLine1'
111+
@complex_type_p_AddressLine2='New AddressLine2'
112+
@complex_type_p_Tags={ 'new_tag1', 'new_tag2' } (DbType = Object)
113+
@complex_type_p_ZipCode='99999' (Nullable = true)
114+
@complex_type_p_Code='FR'
115+
@complex_type_p_FullName='France'
106116
107117
UPDATE "Customer" AS c
108-
SET "ShippingAddress_AddressLine1" = @complex_type_newAddress_AddressLine1,
109-
"ShippingAddress_AddressLine2" = @complex_type_newAddress_AddressLine2,
110-
"ShippingAddress_Tags" = @complex_type_newAddress_Tags,
111-
"ShippingAddress_ZipCode" = @complex_type_newAddress_ZipCode,
112-
"ShippingAddress_Country_Code" = @complex_type_newAddress_Code,
113-
"ShippingAddress_Country_FullName" = @complex_type_newAddress_FullName
118+
SET "ShippingAddress_AddressLine1" = @complex_type_p_AddressLine1,
119+
"ShippingAddress_AddressLine2" = @complex_type_p_AddressLine2,
120+
"ShippingAddress_Tags" = @complex_type_p_Tags,
121+
"ShippingAddress_ZipCode" = @complex_type_p_ZipCode,
122+
"ShippingAddress_Country_Code" = @complex_type_p_Code,
123+
"ShippingAddress_Country_FullName" = @complex_type_p_FullName
114124
""");
115125
}
116126

@@ -120,12 +130,12 @@ public override async Task Update_nested_complex_type_to_parameter(bool async)
120130

121131
AssertExecuteUpdateSql(
122132
"""
123-
@complex_type_newCountry_Code='FR'
124-
@complex_type_newCountry_FullName='France'
133+
@complex_type_p_Code='FR'
134+
@complex_type_p_FullName='France'
125135
126136
UPDATE "Customer" AS c
127-
SET "ShippingAddress_Country_Code" = @complex_type_newCountry_Code,
128-
"ShippingAddress_Country_FullName" = @complex_type_newCountry_FullName
137+
SET "ShippingAddress_Country_Code" = @complex_type_p_Code,
138+
"ShippingAddress_Country_FullName" = @complex_type_p_FullName
129139
""");
130140
}
131141

@@ -151,13 +161,20 @@ public override async Task Update_complex_type_to_inline_without_lambda(bool asy
151161

152162
AssertExecuteUpdateSql(
153163
"""
164+
@complex_type_p_AddressLine1='New AddressLine1'
165+
@complex_type_p_AddressLine2='New AddressLine2'
166+
@complex_type_p_Tags={ 'new_tag1', 'new_tag2' } (DbType = Object)
167+
@complex_type_p_ZipCode='99999' (Nullable = true)
168+
@complex_type_p_Code='FR'
169+
@complex_type_p_FullName='France'
170+
154171
UPDATE "Customer" AS c
155-
SET "ShippingAddress_AddressLine1" = 'New AddressLine1',
156-
"ShippingAddress_AddressLine2" = 'New AddressLine2',
157-
"ShippingAddress_Tags" = ARRAY['new_tag1','new_tag2']::text[],
158-
"ShippingAddress_ZipCode" = 99999,
159-
"ShippingAddress_Country_Code" = 'FR',
160-
"ShippingAddress_Country_FullName" = 'France'
172+
SET "ShippingAddress_AddressLine1" = @complex_type_p_AddressLine1,
173+
"ShippingAddress_AddressLine2" = @complex_type_p_AddressLine2,
174+
"ShippingAddress_Tags" = @complex_type_p_Tags,
175+
"ShippingAddress_ZipCode" = @complex_type_p_ZipCode,
176+
"ShippingAddress_Country_Code" = @complex_type_p_Code,
177+
"ShippingAddress_Country_FullName" = @complex_type_p_FullName
161178
""");
162179
}
163180

@@ -208,8 +225,10 @@ public override async Task Update_collection_inside_complex_type(bool async)
208225

209226
AssertExecuteUpdateSql(
210227
"""
228+
@p={ 'new_tag1', 'new_tag2' } (DbType = Object)
229+
211230
UPDATE "Customer" AS c
212-
SET "ShippingAddress_Tags" = ARRAY['new_tag1','new_tag2']::text[]
231+
SET "ShippingAddress_Tags" = @p
213232
""");
214233
}
215234

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ public override async Task Replace_ColumnExpression_in_column_setter(bool async)
5353

5454
AssertSql(
5555
"""
56+
@p='SomeValue'
57+
5658
UPDATE "OwnedCollection" AS o0
57-
SET "Value" = 'SomeValue'
59+
SET "Value" = @p
5860
FROM "Owner" AS o
5961
WHERE o."Id" = o0."OwnerId"
6062
""");
@@ -73,8 +75,10 @@ public override async Task Update_non_owned_property_on_entity_with_owned(bool a
7375

7476
AssertSql(
7577
"""
78+
@p='SomeValue'
79+
7680
UPDATE "Owner" AS o
77-
SET "Title" = 'SomeValue'
81+
SET "Title" = @p
7882
""");
7983
}
8084

@@ -111,8 +115,10 @@ public override async Task Update_non_owned_property_on_entity_with_owned_in_joi
111115

112116
AssertSql(
113117
"""
118+
@p='NewValue'
119+
114120
UPDATE "Owner" AS o
115-
SET "Title" = 'NewValue'
121+
SET "Title" = @p
116122
FROM "Owner" AS o0
117123
WHERE o."Id" = o0."Id"
118124
""");
@@ -125,8 +131,8 @@ public override async Task Update_owned_and_non_owned_properties_with_table_shar
125131
AssertSql(
126132
"""
127133
UPDATE "Owner" AS o
128-
SET "OwnedReference_Number" = length(o."Title")::int,
129-
"Title" = COALESCE(o."OwnedReference_Number"::text, '')
134+
SET "Title" = COALESCE(o."OwnedReference_Number"::text, ''),
135+
"OwnedReference_Number" = length(o."Title")::int
130136
""");
131137
}
132138

@@ -169,8 +175,8 @@ public override async Task Update_non_main_table_in_entity_with_entity_splitting
169175
AssertSql(
170176
"""
171177
UPDATE "BlogsPart1" AS b0
172-
SET "Rating" = length(b0."Title")::int,
173-
"Title" = b0."Rating"::text
178+
SET "Title" = b0."Rating"::text,
179+
"Rating" = length(b0."Title")::int
174180
FROM "Blogs" AS b
175181
WHERE b."Id" = b0."Id"
176182
""");
@@ -252,8 +258,10 @@ public override async Task Update_with_view_mapping(bool async)
252258

253259
AssertSql(
254260
"""
261+
@p='Updated'
262+
255263
UPDATE "Blogs" AS b
256-
SET "Data" = 'Updated'
264+
SET "Data" = @p
257265
""");
258266
}
259267

0 commit comments

Comments
 (0)