moretest fixes

Author: ChrisJollyAU

test/EFCore.Jet.FunctionalTests/ComplexTypesTrackingJetTest.cs

@@ -266,6 +266,16 @@ public override void Can_detect_swapped_complex_objects_in_collections(bool trac
     {
     }
 
+    // Issue #36175: Complex types with notification change tracking are not supported
+    public override void Can_remove_from_complex_collection_with_nested_complex_collection(bool trackFromQuery)
+    {
+    }
+
+    // Fields can't be proxied
+    public override void Can_remove_from_complex_field_collection_with_nested_complex_collection(bool trackFromQuery)
+    {
+    }
+
     // Issue #36175: Complex types with notification change tracking are not supported
     public override void Throws_when_accessing_complex_entries_using_incorrect_cardinality()
     {
@@ -342,6 +352,30 @@ public override void Can_write_original_values_for_properties_of_complex_propert
     {
     }
 
+    // Issue #36175: Complex types with notification change tracking are not supported
+    public override Task Can_save_default_values_in_optional_complex_property_with_multiple_properties(bool async)
+        => Task.CompletedTask;
+
+    // Issue #36175: Complex types with notification change tracking are not supported
+    public override Task Can_null_complex_property_with_default_values_and_multiple_properties(bool async)
+        => Task.CompletedTask;
+
+    // Fields can't be proxied
+    public override Task Can_change_state_from_Deleted_with_complex_field_collection(EntityState newState, bool async)
+        => Task.CompletedTask;
+
+    // Fields can't be proxied
+    public override Task Can_change_state_from_Deleted_with_complex_field_record_collection(EntityState newState, bool async)
+        => Task.CompletedTask;
+
+    // Issue #36175: Complex types with notification change tracking are not supported
+    public override Task Can_change_state_from_Deleted_with_complex_collection(EntityState newState, bool async)
+        => Task.CompletedTask;
+
+    // Issue #36175: Complex types with notification change tracking are not supported
+    public override Task Can_change_state_from_Deleted_with_complex_record_collection(EntityState newState, bool async)
+        => Task.CompletedTask;
+
     public class JetFixture : JetFixtureBase
     {
         protected override string StoreName

test/EFCore.Jet.FunctionalTests/ComputedColumnTest.cs

@@ -104,13 +104,17 @@ public void AppendBulkInsertOperation_appends_merge_if_store_generated_columns_e
 
         AssertBaseline(
 """
-MERGE [dbo].[Ducks] USING (
-VALUES (@p0, @p1, @p2, 0),
-(@p0, @p1, @p2, 1)) AS i ([Name], [Quacks], [ConcurrencyToken], _Position) ON 1=0
-WHEN NOT MATCHED THEN
-INSERT ([Name], [Quacks], [ConcurrencyToken])
-VALUES (i.[Name], i.[Quacks], i.[ConcurrencyToken])
-OUTPUT INSERTED.[Id], INSERTED.[Computed], i._Position;
+INSERT INTO `Ducks` (`Name`, `Quacks`, `ConcurrencyToken`)
+VALUES (@p0, @p1, @p2);
+SELECT `Id`, `Computed`
+FROM `Ducks`
+WHERE @@ROWCOUNT = 1 AND `Id` = @@identity;
+
+INSERT INTO `Ducks` (`Name`, `Quacks`, `ConcurrencyToken`)
+VALUES (@p0, @p1, @p2);
+SELECT `Id`, `Computed`
+FROM `Ducks`
+WHERE @@ROWCOUNT = 1 AND `Id` = @@identity;
 """,
             stringBuilder.ToString());
         Assert.Equal(ResultSetMapping.NotLastInResultSet | ResultSetMapping.IsPositionalResultMappingEnabled, grouping);
@@ -147,14 +151,17 @@ public void AppendBulkInsertOperation_appends_insert_if_store_generated_columns_
 
         AssertBaseline(
 """
-DECLARE @inserted0 TABLE ([Id] int);
-INSERT INTO [dbo].[Ducks] ([Id])
-OUTPUT INSERTED.[Id]
-INTO @inserted0
-VALUES (DEFAULT),
-(DEFAULT);
-SELECT [t].[Id], [t].[Computed] FROM [dbo].[Ducks] t
-INNER JOIN @inserted0 i ON ([t].[Id] = [i].[Id]);
+INSERT INTO `Ducks`
+DEFAULT VALUES;
+SELECT `Id`, `Computed`
+FROM `Ducks`
+WHERE @@ROWCOUNT = 1 AND `Id` = @@identity;
+
+INSERT INTO `Ducks`
+DEFAULT VALUES;
+SELECT `Id`, `Computed`
+FROM `Ducks`
+WHERE @@ROWCOUNT = 1 AND `Id` = @@identity;
 """,
             stringBuilder.ToString());
         Assert.Equal(ResultSetMapping.NotLastInResultSet, grouping);
@@ -248,10 +255,13 @@ protected override string Identity
         => throw new NotImplementedException();
 
     protected override string OpenDelimiter
-        => "[";
+        => "`";
 
     protected override string CloseDelimiter
-        => "]";
+        => "`";
+
+    protected override string Schema
+        => null!;
 
     private void AssertBaseline(string expected, string actual)
         => Assert.Equal(expected, actual.TrimEnd(), ignoreLineEndingDifferences: true);