Fix non-determinstic CROSS APPLY tests

dotnet · Aug 22, 2019 · e187c8f · e187c8f
1 parent f382f8b
commit e187c8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Select.cs b/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Select.cs
@@ -1259,7 +1259,8 @@ public virtual Task SelectMany_correlated_with_outer_2(bool isAsync)
             return AssertQuery<Customer, Order>(
                 isAsync,
                 (cs, os) => from c in cs
-                            from o in os.Where(o => c.CustomerID == o.CustomerID).OrderBy(o => c.City).Take(2)
+                            from o in os.Where(o => c.CustomerID == o.CustomerID)
+                                .OrderBy(o => c.City).ThenBy(o => o.OrderID).Take(2)
                             select new
                             {
                                 c,
@@ -1291,7 +1292,8 @@ public virtual Task SelectMany_correlated_with_outer_4(bool isAsync)
             return AssertQuery<Customer, Order>(
                 isAsync,
                 (cs, os) => from c in cs
-                            from o in os.Where(o => c.CustomerID == o.CustomerID).OrderBy(o => c.City).Take(2).DefaultIfEmpty()
+                            from o in os.Where(o => c.CustomerID == o.CustomerID)
+                                .OrderBy(o => c.City).ThenBy(o => o.OrderID).Take(2).DefaultIfEmpty()
                             select new
                             {
                                 c,

diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.Select.cs b/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.Select.cs
@@ -974,7 +974,7 @@ public override async Task SelectMany_correlated_with_outer_2(bool isAsync)
     SELECT TOP(2) [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate], [c].[City]
     FROM [Orders] AS [o]
     WHERE ([c].[CustomerID] = [o].[CustomerID]) AND [o].[CustomerID] IS NOT NULL
-    ORDER BY [c].[City]
+    ORDER BY [c].[City], [o].[OrderID]
 ) AS [t]");
         }
 
@@ -1003,7 +1003,7 @@ public override async Task SelectMany_correlated_with_outer_4(bool isAsync)
     SELECT TOP(2) [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate], [c].[City]
     FROM [Orders] AS [o]
     WHERE ([c].[CustomerID] = [o].[CustomerID]) AND [o].[CustomerID] IS NOT NULL
-    ORDER BY [c].[City]
+    ORDER BY [c].[City], [o].[OrderID]
 ) AS [t]");
         }
     }