Updated baselines

dotnet · Nov 18, 2021 · 61d1646 · 61d1646
1 parent 9b8a60d
commit 61d1646
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 60 deletions.
diff --git a/test/EFCore.Relational.Specification.Tests/TestUtilities/TestSqlLoggerFactory.cs b/test/EFCore.Relational.Specification.Tests/TestUtilities/TestSqlLoggerFactory.cs
@@ -143,18 +143,18 @@ public void AssertBaseline(string[] expected, bool assertOrder = true)
 
                 lock (_queryBaselineFileLock)
                 {
-                    File.AppendAllText(logFile, contents);
-
-                    // if (!_overriddenMethods.Any())
-                    // {
-                    //     File.Delete(logFile);
-                    // }
-                    //
-                    // if (!_overriddenMethods.Contains(methodName))
-                    // {
-                    //     File.AppendAllText(logFile, overrideString);
-                    //     _overriddenMethods.Add(methodName);
-                    // }
+                    //File.AppendAllText(logFile, contents);
+
+                    if (!_overriddenMethods.Any())
+                    {
+                        File.Delete(logFile);
+                    }
+
+                    if (!_overriddenMethods.Contains(methodName))
+                    {
+                        File.AppendAllText(logFile, overrideString);
+                        _overriddenMethods.Add(methodName);
+                    }
                 }
 
                 throw;

diff --git a/...EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsQuerySqlServerTest.cs b/...EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsQuerySqlServerTest.cs
@@ -2355,7 +2355,7 @@ FROM [LevelThree] AS [l1]
     ) AS [t]
     WHERE [t].[row] <= 50
 ) AS [t0] ON [l0].[Id] = [t0].[OneToMany_Optional_Inverse3Id]
-ORDER BY [l].[Id], [l0].[Id], [t0].[OneToMany_Optional_Inverse3Id], [t0].[Id]");
+ORDER BY [l].[Id], [l0].[Id]");
         }
 
         public override async Task Multiple_optional_navigation_with_Include(bool async)

diff --git a/...Server.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs b/...Server.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs
@@ -1254,7 +1254,7 @@ public override async Task Project_collection_navigation_nested_with_take(bool a
             await base.Project_collection_navigation_nested_with_take(async);
 
             AssertSql(
-                @"SELECT [l].[Id], [t].[Id], [t].[Id0], [t1].[Id], [t1].[Level2_Optional_Id], [t1].[Level2_Required_Id], [t1].[Level3_Name], [t1].[OneToMany_Optional_Inverse3Id], [t1].[OneToMany_Required_Inverse3Id], [t1].[OneToOne_Optional_PK_Inverse3Id], [t1].[Id0], [t1].[Id00]
+@"SELECT [l].[Id], [t].[Id], [t].[Id0], [t1].[Id], [t1].[Level2_Optional_Id], [t1].[Level2_Required_Id], [t1].[Level3_Name], [t1].[OneToMany_Optional_Inverse3Id], [t1].[OneToMany_Required_Inverse3Id], [t1].[OneToOne_Optional_PK_Inverse3Id], [t1].[Id0], [t1].[Id00]
 FROM [Level1] AS [l]
 LEFT JOIN (
     SELECT [l0].[Id], [l0].[OneToOne_Required_PK_Date], [l0].[Level1_Optional_Id], [l0].[Level1_Required_Id], [l0].[OneToMany_Required_Inverse2Id], [l1].[Id] AS [Id0]
@@ -1279,7 +1279,7 @@ WHERE [l2].[Level2_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse
 ) AS [t1] ON CASE
     WHEN ([t].[OneToOne_Required_PK_Date] IS NOT NULL AND [t].[Level1_Required_Id] IS NOT NULL) AND [t].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [t].[Id]
 END = [t1].[OneToMany_Optional_Inverse3Id]
-ORDER BY [l].[Id], [t].[Id], [t].[Id0], [t1].[OneToMany_Optional_Inverse3Id], [t1].[Id], [t1].[Id0], [t1].[Id00]");
+ORDER BY [l].[Id], [t].[Id], [t].[Id0], [t1].[Id], [t1].[Id0]");
         }
 
         public override async Task Multiple_SelectMany_navigation_property_followed_by_select_collection_navigation(bool async)
@@ -2059,7 +2059,7 @@ FROM [Level1] AS [l0]
     ) AS [t]
     WHERE [t].[row] <= 1
 ) AS [t0] ON [l].[Id] = [t0].[OneToMany_Optional_Inverse2Id]
-ORDER BY [l].[Id], [t0].[OneToMany_Optional_Inverse2Id], [t0].[Id], [t0].[Id0]");
+ORDER BY [l].[Id], [t0].[Id]");
         }
 
         public override async Task Include_collection_followed_by_projecting_the_included_collection(bool async)
@@ -3059,7 +3059,7 @@ FROM [Level1] AS [l0]
     ) AS [t]
     WHERE 1 < [t].[row]
 ) AS [t0] ON [l].[Id] = [t0].[OneToMany_Optional_Inverse2Id]
-ORDER BY [l].[Id], [t0].[OneToMany_Optional_Inverse2Id], [t0].[Id], [t0].[Id0]");
+ORDER BY [l].[Id], [t0].[Id]");
         }
 
         public override async Task Skip_Take_on_grouping_element_into_non_entity(bool async)
@@ -3179,7 +3179,7 @@ FROM [Level1] AS [l0]
     ) AS [t]
     WHERE [t].[row] <= 50
 ) AS [t0] ON [l].[Id] = [t0].[OneToMany_Optional_Inverse2Id]
-ORDER BY [l].[Id], [t0].[OneToMany_Optional_Inverse2Id], [t0].[Id], [t0].[Id0]");
+ORDER BY [l].[Id], [t0].[Id]");
         }
 
         public override async Task Optional_navigation_with_Include_ThenInclude(bool async)