Fix AssertSql() checks.

PomeloFoundation · Nov 30, 2024 · 42ebb2d · 42ebb2d
1 parent 6f0b42e
commit 42ebb2d
Show file tree

Hide file tree

Showing 24 changed files with 4,822 additions and 1,052 deletions.
diff --git a/test/EFCore.MySql.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesMySqlTest.cs
@@ -88,7 +88,7 @@ public override async Task Update_owned_and_non_owned_properties_with_table_shar
 """
 UPDATE `Owner` AS `o`
 SET `o`.`OwnedReference_Number` = CHAR_LENGTH(`o`.`Title`),
-    `o`.`Title` = CAST(`o`.`OwnedReference_Number` AS char)
+    `o`.`Title` = COALESCE(CAST(`o`.`OwnedReference_Number` AS char), '')
 """);
     }
 
@@ -162,7 +162,12 @@ public override async Task Replace_ColumnExpression_in_column_setter(bool async)
     {
         await base.Replace_ColumnExpression_in_column_setter(async);
 
-        AssertSql();
+        AssertSql(
+"""
+UPDATE `Owner` AS `o`
+INNER JOIN `OwnedCollection` AS `o0` ON `o`.`Id` = `o0`.`OwnerId`
+SET `o0`.`Value` = 'SomeValue'
+""");
     }
 
     private void AssertSql(params string[] expected)

diff --git a/test/EFCore.MySql.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesMySqlTest.cs
@@ -1388,12 +1388,12 @@ public override async Task Update_Where_Join_set_property_from_joined_single_res
         AssertExecuteUpdateSql(
 """
 UPDATE `Customers` AS `c`
-SET `c`.`City` = CAST(EXTRACT(year FROM (
+SET `c`.`City` = COALESCE(CAST(EXTRACT(year FROM (
     SELECT `o`.`OrderDate`
     FROM `Orders` AS `o`
     WHERE `c`.`CustomerID` = `o`.`CustomerID`
     ORDER BY `o`.`OrderDate` DESC
-    LIMIT 1)) AS char)
+    LIMIT 1)) AS char), '')
 WHERE `c`.`CustomerID` LIKE 'F%'
 """);
     }
@@ -1422,12 +1422,12 @@ public override async Task Update_Where_Join_set_property_from_joined_single_res
         AssertExecuteUpdateSql(
 """
 UPDATE `Customers` AS `c`
-SET `c`.`City` = CAST(EXTRACT(year FROM (
+SET `c`.`City` = COALESCE(CAST(EXTRACT(year FROM (
     SELECT `o`.`OrderDate`
     FROM `Orders` AS `o`
     WHERE `c`.`CustomerID` = `o`.`CustomerID`
     ORDER BY `o`.`OrderDate` DESC
-    LIMIT 1)) AS char)
+    LIMIT 1)) AS char), '')
 WHERE `c`.`CustomerID` LIKE 'F%'
 """);
     }

diff --git a/test/EFCore.MySql.FunctionalTests/GraphUpdatesMySqlTestBase.cs b/test/EFCore.MySql.FunctionalTests/GraphUpdatesMySqlTestBase.cs
@@ -63,6 +63,24 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
 
             modelBuilder.Entity<SomethingOfCategoryA>().Property<int>("CategoryId").HasDefaultValue(1);
             modelBuilder.Entity<SomethingOfCategoryB>().Property(e => e.CategoryId).HasDefaultValue(2);
+
+            modelBuilder.Entity<CompositeKeyWith<int>>(
+                b =>
+                {
+                    b.Property(e => e.PrimaryGroup).HasDefaultValue(1).HasSentinel(1);
+                });
+
+            modelBuilder.Entity<CompositeKeyWith<bool>>(
+                b =>
+                {
+                    b.Property(e => e.PrimaryGroup).HasDefaultValue(true);
+                });
+
+            modelBuilder.Entity<CompositeKeyWith<bool?>>(
+                b =>
+                {
+                    b.Property(e => e.PrimaryGroup).HasDefaultValue(true);
+                });
         }
     }
 }