Sync to EF 10.0.0-alpha.1.24620.1 (#3435)

npgsql · Jan 20, 2025 · 44bdcfd · 44bdcfd
1 parent 068a7c6
commit 44bdcfd
Show file tree

Hide file tree

Showing 32 changed files with 2,124 additions and 2,184 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ on:
   pull_request:
 
 env:
-  dotnet_sdk_version: '10.0.100-alpha.1.24620.13'
+  dotnet_sdk_version: '10.0.100-alpha.1.25059.31'
   postgis_version: 3
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -27,7 +27,7 @@ on:
     - cron: '30 22 * * 6'
 
 env:
-  dotnet_sdk_version: '10.0.100-alpha.1.24620.13'
+  dotnet_sdk_version: '10.0.100-alpha.1.25059.31'
 
 jobs:
   analyze:

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,7 +1,7 @@
   <Project>
   <PropertyGroup>
-    <EFCoreVersion>10.0.0-alpha.1.24620.1</EFCoreVersion>
-    <MicrosoftExtensionsVersion>10.0.0-alpha.1.24616.1</MicrosoftExtensionsVersion>
+    <EFCoreVersion>10.0.0-alpha.1.25070.1</EFCoreVersion>
+    <MicrosoftExtensionsVersion>10.0.0-alpha.1.25068.1</MicrosoftExtensionsVersion>
     <NpgsqlVersion>9.0.2</NpgsqlVersion>
   </PropertyGroup>
 

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.100-alpha.1.24620.13",
+    "version": "10.0.100-alpha.1.25059.31",
     "rollForward": "latestMajor",
     "allowPrerelease": true
   }

diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/ComplexTypeBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/ComplexTypeBulkUpdatesNpgsqlTest.cs
@@ -29,8 +29,10 @@ public override async Task Update_property_inside_complex_type(bool async)
 
         AssertExecuteUpdateSql(
             """
+@p='12345'
+
 UPDATE "Customer" AS c
-SET "ShippingAddress_ZipCode" = 12345
+SET "ShippingAddress_ZipCode" = @p
 WHERE c."ShippingAddress_ZipCode" = 7728
 """);
     }
@@ -41,8 +43,10 @@ public override async Task Update_property_inside_nested_complex_type(bool async
 
         AssertExecuteUpdateSql(
             """
+@p='United States Modified'
+
 UPDATE "Customer" AS c
-SET "ShippingAddress_Country_FullName" = 'United States Modified'
+SET "ShippingAddress_Country_FullName" = @p
 WHERE c."ShippingAddress_Country_Code" = 'US'
 """);
     }
@@ -53,10 +57,12 @@ public override async Task Update_multiple_properties_inside_multiple_complex_ty
 
         AssertExecuteUpdateSql(
             """
+@p='54321'
+
 UPDATE "Customer" AS c
-SET "BillingAddress_ZipCode" = 54321,
+SET "Name" = c."Name" || 'Modified',
     "ShippingAddress_ZipCode" = c."BillingAddress_ZipCode",
-    "Name" = c."Name" || 'Modified'
+    "BillingAddress_ZipCode" = @p
 WHERE c."ShippingAddress_ZipCode" = 7728
 """);
     }
@@ -67,8 +73,10 @@ public override async Task Update_projected_complex_type(bool async)
 
         AssertExecuteUpdateSql(
             """
+@p='12345'
+
 UPDATE "Customer" AS c
-SET "ShippingAddress_ZipCode" = 12345
+SET "ShippingAddress_ZipCode" = @p
 """);
     }
 
@@ -78,9 +86,11 @@ public override async Task Update_multiple_projected_complex_types_via_anonymous
 
         AssertExecuteUpdateSql(
             """
+@p='54321'
+
 UPDATE "Customer" AS c
-SET "BillingAddress_ZipCode" = 54321,
-    "ShippingAddress_ZipCode" = c."BillingAddress_ZipCode"
+SET "ShippingAddress_ZipCode" = c."BillingAddress_ZipCode",
+    "BillingAddress_ZipCode" = @p
 """);
     }
 
@@ -97,20 +107,20 @@ public override async Task Update_complex_type_to_parameter(bool async)
 
         AssertExecuteUpdateSql(
             """
-@complex_type_newAddress_AddressLine1='New AddressLine1'
-@complex_type_newAddress_AddressLine2='New AddressLine2'
-@complex_type_newAddress_Tags={ 'new_tag1', 'new_tag2' } (DbType = Object)
-@complex_type_newAddress_ZipCode='99999' (Nullable = true)
-@complex_type_newAddress_Code='FR'
-@complex_type_newAddress_FullName='France'
+@complex_type_p_AddressLine1='New AddressLine1'
+@complex_type_p_AddressLine2='New AddressLine2'
+@complex_type_p_Tags={ 'new_tag1', 'new_tag2' } (DbType = Object)
+@complex_type_p_ZipCode='99999' (Nullable = true)
+@complex_type_p_Code='FR'
+@complex_type_p_FullName='France'
 
 UPDATE "Customer" AS c
-SET "ShippingAddress_AddressLine1" = @complex_type_newAddress_AddressLine1,
-    "ShippingAddress_AddressLine2" = @complex_type_newAddress_AddressLine2,
-    "ShippingAddress_Tags" = @complex_type_newAddress_Tags,
-    "ShippingAddress_ZipCode" = @complex_type_newAddress_ZipCode,
-    "ShippingAddress_Country_Code" = @complex_type_newAddress_Code,
-    "ShippingAddress_Country_FullName" = @complex_type_newAddress_FullName
+SET "ShippingAddress_AddressLine1" = @complex_type_p_AddressLine1,
+    "ShippingAddress_AddressLine2" = @complex_type_p_AddressLine2,
+    "ShippingAddress_Tags" = @complex_type_p_Tags,
+    "ShippingAddress_ZipCode" = @complex_type_p_ZipCode,
+    "ShippingAddress_Country_Code" = @complex_type_p_Code,
+    "ShippingAddress_Country_FullName" = @complex_type_p_FullName
 """);
     }
 
@@ -120,12 +130,12 @@ public override async Task Update_nested_complex_type_to_parameter(bool async)
 
         AssertExecuteUpdateSql(
             """
-@complex_type_newCountry_Code='FR'
-@complex_type_newCountry_FullName='France'
+@complex_type_p_Code='FR'
+@complex_type_p_FullName='France'
 
 UPDATE "Customer" AS c
-SET "ShippingAddress_Country_Code" = @complex_type_newCountry_Code,
-    "ShippingAddress_Country_FullName" = @complex_type_newCountry_FullName
+SET "ShippingAddress_Country_Code" = @complex_type_p_Code,
+    "ShippingAddress_Country_FullName" = @complex_type_p_FullName
 """);
     }
 
@@ -151,13 +161,20 @@ public override async Task Update_complex_type_to_inline_without_lambda(bool asy
 
         AssertExecuteUpdateSql(
             """
+@complex_type_p_AddressLine1='New AddressLine1'
+@complex_type_p_AddressLine2='New AddressLine2'
+@complex_type_p_Tags={ 'new_tag1', 'new_tag2' } (DbType = Object)
+@complex_type_p_ZipCode='99999' (Nullable = true)
+@complex_type_p_Code='FR'
+@complex_type_p_FullName='France'
+
 UPDATE "Customer" AS c
-SET "ShippingAddress_AddressLine1" = 'New AddressLine1',
-    "ShippingAddress_AddressLine2" = 'New AddressLine2',
-    "ShippingAddress_Tags" = ARRAY['new_tag1','new_tag2']::text[],
-    "ShippingAddress_ZipCode" = 99999,
-    "ShippingAddress_Country_Code" = 'FR',
-    "ShippingAddress_Country_FullName" = 'France'
+SET "ShippingAddress_AddressLine1" = @complex_type_p_AddressLine1,
+    "ShippingAddress_AddressLine2" = @complex_type_p_AddressLine2,
+    "ShippingAddress_Tags" = @complex_type_p_Tags,
+    "ShippingAddress_ZipCode" = @complex_type_p_ZipCode,
+    "ShippingAddress_Country_Code" = @complex_type_p_Code,
+    "ShippingAddress_Country_FullName" = @complex_type_p_FullName
 """);
     }
 
@@ -208,8 +225,10 @@ public override async Task Update_collection_inside_complex_type(bool async)
 
         AssertExecuteUpdateSql(
             """
+@p={ 'new_tag1', 'new_tag2' } (DbType = Object)
+
 UPDATE "Customer" AS c
-SET "ShippingAddress_Tags" = ARRAY['new_tag1','new_tag2']::text[]
+SET "ShippingAddress_Tags" = @p
 """);
     }
 

diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesNpgsqlTest.cs
@@ -53,8 +53,10 @@ public override async Task Replace_ColumnExpression_in_column_setter(bool async)
 
         AssertSql(
             """
+@p='SomeValue'
+
 UPDATE "OwnedCollection" AS o0
-SET "Value" = 'SomeValue'
+SET "Value" = @p
 FROM "Owner" AS o
 WHERE o."Id" = o0."OwnerId"
 """);
@@ -73,8 +75,10 @@ public override async Task Update_non_owned_property_on_entity_with_owned(bool a
 
         AssertSql(
             """
+@p='SomeValue'
+
 UPDATE "Owner" AS o
-SET "Title" = 'SomeValue'
+SET "Title" = @p
 """);
     }
 
@@ -111,8 +115,10 @@ public override async Task Update_non_owned_property_on_entity_with_owned_in_joi
 
         AssertSql(
             """
+@p='NewValue'
+
 UPDATE "Owner" AS o
-SET "Title" = 'NewValue'
+SET "Title" = @p
 FROM "Owner" AS o0
 WHERE o."Id" = o0."Id"
 """);
@@ -125,8 +131,8 @@ public override async Task Update_owned_and_non_owned_properties_with_table_shar
         AssertSql(
             """
 UPDATE "Owner" AS o
-SET "OwnedReference_Number" = length(o."Title")::int,
-    "Title" = COALESCE(o."OwnedReference_Number"::text, '')
+SET "Title" = COALESCE(o."OwnedReference_Number"::text, ''),
+    "OwnedReference_Number" = length(o."Title")::int
 """);
     }
 
@@ -169,8 +175,8 @@ public override async Task Update_non_main_table_in_entity_with_entity_splitting
         AssertSql(
             """
 UPDATE "BlogsPart1" AS b0
-SET "Rating" = length(b0."Title")::int,
-    "Title" = b0."Rating"::text
+SET "Title" = b0."Rating"::text,
+    "Rating" = length(b0."Title")::int
 FROM "Blogs" AS b
 WHERE b."Id" = b0."Id"
 """);
@@ -252,8 +258,10 @@ public override async Task Update_with_view_mapping(bool async)
 
         AssertSql(
             """
+@p='Updated'
+
 UPDATE "Blogs" AS b
-SET "Data" = 'Updated'
+SET "Data" = @p
 """);
     }