From ebf0fa576b12ed7027b6981170768525ee5dc8f1 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:10:54 +0000 Subject: [PATCH 01/42] [Windows / SQL CE] baselines --- ...s.InnerJoinDistinct(SqlCe.LinqService).sql | 14 ++------- ...erJoinDistinctWhere(SqlCe.LinqService).sql | 14 ++------- ...ts.LeftJoinDistinct(SqlCe.LinqService).sql | 14 ++------- ...ftJoinDistinctWhere(SqlCe.LinqService).sql | 14 ++------- ...OrderByDistinctAll1(SqlCe.LinqService).sql | 28 ++++++++++++++++++ ...OrderByDistinctAll2(SqlCe.LinqService).sql | 29 +++++++++++++++++++ ...oLimitedTests.InnerJoinDistinct(SqlCe).sql | 14 ++------- ...tedTests.InnerJoinDistinctWhere(SqlCe).sql | 14 ++------- ...ToLimitedTests.LeftJoinDistinct(SqlCe).sql | 14 ++------- ...itedTests.LeftJoinDistinctWhere(SqlCe).sql | 14 ++------- ...stinctTests.OrderByDistinctAll1(SqlCe).sql | 28 ++++++++++++++++++ ...stinctTests.OrderByDistinctAll2(SqlCe).sql | 29 +++++++++++++++++++ 12 files changed, 138 insertions(+), 88 deletions(-) create mode 100644 SqlCe.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlCe.LinqService).sql create mode 100644 SqlCe.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlCe.LinqService).sql create mode 100644 SqlCe/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlCe).sql create mode 100644 SqlCe/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlCe).sql diff --git a/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlCe.LinqService).sql b/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlCe.LinqService).sql index 8690d80f741e..337180c44cf9 100644 --- a/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlCe.LinqService).sql +++ b/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlCe.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID] as [ParentID_1], - [c_2].[ChildID] + [c_1].[ParentID] as [ParentID_1], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlCe.LinqService).sql b/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlCe.LinqService).sql index 5b137d55adab..c969707eebc2 100644 --- a/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlCe.LinqService).sql +++ b/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlCe.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID] as [ParentID_1], - [c_2].[ChildID] + [c_1].[ParentID] as [ParentID_1], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlCe.LinqService).sql b/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlCe.LinqService).sql index ca806fdc709b..ab70b13ee2a2 100644 --- a/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlCe.LinqService).sql +++ b/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlCe.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID] as [ParentID_1], - [c_2].[ChildID] + [c_1].[ParentID] as [ParentID_1], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlCe.LinqService).sql b/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlCe.LinqService).sql index 89deedbae940..85aac17d9756 100644 --- a/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlCe.LinqService).sql +++ b/SqlCe.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlCe.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID] as [ParentID_1], - [c_2].[ChildID] + [c_1].[ParentID] as [ParentID_1], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlCe.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlCe.LinqService).sql b/SqlCe.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlCe.LinqService).sql new file mode 100644 index 000000000000..8736461795f8 --- /dev/null +++ b/SqlCe.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlCe.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlCe (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID] as [ID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlCe (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID] as [ID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlCe.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlCe.LinqService).sql b/SqlCe.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlCe.LinqService).sql new file mode 100644 index 000000000000..b6df5fd85af2 --- /dev/null +++ b/SqlCe.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlCe.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlCe (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID] as [ID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlCe (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID] as [ID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlCe).sql b/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlCe).sql index cfa49e127f69..fbefb0c76fc1 100644 --- a/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlCe).sql +++ b/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlCe).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID] as [ParentID_1], - [c_2].[ChildID] + [c_1].[ParentID] as [ParentID_1], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlCe).sql b/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlCe).sql index dbb173a4ffa4..dfe85ff5f2c1 100644 --- a/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlCe).sql +++ b/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlCe).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID] as [ParentID_1], - [c_2].[ChildID] + [c_1].[ParentID] as [ParentID_1], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlCe).sql b/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlCe).sql index 6df0f7dde69d..a1df39b5abb2 100644 --- a/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlCe).sql +++ b/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlCe).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID] as [ParentID_1], - [c_2].[ChildID] + [c_1].[ParentID] as [ParentID_1], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlCe).sql b/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlCe).sql index fded721ab0f8..0525a6c15ba5 100644 --- a/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlCe).sql +++ b/SqlCe/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlCe).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID] as [ParentID_1], - [c_2].[ChildID] + [c_1].[ParentID] as [ParentID_1], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlCe/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlCe).sql b/SqlCe/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlCe).sql new file mode 100644 index 000000000000..b9572a0ee9c8 --- /dev/null +++ b/SqlCe/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlCe).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlCe +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID] as [ID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlCe + +SELECT + [t1].[FirstName], + [t1].[PersonID] as [ID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlCe/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlCe).sql b/SqlCe/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlCe).sql new file mode 100644 index 000000000000..12c7d0609ddf --- /dev/null +++ b/SqlCe/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlCe).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlCe +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID] as [ID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlCe + +SELECT + [t1].[FirstName], + [t1].[PersonID] as [ID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From 6f533214170d522557665bc4fc09d1986eb6fc4d Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:13:56 +0000 Subject: [PATCH 02/42] [Windows / SQLite (specialized tests)] baselines --- ....Test5(SQLite.Classic.MPM.LinqService).sql | 36 +++++-------------- ...mCount(SQLite.Classic.MPM.LinqService).sql | 8 ++--- ...stinct(SQLite.Classic.MPM.LinqService).sql | 12 ++----- ...tWhere(SQLite.Classic.MPM.LinqService).sql | 12 ++----- ...stinct(SQLite.Classic.MPM.LinqService).sql | 12 ++----- ...tWhere(SQLite.Classic.MPM.LinqService).sql | 12 ++----- ...ctAll1(SQLite.Classic.MPM.LinqService).sql | 28 +++++++++++++++ ...ctAll2(SQLite.Classic.MPM.LinqService).sql | 29 +++++++++++++++ ...inq.CteTests.Test5(SQLite.Classic.MPM).sql | 36 +++++-------------- ...ts.TestCustomCount(SQLite.Classic.MPM).sql | 8 ++--- ....InnerJoinDistinct(SQLite.Classic.MPM).sql | 12 ++----- ...rJoinDistinctWhere(SQLite.Classic.MPM).sql | 12 ++----- ...s.LeftJoinDistinct(SQLite.Classic.MPM).sql | 12 ++----- ...tJoinDistinctWhere(SQLite.Classic.MPM).sql | 12 ++----- ...rderByDistinctAll1(SQLite.Classic.MPM).sql | 28 +++++++++++++++ ...rderByDistinctAll2(SQLite.Classic.MPM).sql | 29 +++++++++++++++ ....Test5(SQLite.Classic.MPU.LinqService).sql | 36 +++++-------------- ...mCount(SQLite.Classic.MPU.LinqService).sql | 8 ++--- ...stinct(SQLite.Classic.MPU.LinqService).sql | 12 ++----- ...tWhere(SQLite.Classic.MPU.LinqService).sql | 12 ++----- ...stinct(SQLite.Classic.MPU.LinqService).sql | 12 ++----- ...tWhere(SQLite.Classic.MPU.LinqService).sql | 12 ++----- ...ctAll1(SQLite.Classic.MPU.LinqService).sql | 28 +++++++++++++++ ...ctAll2(SQLite.Classic.MPU.LinqService).sql | 29 +++++++++++++++ ...inq.CteTests.Test5(SQLite.Classic.MPU).sql | 36 +++++-------------- ...ts.TestCustomCount(SQLite.Classic.MPU).sql | 8 ++--- ....InnerJoinDistinct(SQLite.Classic.MPU).sql | 12 ++----- ...rJoinDistinctWhere(SQLite.Classic.MPU).sql | 12 ++----- ...s.LeftJoinDistinct(SQLite.Classic.MPU).sql | 12 ++----- ...tJoinDistinctWhere(SQLite.Classic.MPU).sql | 12 ++----- ...rderByDistinctAll1(SQLite.Classic.MPU).sql | 28 +++++++++++++++ ...rderByDistinctAll2(SQLite.Classic.MPU).sql | 29 +++++++++++++++ 32 files changed, 324 insertions(+), 272 deletions(-) create mode 100644 SQLite.Classic.MPM.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPM.LinqService).sql create mode 100644 SQLite.Classic.MPM.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPM.LinqService).sql create mode 100644 SQLite.Classic.MPM/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPM).sql create mode 100644 SQLite.Classic.MPM/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPM).sql create mode 100644 SQLite.Classic.MPU.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPU.LinqService).sql create mode 100644 SQLite.Classic.MPU.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPU.LinqService).sql create mode 100644 SQLite.Classic.MPU/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPU).sql create mode 100644 SQLite.Classic.MPU/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPU).sql diff --git a/SQLite.Classic.MPM.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPM.LinqService).sql b/SQLite.Classic.MPM.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPM.LinqService).sql index b47bb2b5fe4d..e29f374226cd 100644 --- a/SQLite.Classic.MPM.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPM.LinqService).sql +++ b/SQLite.Classic.MPM.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPM.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SQLite.Classic.MPM.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPM.LinqService).sql b/SQLite.Classic.MPM.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPM.LinqService).sql index 25d4243c3cac..e2b817c6d1d7 100644 --- a/SQLite.Classic.MPM.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPM.LinqService).sql +++ b/SQLite.Classic.MPM.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPM.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SQLite.Classic.MPM SQLite.Classic SQLite (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPM.LinqService).sql b/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPM.LinqService).sql index b1ee0587df04..4d7b57e93e79 100644 --- a/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPM.LinqService).sql +++ b/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPM.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPM.LinqService).sql b/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPM.LinqService).sql index a8683c9d48cd..c14fa18daf12 100644 --- a/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPM.LinqService).sql +++ b/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPM.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPM.LinqService).sql b/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPM.LinqService).sql index fdffc3612ce7..be131d5729e5 100644 --- a/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPM.LinqService).sql +++ b/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPM.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPM.LinqService).sql b/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPM.LinqService).sql index 71f4a5044e1f..ac09dffaea17 100644 --- a/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPM.LinqService).sql +++ b/SQLite.Classic.MPM.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPM.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.Classic.MPM.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPM.LinqService).sql b/SQLite.Classic.MPM.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPM.LinqService).sql new file mode 100644 index 000000000000..cd16b28774b1 --- /dev/null +++ b/SQLite.Classic.MPM.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPM.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SQLite.Classic.MPM SQLite.Classic SQLite (asynchronously) +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.Classic.MPM SQLite.Classic SQLite (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.Classic.MPM.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPM.LinqService).sql b/SQLite.Classic.MPM.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPM.LinqService).sql new file mode 100644 index 000000000000..76a0bf739dfc --- /dev/null +++ b/SQLite.Classic.MPM.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPM.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SQLite.Classic.MPM SQLite.Classic SQLite (asynchronously) +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.Classic.MPM SQLite.Classic SQLite (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.Classic.MPM/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPM).sql b/SQLite.Classic.MPM/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPM).sql index 64af81d265cd..d7583eb3a99c 100644 --- a/SQLite.Classic.MPM/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPM).sql +++ b/SQLite.Classic.MPM/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPM).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SQLite.Classic.MPM/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPM).sql b/SQLite.Classic.MPM/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPM).sql index 28dce0b91fb3..c0eb310bd837 100644 --- a/SQLite.Classic.MPM/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPM).sql +++ b/SQLite.Classic.MPM/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPM).sql @@ -1,11 +1,11 @@ BeforeExecute -- SQLite.Classic.MPM SQLite.Classic SQLite -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPM).sql b/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPM).sql index 3e70b7aa85d4..374f0eb2bff2 100644 --- a/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPM).sql +++ b/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPM).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPM).sql b/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPM).sql index 2625ef392078..7bef55fd4dfa 100644 --- a/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPM).sql +++ b/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPM).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPM).sql b/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPM).sql index f7c1fc00a40e..9cf9b77e0bdc 100644 --- a/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPM).sql +++ b/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPM).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPM).sql b/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPM).sql index 5465cf609286..64f152bd0e81 100644 --- a/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPM).sql +++ b/SQLite.Classic.MPM/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPM).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.Classic.MPM/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPM).sql b/SQLite.Classic.MPM/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPM).sql new file mode 100644 index 000000000000..113b60deadf4 --- /dev/null +++ b/SQLite.Classic.MPM/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPM).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SQLite.Classic.MPM SQLite.Classic SQLite +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.Classic.MPM SQLite.Classic SQLite + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.Classic.MPM/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPM).sql b/SQLite.Classic.MPM/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPM).sql new file mode 100644 index 000000000000..49bbfb6a0788 --- /dev/null +++ b/SQLite.Classic.MPM/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPM).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SQLite.Classic.MPM SQLite.Classic SQLite +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.Classic.MPM SQLite.Classic SQLite + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.Classic.MPU.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPU.LinqService).sql b/SQLite.Classic.MPU.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPU.LinqService).sql index 3c70fe354aad..c534e3052210 100644 --- a/SQLite.Classic.MPU.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPU.LinqService).sql +++ b/SQLite.Classic.MPU.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPU.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SQLite.Classic.MPU.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPU.LinqService).sql b/SQLite.Classic.MPU.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPU.LinqService).sql index 54a44910be02..2914b6d5a701 100644 --- a/SQLite.Classic.MPU.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPU.LinqService).sql +++ b/SQLite.Classic.MPU.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPU.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SQLite.Classic.MPU SQLite.Classic SQLite (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPU.LinqService).sql b/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPU.LinqService).sql index 25a0494f3cd1..a5c39cc7055f 100644 --- a/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPU.LinqService).sql +++ b/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPU.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPU.LinqService).sql b/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPU.LinqService).sql index a76d873f49cc..feddd506678f 100644 --- a/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPU.LinqService).sql +++ b/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPU.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPU.LinqService).sql b/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPU.LinqService).sql index 740f0a9fc2ca..35b0d7e42c9f 100644 --- a/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPU.LinqService).sql +++ b/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPU.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPU.LinqService).sql b/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPU.LinqService).sql index bae0da1f66c6..0fa7f487204f 100644 --- a/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPU.LinqService).sql +++ b/SQLite.Classic.MPU.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPU.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.Classic.MPU.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPU.LinqService).sql b/SQLite.Classic.MPU.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPU.LinqService).sql new file mode 100644 index 000000000000..082bcc983da9 --- /dev/null +++ b/SQLite.Classic.MPU.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPU.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SQLite.Classic.MPU SQLite.Classic SQLite (asynchronously) +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.Classic.MPU SQLite.Classic SQLite (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.Classic.MPU.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPU.LinqService).sql b/SQLite.Classic.MPU.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPU.LinqService).sql new file mode 100644 index 000000000000..9e25ce562be3 --- /dev/null +++ b/SQLite.Classic.MPU.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPU.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SQLite.Classic.MPU SQLite.Classic SQLite (asynchronously) +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.Classic.MPU SQLite.Classic SQLite (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.Classic.MPU/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPU).sql b/SQLite.Classic.MPU/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPU).sql index ed67130b0933..1b4e66173c25 100644 --- a/SQLite.Classic.MPU/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPU).sql +++ b/SQLite.Classic.MPU/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.MPU).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SQLite.Classic.MPU/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPU).sql b/SQLite.Classic.MPU/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPU).sql index 41c56d8dd8e8..0c0e0757c67f 100644 --- a/SQLite.Classic.MPU/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPU).sql +++ b/SQLite.Classic.MPU/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.MPU).sql @@ -1,11 +1,11 @@ BeforeExecute -- SQLite.Classic.MPU SQLite.Classic SQLite -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPU).sql b/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPU).sql index bce8a0656bb2..eb8903509142 100644 --- a/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPU).sql +++ b/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.MPU).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPU).sql b/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPU).sql index 13d5a7c826be..3793200c0cff 100644 --- a/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPU).sql +++ b/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.MPU).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPU).sql b/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPU).sql index 4faabbd2f2e8..7b3500a69be7 100644 --- a/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPU).sql +++ b/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.MPU).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPU).sql b/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPU).sql index f6fad795300b..d6ab7d709520 100644 --- a/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPU).sql +++ b/SQLite.Classic.MPU/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.MPU).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.Classic.MPU/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPU).sql b/SQLite.Classic.MPU/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPU).sql new file mode 100644 index 000000000000..7bb35dc74e7b --- /dev/null +++ b/SQLite.Classic.MPU/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.MPU).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SQLite.Classic.MPU SQLite.Classic SQLite +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.Classic.MPU SQLite.Classic SQLite + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.Classic.MPU/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPU).sql b/SQLite.Classic.MPU/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPU).sql new file mode 100644 index 000000000000..c2f9cf783a29 --- /dev/null +++ b/SQLite.Classic.MPU/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.MPU).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SQLite.Classic.MPU SQLite.Classic SQLite +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.Classic.MPU SQLite.Classic SQLite + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From 921c038ad559cf00d587e2945b3be937f40bac35 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:17:33 +0000 Subject: [PATCH 03/42] [Windows / SQL Server 2005] baselines --- ...ests.Test5(SqlServer.2005.LinqService).sql | 36 ++++-------------- ...ustomCount(SqlServer.2005.LinqService).sql | 8 ++-- ...inDistinct(SqlServer.2005.LinqService).sql | 14 ++----- ...tinctWhere(SqlServer.2005.LinqService).sql | 14 ++----- ...inDistinct(SqlServer.2005.LinqService).sql | 14 ++----- ...tinctWhere(SqlServer.2005.LinqService).sql | 14 ++----- ...stinctAll1(SqlServer.2005.LinqService).sql | 34 +++++++++++++++++ ...stinctAll2(SqlServer.2005.LinqService).sql | 38 +++++++++++++++++++ ...s.Test5(SqlServer.2005.MS.LinqService).sql | 36 ++++-------------- ...omCount(SqlServer.2005.MS.LinqService).sql | 8 ++-- ...istinct(SqlServer.2005.MS.LinqService).sql | 14 ++----- ...ctWhere(SqlServer.2005.MS.LinqService).sql | 14 ++----- ...istinct(SqlServer.2005.MS.LinqService).sql | 14 ++----- ...ctWhere(SqlServer.2005.MS.LinqService).sql | 14 ++----- ...nctAll1(SqlServer.2005.MS.LinqService).sql | 34 +++++++++++++++++ ...nctAll2(SqlServer.2005.MS.LinqService).sql | 38 +++++++++++++++++++ ...Linq.CteTests.Test5(SqlServer.2005.MS).sql | 36 ++++-------------- ...sts.TestCustomCount(SqlServer.2005.MS).sql | 8 ++-- ...s.InnerJoinDistinct(SqlServer.2005.MS).sql | 14 ++----- ...erJoinDistinctWhere(SqlServer.2005.MS).sql | 14 ++----- ...ts.LeftJoinDistinct(SqlServer.2005.MS).sql | 14 ++----- ...ftJoinDistinctWhere(SqlServer.2005.MS).sql | 14 ++----- ...OrderByDistinctAll1(SqlServer.2005.MS).sql | 34 +++++++++++++++++ ...OrderByDistinctAll2(SqlServer.2005.MS).sql | 38 +++++++++++++++++++ ...ts.Linq.CteTests.Test5(SqlServer.2005).sql | 36 ++++-------------- ...eTests.TestCustomCount(SqlServer.2005).sql | 8 ++-- ...ests.InnerJoinDistinct(SqlServer.2005).sql | 14 ++----- ...InnerJoinDistinctWhere(SqlServer.2005).sql | 14 ++----- ...Tests.LeftJoinDistinct(SqlServer.2005).sql | 14 ++----- ....LeftJoinDistinctWhere(SqlServer.2005).sql | 14 ++----- ...ts.OrderByDistinctAll1(SqlServer.2005).sql | 34 +++++++++++++++++ ...ts.OrderByDistinctAll2(SqlServer.2005).sql | 38 +++++++++++++++++++ 32 files changed, 384 insertions(+), 304 deletions(-) create mode 100644 SqlServer.2005.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005.LinqService).sql create mode 100644 SqlServer.2005.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005.LinqService).sql create mode 100644 SqlServer.2005.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005.MS.LinqService).sql create mode 100644 SqlServer.2005.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005.MS.LinqService).sql create mode 100644 SqlServer.2005.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005.MS).sql create mode 100644 SqlServer.2005.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005.MS).sql create mode 100644 SqlServer.2005/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005).sql create mode 100644 SqlServer.2005/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005).sql diff --git a/SqlServer.2005.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005.LinqService).sql b/SqlServer.2005.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005.LinqService).sql index 6f9816d517c7..c7eca2752ce1 100644 --- a/SqlServer.2005.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005.LinqService).sql +++ b/SqlServer.2005.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2005.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005.LinqService).sql b/SqlServer.2005.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005.LinqService).sql index 9595782b74b6..c053fcdcf597 100644 --- a/SqlServer.2005.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005.LinqService).sql +++ b/SqlServer.2005.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2005 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005.LinqService).sql b/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005.LinqService).sql index 7fabd18ed59f..609deaffe6ba 100644 --- a/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005.LinqService).sql +++ b/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005.LinqService).sql b/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005.LinqService).sql index b7ef2a9b4745..af31a3784704 100644 --- a/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005.LinqService).sql +++ b/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005.LinqService).sql b/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005.LinqService).sql index d3a80d1cd91f..940bf602c88c 100644 --- a/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005.LinqService).sql +++ b/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005.LinqService).sql b/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005.LinqService).sql index a5005cbe9051..762b3868d84a 100644 --- a/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005.LinqService).sql +++ b/SqlServer.2005.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2005.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005.LinqService).sql b/SqlServer.2005.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005.LinqService).sql new file mode 100644 index 000000000000..eb956d3f0b28 --- /dev/null +++ b/SqlServer.2005.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005.LinqService).sql @@ -0,0 +1,34 @@ +BeforeExecute +-- SqlServer.2005 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) + +BeforeExecute +-- SqlServer.2005 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2005.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005.LinqService).sql b/SqlServer.2005.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005.LinqService).sql new file mode 100644 index 000000000000..41233541e595 --- /dev/null +++ b/SqlServer.2005.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005.LinqService).sql @@ -0,0 +1,38 @@ +BeforeExecute +-- SqlServer.2005 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName], + [t1].[FirstName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + [r].[FirstName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) +ORDER BY + [t1].[FirstName] + +BeforeExecute +-- SqlServer.2005 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2005.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005.MS.LinqService).sql b/SqlServer.2005.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005.MS.LinqService).sql index e21518fe4864..258ab3559964 100644 --- a/SqlServer.2005.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005.MS.LinqService).sql +++ b/SqlServer.2005.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005.MS.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2005.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005.MS.LinqService).sql b/SqlServer.2005.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005.MS.LinqService).sql index 841b68844a65..78d1a3beb20a 100644 --- a/SqlServer.2005.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005.MS.LinqService).sql +++ b/SqlServer.2005.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005.MS.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2005.MS SqlServer.2005 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005.MS.LinqService).sql b/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005.MS.LinqService).sql index 6be973fff289..17a19fbb5342 100644 --- a/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005.MS.LinqService).sql +++ b/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005.MS.LinqService).sql b/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005.MS.LinqService).sql index 5a13f042ddfa..b3cde13d8bd1 100644 --- a/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005.MS.LinqService).sql +++ b/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005.MS.LinqService).sql b/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005.MS.LinqService).sql index 16d2eeec3cd5..87ed75a3abe3 100644 --- a/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005.MS.LinqService).sql +++ b/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005.MS.LinqService).sql b/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005.MS.LinqService).sql index 1725c6bd4495..2409bad61ff0 100644 --- a/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005.MS.LinqService).sql +++ b/SqlServer.2005.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2005.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005.MS.LinqService).sql b/SqlServer.2005.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005.MS.LinqService).sql new file mode 100644 index 000000000000..5c14d3a554bd --- /dev/null +++ b/SqlServer.2005.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005.MS.LinqService).sql @@ -0,0 +1,34 @@ +BeforeExecute +-- SqlServer.2005.MS SqlServer.2005 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) + +BeforeExecute +-- SqlServer.2005.MS SqlServer.2005 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2005.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005.MS.LinqService).sql b/SqlServer.2005.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005.MS.LinqService).sql new file mode 100644 index 000000000000..4f5c9fcce8c3 --- /dev/null +++ b/SqlServer.2005.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005.MS.LinqService).sql @@ -0,0 +1,38 @@ +BeforeExecute +-- SqlServer.2005.MS SqlServer.2005 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName], + [t1].[FirstName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + [r].[FirstName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) +ORDER BY + [t1].[FirstName] + +BeforeExecute +-- SqlServer.2005.MS SqlServer.2005 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2005.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005.MS).sql b/SqlServer.2005.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005.MS).sql index 7a52512dc24a..30c0db88ae83 100644 --- a/SqlServer.2005.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005.MS).sql +++ b/SqlServer.2005.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005.MS).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2005.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005.MS).sql b/SqlServer.2005.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005.MS).sql index cd5242d7b8ac..718f66fc3abc 100644 --- a/SqlServer.2005.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005.MS).sql +++ b/SqlServer.2005.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005.MS).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2005.MS SqlServer.2005 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005.MS).sql b/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005.MS).sql index 79e2cea2d789..a0cc11ad2a5b 100644 --- a/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005.MS).sql +++ b/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005.MS).sql b/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005.MS).sql index efebc42d1472..630f95935374 100644 --- a/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005.MS).sql +++ b/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005.MS).sql b/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005.MS).sql index 7e32d8329b37..81dfab585114 100644 --- a/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005.MS).sql +++ b/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005.MS).sql b/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005.MS).sql index c5a28f3ba1f8..cd5e0ce8137b 100644 --- a/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005.MS).sql +++ b/SqlServer.2005.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2005.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005.MS).sql b/SqlServer.2005.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005.MS).sql new file mode 100644 index 000000000000..6a5573055e67 --- /dev/null +++ b/SqlServer.2005.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005.MS).sql @@ -0,0 +1,34 @@ +BeforeExecute +-- SqlServer.2005.MS SqlServer.2005 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) + +BeforeExecute +-- SqlServer.2005.MS SqlServer.2005 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2005.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005.MS).sql b/SqlServer.2005.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005.MS).sql new file mode 100644 index 000000000000..62c43a5517c3 --- /dev/null +++ b/SqlServer.2005.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005.MS).sql @@ -0,0 +1,38 @@ +BeforeExecute +-- SqlServer.2005.MS SqlServer.2005 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName], + [t1].[FirstName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + [r].[FirstName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) +ORDER BY + [t1].[FirstName] + +BeforeExecute +-- SqlServer.2005.MS SqlServer.2005 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2005/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005).sql b/SqlServer.2005/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005).sql index d28054b9cc9a..2b35c73b8a38 100644 --- a/SqlServer.2005/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005).sql +++ b/SqlServer.2005/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2005).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2005/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005).sql b/SqlServer.2005/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005).sql index 482f0ea749bf..e19e0ad7b922 100644 --- a/SqlServer.2005/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005).sql +++ b/SqlServer.2005/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2005).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2005 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005).sql b/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005).sql index 369faa69ed98..e7b21cf9a475 100644 --- a/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005).sql +++ b/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2005).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005).sql b/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005).sql index 8bd44abb2606..d97e360d4e72 100644 --- a/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005).sql +++ b/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2005).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005).sql b/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005).sql index 0c8feb663fca..6aca5f79aad0 100644 --- a/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005).sql +++ b/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2005).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005).sql b/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005).sql index dd49a3d5eea2..b046e77ff74e 100644 --- a/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005).sql +++ b/SqlServer.2005/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2005).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2005/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005).sql b/SqlServer.2005/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005).sql new file mode 100644 index 000000000000..e855953185a5 --- /dev/null +++ b/SqlServer.2005/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2005).sql @@ -0,0 +1,34 @@ +BeforeExecute +-- SqlServer.2005 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) + +BeforeExecute +-- SqlServer.2005 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2005/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005).sql b/SqlServer.2005/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005).sql new file mode 100644 index 000000000000..c07ad9dc124e --- /dev/null +++ b/SqlServer.2005/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2005).sql @@ -0,0 +1,38 @@ +BeforeExecute +-- SqlServer.2005 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName], + [t1].[FirstName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + [r].[FirstName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) +ORDER BY + [t1].[FirstName] + +BeforeExecute +-- SqlServer.2005 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From ffed3696880843d65eb57a48704575a40767d906 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:23:38 +0000 Subject: [PATCH 04/42] [Windows / SQLite (both providers)] baselines --- ...istinctEntityTest(Northwind.SQLite.MS).sql | 2 +- ...s.DistinctEntityTest(Northwind.SQLite).sql | 2 +- ...ests.Test5(SQLite.Classic.LinqService).sql | 36 +++++-------------- ...ustomCount(SQLite.Classic.LinqService).sql | 8 ++--- ...inDistinct(SQLite.Classic.LinqService).sql | 12 ++----- ...tinctWhere(SQLite.Classic.LinqService).sql | 12 ++----- ...inDistinct(SQLite.Classic.LinqService).sql | 12 ++----- ...tinctWhere(SQLite.Classic.LinqService).sql | 12 ++----- ...stinctAll1(SQLite.Classic.LinqService).sql | 28 +++++++++++++++ ...stinctAll2(SQLite.Classic.LinqService).sql | 29 +++++++++++++++ ...ts.Linq.CteTests.Test5(SQLite.Classic).sql | 36 +++++-------------- ...eTests.TestCustomCount(SQLite.Classic).sql | 8 ++--- ...ests.InnerJoinDistinct(SQLite.Classic).sql | 12 ++----- ...InnerJoinDistinctWhere(SQLite.Classic).sql | 12 ++----- ...Tests.LeftJoinDistinct(SQLite.Classic).sql | 12 ++----- ....LeftJoinDistinctWhere(SQLite.Classic).sql | 12 ++----- ...ts.OrderByDistinctAll1(SQLite.Classic).sql | 28 +++++++++++++++ ...ts.OrderByDistinctAll2(SQLite.Classic).sql | 29 +++++++++++++++ ....CteTests.Test5(SQLite.MS.LinqService).sql | 36 +++++-------------- ...TestCustomCount(SQLite.MS.LinqService).sql | 8 ++--- ...nerJoinDistinct(SQLite.MS.LinqService).sql | 12 ++----- ...inDistinctWhere(SQLite.MS.LinqService).sql | 12 ++----- ...eftJoinDistinct(SQLite.MS.LinqService).sql | 12 ++----- ...inDistinctWhere(SQLite.MS.LinqService).sql | 12 ++----- ...rByDistinctAll1(SQLite.MS.LinqService).sql | 28 +++++++++++++++ ...rByDistinctAll2(SQLite.MS.LinqService).sql | 29 +++++++++++++++ .../Tests.Linq.CteTests.Test5(SQLite.MS).sql | 36 +++++-------------- ...nq.CteTests.TestCustomCount(SQLite.MS).sql | 8 ++--- ...itedTests.InnerJoinDistinct(SQLite.MS).sql | 12 ++----- ...ests.InnerJoinDistinctWhere(SQLite.MS).sql | 12 ++----- ...mitedTests.LeftJoinDistinct(SQLite.MS).sql | 12 ++----- ...Tests.LeftJoinDistinctWhere(SQLite.MS).sql | 12 ++----- ...ctTests.OrderByDistinctAll1(SQLite.MS).sql | 28 +++++++++++++++ ...ctTests.OrderByDistinctAll2(SQLite.MS).sql | 29 +++++++++++++++ 34 files changed, 326 insertions(+), 274 deletions(-) create mode 100644 SQLite.Classic.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.LinqService).sql create mode 100644 SQLite.Classic.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.LinqService).sql create mode 100644 SQLite.Classic/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic).sql create mode 100644 SQLite.Classic/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic).sql create mode 100644 SQLite.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.MS.LinqService).sql create mode 100644 SQLite.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.MS.LinqService).sql create mode 100644 SQLite.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.MS).sql create mode 100644 SQLite.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.MS).sql diff --git a/Northwind.SQLite.MS/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(Northwind.SQLite.MS).sql b/Northwind.SQLite.MS/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(Northwind.SQLite.MS).sql index bee804ed48aa..a400eccb60fb 100644 --- a/Northwind.SQLite.MS/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(Northwind.SQLite.MS).sql +++ b/Northwind.SQLite.MS/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(Northwind.SQLite.MS).sql @@ -1,7 +1,7 @@ BeforeExecute -- Northwind.SQLite.MS SQLite.MS SQLite -SELECT DISTINCT +SELECT [t1].[CustomerID], [t1].[CompanyName], [t1].[ContactName], diff --git a/Northwind.SQLite/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(Northwind.SQLite).sql b/Northwind.SQLite/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(Northwind.SQLite).sql index 6cd59c2bfe5a..b572f0202c2d 100644 --- a/Northwind.SQLite/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(Northwind.SQLite).sql +++ b/Northwind.SQLite/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(Northwind.SQLite).sql @@ -1,7 +1,7 @@ BeforeExecute -- Northwind.SQLite SQLite.Classic SQLite -SELECT DISTINCT +SELECT [t1].[CustomerID], [t1].[CompanyName], [t1].[ContactName], diff --git a/SQLite.Classic.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.LinqService).sql b/SQLite.Classic.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.LinqService).sql index 7a11006a79db..06d16f045aa5 100644 --- a/SQLite.Classic.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.LinqService).sql +++ b/SQLite.Classic.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SQLite.Classic.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.LinqService).sql b/SQLite.Classic.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.LinqService).sql index 92de56f17488..aa901c080ec0 100644 --- a/SQLite.Classic.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.LinqService).sql +++ b/SQLite.Classic.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SQLite.Classic SQLite (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.LinqService).sql b/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.LinqService).sql index 2984b33186ba..ad787cb9183c 100644 --- a/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.LinqService).sql +++ b/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.LinqService).sql b/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.LinqService).sql index ce710cdecf97..56b94abc5aac 100644 --- a/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.LinqService).sql +++ b/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.LinqService).sql b/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.LinqService).sql index 0db0a7687c83..c0d9c6d261f7 100644 --- a/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.LinqService).sql +++ b/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.LinqService).sql b/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.LinqService).sql index 6a4b3590028d..649435ae237c 100644 --- a/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.LinqService).sql +++ b/SQLite.Classic.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.Classic.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.LinqService).sql b/SQLite.Classic.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.LinqService).sql new file mode 100644 index 000000000000..db762c6eb68e --- /dev/null +++ b/SQLite.Classic.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SQLite.Classic SQLite (asynchronously) +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.Classic SQLite (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.Classic.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.LinqService).sql b/SQLite.Classic.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.LinqService).sql new file mode 100644 index 000000000000..5cbab339df26 --- /dev/null +++ b/SQLite.Classic.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SQLite.Classic SQLite (asynchronously) +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.Classic SQLite (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.Classic/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic).sql b/SQLite.Classic/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic).sql index 756cf17f4ce4..b4ae4240a50f 100644 --- a/SQLite.Classic/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic).sql +++ b/SQLite.Classic/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.Classic).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SQLite.Classic/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic).sql b/SQLite.Classic/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic).sql index f729d975a005..1d49a07f2d05 100644 --- a/SQLite.Classic/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic).sql +++ b/SQLite.Classic/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.Classic).sql @@ -1,11 +1,11 @@ BeforeExecute -- SQLite.Classic SQLite -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic).sql b/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic).sql index 5a3f01b61313..26351e1d5667 100644 --- a/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic).sql +++ b/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.Classic).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic).sql b/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic).sql index d1dbd249e1e9..f975c6c7e4b1 100644 --- a/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic).sql +++ b/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.Classic).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic).sql b/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic).sql index ca177b1013b3..bdc38c143c54 100644 --- a/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic).sql +++ b/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.Classic).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic).sql b/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic).sql index af7f71c79247..0afd5259e423 100644 --- a/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic).sql +++ b/SQLite.Classic/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.Classic).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.Classic/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic).sql b/SQLite.Classic/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic).sql new file mode 100644 index 000000000000..1bd30dd8c048 --- /dev/null +++ b/SQLite.Classic/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.Classic).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SQLite.Classic SQLite +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.Classic SQLite + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.Classic/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic).sql b/SQLite.Classic/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic).sql new file mode 100644 index 000000000000..f61c02b65819 --- /dev/null +++ b/SQLite.Classic/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.Classic).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SQLite.Classic SQLite +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.Classic SQLite + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.MS.LinqService).sql b/SQLite.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.MS.LinqService).sql index 5b1cce04fca5..8a9bb73f6daa 100644 --- a/SQLite.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.MS.LinqService).sql +++ b/SQLite.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.MS.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SQLite.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.MS.LinqService).sql b/SQLite.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.MS.LinqService).sql index 7c0330f72e08..0129f5bf5683 100644 --- a/SQLite.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.MS.LinqService).sql +++ b/SQLite.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.MS.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SQLite.MS SQLite (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.MS.LinqService).sql b/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.MS.LinqService).sql index 25084f67ff82..a0eceda71c24 100644 --- a/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.MS.LinqService).sql +++ b/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.MS.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.MS.LinqService).sql b/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.MS.LinqService).sql index 89514d9dd5ab..9bd6a63a009f 100644 --- a/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.MS.LinqService).sql +++ b/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.MS.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.MS.LinqService).sql b/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.MS.LinqService).sql index fc18005020df..bae1324683f1 100644 --- a/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.MS.LinqService).sql +++ b/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.MS.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.MS.LinqService).sql b/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.MS.LinqService).sql index 0c3b54d41c5c..5b5d0b9e1961 100644 --- a/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.MS.LinqService).sql +++ b/SQLite.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.MS.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.MS.LinqService).sql b/SQLite.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.MS.LinqService).sql new file mode 100644 index 000000000000..8d277f697cb6 --- /dev/null +++ b/SQLite.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.MS.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SQLite.MS SQLite (asynchronously) +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.MS SQLite (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.MS.LinqService).sql b/SQLite.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.MS.LinqService).sql new file mode 100644 index 000000000000..583cdec1ebf7 --- /dev/null +++ b/SQLite.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.MS.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SQLite.MS SQLite (asynchronously) +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.MS SQLite (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.MS).sql b/SQLite.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.MS).sql index 9844e2a6d3a1..01af1fcfbd9a 100644 --- a/SQLite.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.MS).sql +++ b/SQLite.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SQLite.MS).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SQLite.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.MS).sql b/SQLite.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.MS).sql index d33fabe507e4..2ae1a9d80848 100644 --- a/SQLite.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.MS).sql +++ b/SQLite.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SQLite.MS).sql @@ -1,11 +1,11 @@ BeforeExecute -- SQLite.MS SQLite -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.MS).sql b/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.MS).sql index 5ddc6f1ed4ff..5c2735d33fa1 100644 --- a/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.MS).sql +++ b/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SQLite.MS).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.MS).sql b/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.MS).sql index 5e3a00282ecb..f3c1976cc348 100644 --- a/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.MS).sql +++ b/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SQLite.MS).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.MS).sql b/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.MS).sql index 88201e5308f1..c1e4020ed8be 100644 --- a/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.MS).sql +++ b/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SQLite.MS).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.MS).sql b/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.MS).sql index 28bc711ee635..1b90dc67fe70 100644 --- a/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.MS).sql +++ b/SQLite.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SQLite.MS).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SQLite.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.MS).sql b/SQLite.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.MS).sql new file mode 100644 index 000000000000..2c20c9bad123 --- /dev/null +++ b/SQLite.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SQLite.MS).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SQLite.MS SQLite +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.MS SQLite + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SQLite.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.MS).sql b/SQLite.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.MS).sql new file mode 100644 index 000000000000..6dd07d9d77de --- /dev/null +++ b/SQLite.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SQLite.MS).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SQLite.MS SQLite +DECLARE @take -- Int32 +SET @take = 2 +DECLARE @skip -- Int32 +SET @skip = 1 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +LIMIT @take OFFSET @skip + +BeforeExecute +-- SQLite.MS SQLite + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From 3372030e3a54b0a6d7598056ed865414d8fc3ad2 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:24:12 +0000 Subject: [PATCH 05/42] [Windows / SQL Server 2008] baselines --- ...ests.Test5(SqlServer.2008.LinqService).sql | 36 ++++-------------- ...ustomCount(SqlServer.2008.LinqService).sql | 8 ++-- ...inDistinct(SqlServer.2008.LinqService).sql | 14 ++----- ...tinctWhere(SqlServer.2008.LinqService).sql | 14 ++----- ...inDistinct(SqlServer.2008.LinqService).sql | 14 ++----- ...tinctWhere(SqlServer.2008.LinqService).sql | 14 ++----- ...stinctAll1(SqlServer.2008.LinqService).sql | 34 +++++++++++++++++ ...stinctAll2(SqlServer.2008.LinqService).sql | 38 +++++++++++++++++++ ...s.Test5(SqlServer.2008.MS.LinqService).sql | 36 ++++-------------- ...omCount(SqlServer.2008.MS.LinqService).sql | 8 ++-- ...istinct(SqlServer.2008.MS.LinqService).sql | 14 ++----- ...ctWhere(SqlServer.2008.MS.LinqService).sql | 14 ++----- ...istinct(SqlServer.2008.MS.LinqService).sql | 14 ++----- ...ctWhere(SqlServer.2008.MS.LinqService).sql | 14 ++----- ...nctAll1(SqlServer.2008.MS.LinqService).sql | 34 +++++++++++++++++ ...nctAll2(SqlServer.2008.MS.LinqService).sql | 38 +++++++++++++++++++ ...Linq.CteTests.Test5(SqlServer.2008.MS).sql | 36 ++++-------------- ...sts.TestCustomCount(SqlServer.2008.MS).sql | 8 ++-- ...s.InnerJoinDistinct(SqlServer.2008.MS).sql | 14 ++----- ...erJoinDistinctWhere(SqlServer.2008.MS).sql | 14 ++----- ...ts.LeftJoinDistinct(SqlServer.2008.MS).sql | 14 ++----- ...ftJoinDistinctWhere(SqlServer.2008.MS).sql | 14 ++----- ...OrderByDistinctAll1(SqlServer.2008.MS).sql | 34 +++++++++++++++++ ...OrderByDistinctAll2(SqlServer.2008.MS).sql | 38 +++++++++++++++++++ ...ts.Linq.CteTests.Test5(SqlServer.2008).sql | 36 ++++-------------- ...eTests.TestCustomCount(SqlServer.2008).sql | 8 ++-- ...ests.InnerJoinDistinct(SqlServer.2008).sql | 14 ++----- ...InnerJoinDistinctWhere(SqlServer.2008).sql | 14 ++----- ...Tests.LeftJoinDistinct(SqlServer.2008).sql | 14 ++----- ....LeftJoinDistinctWhere(SqlServer.2008).sql | 14 ++----- ...ts.OrderByDistinctAll1(SqlServer.2008).sql | 34 +++++++++++++++++ ...ts.OrderByDistinctAll2(SqlServer.2008).sql | 38 +++++++++++++++++++ 32 files changed, 384 insertions(+), 304 deletions(-) create mode 100644 SqlServer.2008.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008.LinqService).sql create mode 100644 SqlServer.2008.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008.LinqService).sql create mode 100644 SqlServer.2008.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008.MS.LinqService).sql create mode 100644 SqlServer.2008.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008.MS.LinqService).sql create mode 100644 SqlServer.2008.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008.MS).sql create mode 100644 SqlServer.2008.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008.MS).sql create mode 100644 SqlServer.2008/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008).sql create mode 100644 SqlServer.2008/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008).sql diff --git a/SqlServer.2008.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008.LinqService).sql b/SqlServer.2008.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008.LinqService).sql index 934095910258..d74b11d1f9fd 100644 --- a/SqlServer.2008.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008.LinqService).sql +++ b/SqlServer.2008.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2008.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008.LinqService).sql b/SqlServer.2008.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008.LinqService).sql index c4a73cb6f162..ae379ed1d702 100644 --- a/SqlServer.2008.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008.LinqService).sql +++ b/SqlServer.2008.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2008 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008.LinqService).sql b/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008.LinqService).sql index c0ce0c96ac4a..013a9a5d7193 100644 --- a/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008.LinqService).sql +++ b/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008.LinqService).sql b/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008.LinqService).sql index a33593df9fa8..6e176f9caac6 100644 --- a/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008.LinqService).sql +++ b/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008.LinqService).sql b/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008.LinqService).sql index af083bb54560..fd312b04692b 100644 --- a/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008.LinqService).sql +++ b/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008.LinqService).sql b/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008.LinqService).sql index bc7dde1c43fc..6ff8db4232db 100644 --- a/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008.LinqService).sql +++ b/SqlServer.2008.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2008.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008.LinqService).sql b/SqlServer.2008.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008.LinqService).sql new file mode 100644 index 000000000000..44145acaa2fb --- /dev/null +++ b/SqlServer.2008.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008.LinqService).sql @@ -0,0 +1,34 @@ +BeforeExecute +-- SqlServer.2008 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) + +BeforeExecute +-- SqlServer.2008 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2008.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008.LinqService).sql b/SqlServer.2008.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008.LinqService).sql new file mode 100644 index 000000000000..dbbdaf06c035 --- /dev/null +++ b/SqlServer.2008.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008.LinqService).sql @@ -0,0 +1,38 @@ +BeforeExecute +-- SqlServer.2008 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName], + [t1].[FirstName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + [r].[FirstName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) +ORDER BY + [t1].[FirstName] + +BeforeExecute +-- SqlServer.2008 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2008.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008.MS.LinqService).sql b/SqlServer.2008.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008.MS.LinqService).sql index 90fff2df1054..8f7a14921640 100644 --- a/SqlServer.2008.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008.MS.LinqService).sql +++ b/SqlServer.2008.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008.MS.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2008.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008.MS.LinqService).sql b/SqlServer.2008.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008.MS.LinqService).sql index dd72ccbe864f..c86237d83bd3 100644 --- a/SqlServer.2008.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008.MS.LinqService).sql +++ b/SqlServer.2008.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008.MS.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2008.MS SqlServer.2008 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008.MS.LinqService).sql b/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008.MS.LinqService).sql index f1c60f5d6696..02ce85e0658a 100644 --- a/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008.MS.LinqService).sql +++ b/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008.MS.LinqService).sql b/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008.MS.LinqService).sql index 902a54642608..b04ef16dd175 100644 --- a/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008.MS.LinqService).sql +++ b/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008.MS.LinqService).sql b/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008.MS.LinqService).sql index 833e4d3e9e4c..43baf6c3e511 100644 --- a/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008.MS.LinqService).sql +++ b/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008.MS.LinqService).sql b/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008.MS.LinqService).sql index 7342d4c2d17a..59510e2834ad 100644 --- a/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008.MS.LinqService).sql +++ b/SqlServer.2008.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2008.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008.MS.LinqService).sql b/SqlServer.2008.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008.MS.LinqService).sql new file mode 100644 index 000000000000..31c9c7a837bd --- /dev/null +++ b/SqlServer.2008.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008.MS.LinqService).sql @@ -0,0 +1,34 @@ +BeforeExecute +-- SqlServer.2008.MS SqlServer.2008 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) + +BeforeExecute +-- SqlServer.2008.MS SqlServer.2008 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2008.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008.MS.LinqService).sql b/SqlServer.2008.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008.MS.LinqService).sql new file mode 100644 index 000000000000..4bbbb7eddcc4 --- /dev/null +++ b/SqlServer.2008.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008.MS.LinqService).sql @@ -0,0 +1,38 @@ +BeforeExecute +-- SqlServer.2008.MS SqlServer.2008 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName], + [t1].[FirstName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + [r].[FirstName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) +ORDER BY + [t1].[FirstName] + +BeforeExecute +-- SqlServer.2008.MS SqlServer.2008 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2008.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008.MS).sql b/SqlServer.2008.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008.MS).sql index 812a13b3bd58..ff35f0ecf193 100644 --- a/SqlServer.2008.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008.MS).sql +++ b/SqlServer.2008.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008.MS).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2008.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008.MS).sql b/SqlServer.2008.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008.MS).sql index 76058ee0e6b8..76e27ef1f6fa 100644 --- a/SqlServer.2008.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008.MS).sql +++ b/SqlServer.2008.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008.MS).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2008.MS SqlServer.2008 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008.MS).sql b/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008.MS).sql index 89137eb4cea1..b068c466d091 100644 --- a/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008.MS).sql +++ b/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008.MS).sql b/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008.MS).sql index ccd9fb7884f2..3465ddda12f5 100644 --- a/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008.MS).sql +++ b/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008.MS).sql b/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008.MS).sql index 2ecac75ede03..c073ef830f8d 100644 --- a/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008.MS).sql +++ b/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008.MS).sql b/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008.MS).sql index bef665288f84..adcc3535c27f 100644 --- a/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008.MS).sql +++ b/SqlServer.2008.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2008.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008.MS).sql b/SqlServer.2008.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008.MS).sql new file mode 100644 index 000000000000..87f11567cda6 --- /dev/null +++ b/SqlServer.2008.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008.MS).sql @@ -0,0 +1,34 @@ +BeforeExecute +-- SqlServer.2008.MS SqlServer.2008 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) + +BeforeExecute +-- SqlServer.2008.MS SqlServer.2008 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2008.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008.MS).sql b/SqlServer.2008.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008.MS).sql new file mode 100644 index 000000000000..d34bb37d43b8 --- /dev/null +++ b/SqlServer.2008.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008.MS).sql @@ -0,0 +1,38 @@ +BeforeExecute +-- SqlServer.2008.MS SqlServer.2008 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName], + [t1].[FirstName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + [r].[FirstName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) +ORDER BY + [t1].[FirstName] + +BeforeExecute +-- SqlServer.2008.MS SqlServer.2008 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2008/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008).sql b/SqlServer.2008/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008).sql index 26df97f35819..3864f1a063b1 100644 --- a/SqlServer.2008/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008).sql +++ b/SqlServer.2008/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2008).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2008/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008).sql b/SqlServer.2008/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008).sql index f30d1224674e..801315ef4307 100644 --- a/SqlServer.2008/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008).sql +++ b/SqlServer.2008/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2008).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2008 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008).sql b/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008).sql index 2fd9aa77adbd..f985e2747fed 100644 --- a/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008).sql +++ b/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2008).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008).sql b/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008).sql index fe80f8fdd672..3dcb911a34bb 100644 --- a/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008).sql +++ b/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2008).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008).sql b/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008).sql index 89b20a90c001..0ce3b8ffd71d 100644 --- a/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008).sql +++ b/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2008).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008).sql b/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008).sql index 5740895fde77..b18cbb4aedc2 100644 --- a/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008).sql +++ b/SqlServer.2008/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2008).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2008/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008).sql b/SqlServer.2008/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008).sql new file mode 100644 index 000000000000..51b9c8cea9ef --- /dev/null +++ b/SqlServer.2008/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2008).sql @@ -0,0 +1,34 @@ +BeforeExecute +-- SqlServer.2008 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) + +BeforeExecute +-- SqlServer.2008 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2008/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008).sql b/SqlServer.2008/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008).sql new file mode 100644 index 000000000000..d527158a7c88 --- /dev/null +++ b/SqlServer.2008/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2008).sql @@ -0,0 +1,38 @@ +BeforeExecute +-- SqlServer.2008 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [t1].[ID], + [t1].[LastName], + [t1].[FirstName] +FROM + ( + SELECT + [r].[PersonID] as [ID], + [r].[LastName], + [r].[FirstName], + ROW_NUMBER() OVER (ORDER BY [r].[FirstName]) as [RN] + FROM + [Person] [r] + ) [t1] +WHERE + [t1].[RN] > @skip AND [t1].[RN] <= (@skip + @take) +ORDER BY + [t1].[FirstName] + +BeforeExecute +-- SqlServer.2008 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From 314d59ae5afba2259bb2ae885f2090dfafeebc67 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:27:55 +0000 Subject: [PATCH 06/42] [Windows / SQL Server 2014] baselines --- ...ests.Test5(SqlServer.2014.LinqService).sql | 36 +++++-------------- ...ustomCount(SqlServer.2014.LinqService).sql | 8 ++--- ...inDistinct(SqlServer.2014.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2014.LinqService).sql | 14 ++------ ...inDistinct(SqlServer.2014.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2014.LinqService).sql | 14 ++------ ...stinctAll1(SqlServer.2014.LinqService).sql | 28 +++++++++++++++ ...stinctAll2(SqlServer.2014.LinqService).sql | 29 +++++++++++++++ ...s.Test5(SqlServer.2014.MS.LinqService).sql | 36 +++++-------------- ...omCount(SqlServer.2014.MS.LinqService).sql | 8 ++--- ...istinct(SqlServer.2014.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2014.MS.LinqService).sql | 14 ++------ ...istinct(SqlServer.2014.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2014.MS.LinqService).sql | 14 ++------ ...nctAll1(SqlServer.2014.MS.LinqService).sql | 28 +++++++++++++++ ...nctAll2(SqlServer.2014.MS.LinqService).sql | 29 +++++++++++++++ ...Linq.CteTests.Test5(SqlServer.2014.MS).sql | 36 +++++-------------- ...sts.TestCustomCount(SqlServer.2014.MS).sql | 8 ++--- ...s.InnerJoinDistinct(SqlServer.2014.MS).sql | 14 ++------ ...erJoinDistinctWhere(SqlServer.2014.MS).sql | 14 ++------ ...ts.LeftJoinDistinct(SqlServer.2014.MS).sql | 14 ++------ ...ftJoinDistinctWhere(SqlServer.2014.MS).sql | 14 ++------ ...OrderByDistinctAll1(SqlServer.2014.MS).sql | 28 +++++++++++++++ ...OrderByDistinctAll2(SqlServer.2014.MS).sql | 29 +++++++++++++++ ...ts.Linq.CteTests.Test5(SqlServer.2014).sql | 36 +++++-------------- ...eTests.TestCustomCount(SqlServer.2014).sql | 8 ++--- ...ests.InnerJoinDistinct(SqlServer.2014).sql | 14 ++------ ...InnerJoinDistinctWhere(SqlServer.2014).sql | 14 ++------ ...Tests.LeftJoinDistinct(SqlServer.2014).sql | 14 ++------ ....LeftJoinDistinctWhere(SqlServer.2014).sql | 14 ++------ ...ts.OrderByDistinctAll1(SqlServer.2014).sql | 28 +++++++++++++++ ...ts.OrderByDistinctAll2(SqlServer.2014).sql | 29 +++++++++++++++ 32 files changed, 324 insertions(+), 304 deletions(-) create mode 100644 SqlServer.2014.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014.LinqService).sql create mode 100644 SqlServer.2014.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014.LinqService).sql create mode 100644 SqlServer.2014.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014.MS.LinqService).sql create mode 100644 SqlServer.2014.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014.MS.LinqService).sql create mode 100644 SqlServer.2014.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014.MS).sql create mode 100644 SqlServer.2014.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014.MS).sql create mode 100644 SqlServer.2014/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014).sql create mode 100644 SqlServer.2014/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014).sql diff --git a/SqlServer.2014.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014.LinqService).sql b/SqlServer.2014.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014.LinqService).sql index 44c07b775c87..d9e7fa23db7f 100644 --- a/SqlServer.2014.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014.LinqService).sql +++ b/SqlServer.2014.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2014.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014.LinqService).sql b/SqlServer.2014.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014.LinqService).sql index ec37aa99a09b..355c273c049c 100644 --- a/SqlServer.2014.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014.LinqService).sql +++ b/SqlServer.2014.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2014 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014.LinqService).sql b/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014.LinqService).sql index 8c4df6d64d5f..4873cab4ef59 100644 --- a/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014.LinqService).sql +++ b/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014.LinqService).sql b/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014.LinqService).sql index 47320ee7aa9a..adde2635e6ff 100644 --- a/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014.LinqService).sql +++ b/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014.LinqService).sql b/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014.LinqService).sql index ddea539dffdf..0ba6d614c1ad 100644 --- a/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014.LinqService).sql +++ b/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014.LinqService).sql b/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014.LinqService).sql index 859e39088b26..1ef13776f47f 100644 --- a/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014.LinqService).sql +++ b/SqlServer.2014.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2014.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014.LinqService).sql b/SqlServer.2014.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014.LinqService).sql new file mode 100644 index 000000000000..e6e6fbeb2930 --- /dev/null +++ b/SqlServer.2014.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2014 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2014 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2014.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014.LinqService).sql b/SqlServer.2014.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014.LinqService).sql new file mode 100644 index 000000000000..c1dc1efc322e --- /dev/null +++ b/SqlServer.2014.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2014 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2014 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2014.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014.MS.LinqService).sql b/SqlServer.2014.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014.MS.LinqService).sql index d1d2e6561901..a4e3e44c0ca5 100644 --- a/SqlServer.2014.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014.MS.LinqService).sql +++ b/SqlServer.2014.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014.MS.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2014.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014.MS.LinqService).sql b/SqlServer.2014.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014.MS.LinqService).sql index 6fbbe0b3bafd..ff45ec3a2675 100644 --- a/SqlServer.2014.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014.MS.LinqService).sql +++ b/SqlServer.2014.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014.MS.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2014.MS SqlServer.2014 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014.MS.LinqService).sql b/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014.MS.LinqService).sql index a94e6724ec79..fe8f9085014a 100644 --- a/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014.MS.LinqService).sql +++ b/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014.MS.LinqService).sql b/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014.MS.LinqService).sql index 7832b0832f9a..2090f5a6a7f8 100644 --- a/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014.MS.LinqService).sql +++ b/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014.MS.LinqService).sql b/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014.MS.LinqService).sql index d152c2b80a5b..eaaa952b7107 100644 --- a/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014.MS.LinqService).sql +++ b/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014.MS.LinqService).sql b/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014.MS.LinqService).sql index 54cec21fe0c6..33825e99a803 100644 --- a/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014.MS.LinqService).sql +++ b/SqlServer.2014.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2014.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014.MS.LinqService).sql b/SqlServer.2014.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014.MS.LinqService).sql new file mode 100644 index 000000000000..0b115d4405b9 --- /dev/null +++ b/SqlServer.2014.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014.MS.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2014.MS SqlServer.2014 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2014.MS SqlServer.2014 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2014.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014.MS.LinqService).sql b/SqlServer.2014.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014.MS.LinqService).sql new file mode 100644 index 000000000000..d54f85680d8b --- /dev/null +++ b/SqlServer.2014.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014.MS.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2014.MS SqlServer.2014 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2014.MS SqlServer.2014 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2014.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014.MS).sql b/SqlServer.2014.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014.MS).sql index c7a7002edee5..b96e081f4885 100644 --- a/SqlServer.2014.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014.MS).sql +++ b/SqlServer.2014.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014.MS).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2014.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014.MS).sql b/SqlServer.2014.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014.MS).sql index f852746db2a5..47c1c4b04f2c 100644 --- a/SqlServer.2014.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014.MS).sql +++ b/SqlServer.2014.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014.MS).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2014.MS SqlServer.2014 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014.MS).sql b/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014.MS).sql index de1acc65c983..1e092717d965 100644 --- a/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014.MS).sql +++ b/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014.MS).sql b/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014.MS).sql index 0403aaf276e2..cd0b4284654e 100644 --- a/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014.MS).sql +++ b/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014.MS).sql b/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014.MS).sql index 46e2bf1f064a..e41b662649c0 100644 --- a/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014.MS).sql +++ b/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014.MS).sql b/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014.MS).sql index 35027e681077..0d0020a66323 100644 --- a/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014.MS).sql +++ b/SqlServer.2014.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2014.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014.MS).sql b/SqlServer.2014.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014.MS).sql new file mode 100644 index 000000000000..7e25d5257655 --- /dev/null +++ b/SqlServer.2014.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014.MS).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2014.MS SqlServer.2014 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2014.MS SqlServer.2014 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2014.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014.MS).sql b/SqlServer.2014.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014.MS).sql new file mode 100644 index 000000000000..1cd6aa53aa48 --- /dev/null +++ b/SqlServer.2014.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014.MS).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2014.MS SqlServer.2014 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2014.MS SqlServer.2014 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2014/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014).sql b/SqlServer.2014/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014).sql index 16adaa2eed76..48531e1064b7 100644 --- a/SqlServer.2014/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014).sql +++ b/SqlServer.2014/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2014).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2014/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014).sql b/SqlServer.2014/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014).sql index 1b246ffed8f2..146250022af3 100644 --- a/SqlServer.2014/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014).sql +++ b/SqlServer.2014/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2014).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2014 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014).sql b/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014).sql index f6b362b5e358..2f579348e4b0 100644 --- a/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014).sql +++ b/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2014).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014).sql b/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014).sql index ccc078054acb..a7e60717c106 100644 --- a/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014).sql +++ b/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2014).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014).sql b/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014).sql index 06c0c0e4ba34..3f5fc5b658db 100644 --- a/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014).sql +++ b/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2014).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014).sql b/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014).sql index 4bc2b29b4941..319afec4a662 100644 --- a/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014).sql +++ b/SqlServer.2014/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2014).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2014/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014).sql b/SqlServer.2014/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014).sql new file mode 100644 index 000000000000..dde4c71c4d95 --- /dev/null +++ b/SqlServer.2014/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2014).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2014 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2014 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2014/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014).sql b/SqlServer.2014/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014).sql new file mode 100644 index 000000000000..cae2442c664c --- /dev/null +++ b/SqlServer.2014/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2014).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2014 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2014 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From 87b84363ff1a078d73f4270fbe2e27b21dff5c81 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:29:22 +0000 Subject: [PATCH 07/42] [Windows / SQL Server 2012] baselines --- ...ests.Test5(SqlServer.2012.LinqService).sql | 36 +++++-------------- ...ustomCount(SqlServer.2012.LinqService).sql | 8 ++--- ...inDistinct(SqlServer.2012.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2012.LinqService).sql | 14 ++------ ...inDistinct(SqlServer.2012.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2012.LinqService).sql | 14 ++------ ...stinctAll1(SqlServer.2012.LinqService).sql | 28 +++++++++++++++ ...stinctAll2(SqlServer.2012.LinqService).sql | 29 +++++++++++++++ ...s.Test5(SqlServer.2012.MS.LinqService).sql | 36 +++++-------------- ...omCount(SqlServer.2012.MS.LinqService).sql | 8 ++--- ...istinct(SqlServer.2012.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2012.MS.LinqService).sql | 14 ++------ ...istinct(SqlServer.2012.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2012.MS.LinqService).sql | 14 ++------ ...nctAll1(SqlServer.2012.MS.LinqService).sql | 28 +++++++++++++++ ...nctAll2(SqlServer.2012.MS.LinqService).sql | 29 +++++++++++++++ ...Linq.CteTests.Test5(SqlServer.2012.MS).sql | 36 +++++-------------- ...sts.TestCustomCount(SqlServer.2012.MS).sql | 8 ++--- ...s.InnerJoinDistinct(SqlServer.2012.MS).sql | 14 ++------ ...erJoinDistinctWhere(SqlServer.2012.MS).sql | 14 ++------ ...ts.LeftJoinDistinct(SqlServer.2012.MS).sql | 14 ++------ ...ftJoinDistinctWhere(SqlServer.2012.MS).sql | 14 ++------ ...OrderByDistinctAll1(SqlServer.2012.MS).sql | 28 +++++++++++++++ ...OrderByDistinctAll2(SqlServer.2012.MS).sql | 29 +++++++++++++++ ...ts.Linq.CteTests.Test5(SqlServer.2012).sql | 36 +++++-------------- ...eTests.TestCustomCount(SqlServer.2012).sql | 8 ++--- ...ests.InnerJoinDistinct(SqlServer.2012).sql | 14 ++------ ...InnerJoinDistinctWhere(SqlServer.2012).sql | 14 ++------ ...Tests.LeftJoinDistinct(SqlServer.2012).sql | 14 ++------ ....LeftJoinDistinctWhere(SqlServer.2012).sql | 14 ++------ ...ts.OrderByDistinctAll1(SqlServer.2012).sql | 28 +++++++++++++++ ...ts.OrderByDistinctAll2(SqlServer.2012).sql | 29 +++++++++++++++ 32 files changed, 324 insertions(+), 304 deletions(-) create mode 100644 SqlServer.2012.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012.LinqService).sql create mode 100644 SqlServer.2012.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012.LinqService).sql create mode 100644 SqlServer.2012.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012.MS.LinqService).sql create mode 100644 SqlServer.2012.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012.MS.LinqService).sql create mode 100644 SqlServer.2012.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012.MS).sql create mode 100644 SqlServer.2012.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012.MS).sql create mode 100644 SqlServer.2012/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012).sql create mode 100644 SqlServer.2012/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012).sql diff --git a/SqlServer.2012.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012.LinqService).sql b/SqlServer.2012.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012.LinqService).sql index 839bad40671f..ca87d4af93fd 100644 --- a/SqlServer.2012.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012.LinqService).sql +++ b/SqlServer.2012.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2012.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012.LinqService).sql b/SqlServer.2012.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012.LinqService).sql index e61e6ce34ec4..f8a24404ed96 100644 --- a/SqlServer.2012.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012.LinqService).sql +++ b/SqlServer.2012.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2012 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012.LinqService).sql b/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012.LinqService).sql index be0d58b1d0fe..c28a4f26e0f2 100644 --- a/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012.LinqService).sql +++ b/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012.LinqService).sql b/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012.LinqService).sql index 0805c28e0c53..39c59424a2b8 100644 --- a/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012.LinqService).sql +++ b/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012.LinqService).sql b/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012.LinqService).sql index 84e507407402..455d39ba6ce1 100644 --- a/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012.LinqService).sql +++ b/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012.LinqService).sql b/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012.LinqService).sql index e8befea2a809..6f20c8502af9 100644 --- a/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012.LinqService).sql +++ b/SqlServer.2012.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2012.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012.LinqService).sql b/SqlServer.2012.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012.LinqService).sql new file mode 100644 index 000000000000..67a45ff8fe96 --- /dev/null +++ b/SqlServer.2012.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2012 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2012 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2012.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012.LinqService).sql b/SqlServer.2012.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012.LinqService).sql new file mode 100644 index 000000000000..55711babd82e --- /dev/null +++ b/SqlServer.2012.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2012 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2012 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2012.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012.MS.LinqService).sql b/SqlServer.2012.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012.MS.LinqService).sql index b128f1ac9a2b..996ba74d4c92 100644 --- a/SqlServer.2012.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012.MS.LinqService).sql +++ b/SqlServer.2012.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012.MS.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2012.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012.MS.LinqService).sql b/SqlServer.2012.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012.MS.LinqService).sql index a6ba8ad1cd9d..d272a7bdd236 100644 --- a/SqlServer.2012.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012.MS.LinqService).sql +++ b/SqlServer.2012.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012.MS.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2012.MS SqlServer.2012 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012.MS.LinqService).sql b/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012.MS.LinqService).sql index beabbc67731b..11f4b6ecd5a8 100644 --- a/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012.MS.LinqService).sql +++ b/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012.MS.LinqService).sql b/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012.MS.LinqService).sql index f19fd136f2a5..cd7d89edba32 100644 --- a/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012.MS.LinqService).sql +++ b/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012.MS.LinqService).sql b/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012.MS.LinqService).sql index 27d0440c61a0..7f3af9266a6f 100644 --- a/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012.MS.LinqService).sql +++ b/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012.MS.LinqService).sql b/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012.MS.LinqService).sql index beff4140f7f7..6e8783c35872 100644 --- a/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012.MS.LinqService).sql +++ b/SqlServer.2012.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2012.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012.MS.LinqService).sql b/SqlServer.2012.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012.MS.LinqService).sql new file mode 100644 index 000000000000..92ca4395553b --- /dev/null +++ b/SqlServer.2012.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012.MS.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2012.MS SqlServer.2012 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2012.MS SqlServer.2012 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2012.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012.MS.LinqService).sql b/SqlServer.2012.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012.MS.LinqService).sql new file mode 100644 index 000000000000..9aa0c27cd802 --- /dev/null +++ b/SqlServer.2012.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012.MS.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2012.MS SqlServer.2012 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2012.MS SqlServer.2012 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2012.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012.MS).sql b/SqlServer.2012.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012.MS).sql index d17468bb3107..12b3a9074ec7 100644 --- a/SqlServer.2012.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012.MS).sql +++ b/SqlServer.2012.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012.MS).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2012.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012.MS).sql b/SqlServer.2012.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012.MS).sql index 22326a8bbe5f..0e374f3b72eb 100644 --- a/SqlServer.2012.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012.MS).sql +++ b/SqlServer.2012.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012.MS).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2012.MS SqlServer.2012 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012.MS).sql b/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012.MS).sql index 747ead91a2fa..b09bfefffac0 100644 --- a/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012.MS).sql +++ b/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012.MS).sql b/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012.MS).sql index 86fa163fcdcd..9133fc746f7d 100644 --- a/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012.MS).sql +++ b/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012.MS).sql b/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012.MS).sql index 7d2798a1ab20..7b9da4b4bf22 100644 --- a/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012.MS).sql +++ b/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012.MS).sql b/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012.MS).sql index 477206768e42..42fef7fe1e0a 100644 --- a/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012.MS).sql +++ b/SqlServer.2012.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2012.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012.MS).sql b/SqlServer.2012.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012.MS).sql new file mode 100644 index 000000000000..f39dfd984dc4 --- /dev/null +++ b/SqlServer.2012.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012.MS).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2012.MS SqlServer.2012 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2012.MS SqlServer.2012 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2012.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012.MS).sql b/SqlServer.2012.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012.MS).sql new file mode 100644 index 000000000000..4b05de81196a --- /dev/null +++ b/SqlServer.2012.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012.MS).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2012.MS SqlServer.2012 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2012.MS SqlServer.2012 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2012/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012).sql b/SqlServer.2012/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012).sql index 4db15205a4c5..55dff03a5edf 100644 --- a/SqlServer.2012/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012).sql +++ b/SqlServer.2012/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2012).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2012/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012).sql b/SqlServer.2012/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012).sql index b82d35e5ca27..3c646d310932 100644 --- a/SqlServer.2012/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012).sql +++ b/SqlServer.2012/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2012).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2012 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012).sql b/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012).sql index 38d2eb62bbb3..a82bf8ba301a 100644 --- a/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012).sql +++ b/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2012).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012).sql b/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012).sql index 9ff2a768963a..768cca4df80f 100644 --- a/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012).sql +++ b/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2012).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012).sql b/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012).sql index 3804da690f92..5e0b01f26a7e 100644 --- a/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012).sql +++ b/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2012).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012).sql b/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012).sql index 65a661322312..18c7ffd0fc03 100644 --- a/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012).sql +++ b/SqlServer.2012/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2012).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2012/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012).sql b/SqlServer.2012/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012).sql new file mode 100644 index 000000000000..51a9883fdc97 --- /dev/null +++ b/SqlServer.2012/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2012).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2012 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2012 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2012/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012).sql b/SqlServer.2012/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012).sql new file mode 100644 index 000000000000..95a71ddba3fb --- /dev/null +++ b/SqlServer.2012/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2012).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2012 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2012 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From 81964ec79f1f7aef703bd5f2a2ee8550abcb4259 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:33:38 +0000 Subject: [PATCH 08/42] [Windows / SQL Server 2019] baselines --- ...ests.Test5(SqlServer.2019.LinqService).sql | 36 +++++-------------- ...ustomCount(SqlServer.2019.LinqService).sql | 8 ++--- ...inDistinct(SqlServer.2019.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2019.LinqService).sql | 14 ++------ ...inDistinct(SqlServer.2019.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2019.LinqService).sql | 14 ++------ ...stinctAll1(SqlServer.2019.LinqService).sql | 28 +++++++++++++++ ...stinctAll2(SqlServer.2019.LinqService).sql | 29 +++++++++++++++ ...s.Test5(SqlServer.2019.MS.LinqService).sql | 36 +++++-------------- ...omCount(SqlServer.2019.MS.LinqService).sql | 8 ++--- ...istinct(SqlServer.2019.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2019.MS.LinqService).sql | 14 ++------ ...istinct(SqlServer.2019.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2019.MS.LinqService).sql | 14 ++------ ...nctAll1(SqlServer.2019.MS.LinqService).sql | 28 +++++++++++++++ ...nctAll2(SqlServer.2019.MS.LinqService).sql | 29 +++++++++++++++ ...Linq.CteTests.Test5(SqlServer.2019.MS).sql | 36 +++++-------------- ...sts.TestCustomCount(SqlServer.2019.MS).sql | 8 ++--- ...s.InnerJoinDistinct(SqlServer.2019.MS).sql | 14 ++------ ...erJoinDistinctWhere(SqlServer.2019.MS).sql | 14 ++------ ...ts.LeftJoinDistinct(SqlServer.2019.MS).sql | 14 ++------ ...ftJoinDistinctWhere(SqlServer.2019.MS).sql | 14 ++------ ...OrderByDistinctAll1(SqlServer.2019.MS).sql | 28 +++++++++++++++ ...OrderByDistinctAll2(SqlServer.2019.MS).sql | 29 +++++++++++++++ ...ts.Linq.CteTests.Test5(SqlServer.2019).sql | 36 +++++-------------- ...eTests.TestCustomCount(SqlServer.2019).sql | 8 ++--- ...ests.InnerJoinDistinct(SqlServer.2019).sql | 14 ++------ ...InnerJoinDistinctWhere(SqlServer.2019).sql | 14 ++------ ...Tests.LeftJoinDistinct(SqlServer.2019).sql | 14 ++------ ....LeftJoinDistinctWhere(SqlServer.2019).sql | 14 ++------ ...ts.OrderByDistinctAll1(SqlServer.2019).sql | 28 +++++++++++++++ ...ts.OrderByDistinctAll2(SqlServer.2019).sql | 29 +++++++++++++++ 32 files changed, 324 insertions(+), 304 deletions(-) create mode 100644 SqlServer.2019.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019.LinqService).sql create mode 100644 SqlServer.2019.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019.LinqService).sql create mode 100644 SqlServer.2019.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019.MS.LinqService).sql create mode 100644 SqlServer.2019.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019.MS.LinqService).sql create mode 100644 SqlServer.2019.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019.MS).sql create mode 100644 SqlServer.2019.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019.MS).sql create mode 100644 SqlServer.2019/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019).sql create mode 100644 SqlServer.2019/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019).sql diff --git a/SqlServer.2019.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019.LinqService).sql b/SqlServer.2019.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019.LinqService).sql index 062968962f99..62ce5b449d7b 100644 --- a/SqlServer.2019.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019.LinqService).sql +++ b/SqlServer.2019.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2019.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019.LinqService).sql b/SqlServer.2019.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019.LinqService).sql index 1440253c384c..3e13c5ae5a62 100644 --- a/SqlServer.2019.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019.LinqService).sql +++ b/SqlServer.2019.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2019 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019.LinqService).sql b/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019.LinqService).sql index 3ad271a7f109..5fc983f488d5 100644 --- a/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019.LinqService).sql +++ b/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019.LinqService).sql b/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019.LinqService).sql index 71afdf4efc3e..09fed764f490 100644 --- a/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019.LinqService).sql +++ b/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019.LinqService).sql b/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019.LinqService).sql index 16ba3726cef1..413c07926a1a 100644 --- a/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019.LinqService).sql +++ b/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019.LinqService).sql b/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019.LinqService).sql index 539f8f65ebf4..bf43e7c46e1c 100644 --- a/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019.LinqService).sql +++ b/SqlServer.2019.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2019.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019.LinqService).sql b/SqlServer.2019.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019.LinqService).sql new file mode 100644 index 000000000000..8cbd32d73112 --- /dev/null +++ b/SqlServer.2019.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2019 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2019 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2019.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019.LinqService).sql b/SqlServer.2019.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019.LinqService).sql new file mode 100644 index 000000000000..465269c9a6d6 --- /dev/null +++ b/SqlServer.2019.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2019 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2019 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2019.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019.MS.LinqService).sql b/SqlServer.2019.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019.MS.LinqService).sql index a82a07fe71da..df52ab6cbc11 100644 --- a/SqlServer.2019.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019.MS.LinqService).sql +++ b/SqlServer.2019.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019.MS.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2019.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019.MS.LinqService).sql b/SqlServer.2019.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019.MS.LinqService).sql index 1406599b8c6d..0f699577e3e6 100644 --- a/SqlServer.2019.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019.MS.LinqService).sql +++ b/SqlServer.2019.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019.MS.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2019.MS SqlServer.2019 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019.MS.LinqService).sql b/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019.MS.LinqService).sql index cd4b958dc898..de213c2bf897 100644 --- a/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019.MS.LinqService).sql +++ b/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019.MS.LinqService).sql b/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019.MS.LinqService).sql index 972341789e79..f073010d61e3 100644 --- a/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019.MS.LinqService).sql +++ b/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019.MS.LinqService).sql b/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019.MS.LinqService).sql index 3907bea2f24b..fad6dabcd5ee 100644 --- a/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019.MS.LinqService).sql +++ b/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019.MS.LinqService).sql b/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019.MS.LinqService).sql index 9b1252ad1ea4..f9a295633330 100644 --- a/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019.MS.LinqService).sql +++ b/SqlServer.2019.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2019.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019.MS.LinqService).sql b/SqlServer.2019.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019.MS.LinqService).sql new file mode 100644 index 000000000000..537bed9a563f --- /dev/null +++ b/SqlServer.2019.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019.MS.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2019.MS SqlServer.2019 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2019.MS SqlServer.2019 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2019.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019.MS.LinqService).sql b/SqlServer.2019.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019.MS.LinqService).sql new file mode 100644 index 000000000000..6491de7e5e08 --- /dev/null +++ b/SqlServer.2019.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019.MS.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2019.MS SqlServer.2019 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2019.MS SqlServer.2019 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2019.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019.MS).sql b/SqlServer.2019.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019.MS).sql index 919e3b058078..12b3095ecf8b 100644 --- a/SqlServer.2019.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019.MS).sql +++ b/SqlServer.2019.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019.MS).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2019.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019.MS).sql b/SqlServer.2019.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019.MS).sql index 018b44b79b03..d61152acb1c2 100644 --- a/SqlServer.2019.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019.MS).sql +++ b/SqlServer.2019.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019.MS).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2019.MS SqlServer.2019 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019.MS).sql b/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019.MS).sql index 5c99b17122fb..247868842174 100644 --- a/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019.MS).sql +++ b/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019.MS).sql b/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019.MS).sql index 935773e21dcb..1ce4ce230117 100644 --- a/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019.MS).sql +++ b/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019.MS).sql b/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019.MS).sql index 7df65a6b4c81..a32566c318f7 100644 --- a/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019.MS).sql +++ b/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019.MS).sql b/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019.MS).sql index 24fa1cce01cb..0e5f8bb54c48 100644 --- a/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019.MS).sql +++ b/SqlServer.2019.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2019.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019.MS).sql b/SqlServer.2019.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019.MS).sql new file mode 100644 index 000000000000..b89065cc633a --- /dev/null +++ b/SqlServer.2019.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019.MS).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2019.MS SqlServer.2019 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2019.MS SqlServer.2019 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2019.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019.MS).sql b/SqlServer.2019.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019.MS).sql new file mode 100644 index 000000000000..b93953c19aff --- /dev/null +++ b/SqlServer.2019.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019.MS).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2019.MS SqlServer.2019 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2019.MS SqlServer.2019 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2019/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019).sql b/SqlServer.2019/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019).sql index d04275e687da..10693692762b 100644 --- a/SqlServer.2019/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019).sql +++ b/SqlServer.2019/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2019).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2019/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019).sql b/SqlServer.2019/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019).sql index 3aa8b3e46109..5e291460bed4 100644 --- a/SqlServer.2019/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019).sql +++ b/SqlServer.2019/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2019).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2019 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019).sql b/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019).sql index 743a440983b4..7c30ca214faa 100644 --- a/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019).sql +++ b/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2019).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019).sql b/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019).sql index fcc11f9d7e0b..e69b95a7ff50 100644 --- a/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019).sql +++ b/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2019).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019).sql b/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019).sql index b2e8d28d2fd0..74d76947c210 100644 --- a/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019).sql +++ b/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2019).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019).sql b/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019).sql index d3e180691307..04bdaaf9953a 100644 --- a/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019).sql +++ b/SqlServer.2019/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2019).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2019/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019).sql b/SqlServer.2019/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019).sql new file mode 100644 index 000000000000..6db6f8d1919d --- /dev/null +++ b/SqlServer.2019/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2019).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2019 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2019 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2019/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019).sql b/SqlServer.2019/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019).sql new file mode 100644 index 000000000000..7acf8bb439cc --- /dev/null +++ b/SqlServer.2019/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2019).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2019 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2019 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From 4a982c694cb4fc720f833d10ae76b01719bdda27 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:34:02 +0000 Subject: [PATCH 09/42] [Windows / Access MDB (Jet/ODBC)] baselines --- ...nDistinct(Access.Jet.Odbc.LinqService).sql | 12 +++------- ...inctWhere(Access.Jet.Odbc.LinqService).sql | 12 +++------- ...nDistinct(Access.Jet.Odbc.LinqService).sql | 12 +++------- ...inctWhere(Access.Jet.Odbc.LinqService).sql | 12 +++------- ...tinctAll1(Access.Jet.Odbc.LinqService).sql | 23 ++++++++++++++++++ ...tinctAll2(Access.Jet.Odbc.LinqService).sql | 24 +++++++++++++++++++ ...sts.InnerJoinDistinct(Access.Jet.Odbc).sql | 12 +++------- ...nnerJoinDistinctWhere(Access.Jet.Odbc).sql | 12 +++------- ...ests.LeftJoinDistinct(Access.Jet.Odbc).sql | 12 +++------- ...LeftJoinDistinctWhere(Access.Jet.Odbc).sql | 12 +++------- ...s.OrderByDistinctAll1(Access.Jet.Odbc).sql | 23 ++++++++++++++++++ ...s.OrderByDistinctAll2(Access.Jet.Odbc).sql | 24 +++++++++++++++++++ ...Distinct(Access.Jet.OleDb.LinqService).sql | 12 +++------- ...nctWhere(Access.Jet.OleDb.LinqService).sql | 12 +++------- ...Distinct(Access.Jet.OleDb.LinqService).sql | 12 +++------- ...nctWhere(Access.Jet.OleDb.LinqService).sql | 12 +++------- ...inctAll1(Access.Jet.OleDb.LinqService).sql | 23 ++++++++++++++++++ ...inctAll2(Access.Jet.OleDb.LinqService).sql | 24 +++++++++++++++++++ ...ts.InnerJoinDistinct(Access.Jet.OleDb).sql | 12 +++------- ...nerJoinDistinctWhere(Access.Jet.OleDb).sql | 12 +++------- ...sts.LeftJoinDistinct(Access.Jet.OleDb).sql | 12 +++------- ...eftJoinDistinctWhere(Access.Jet.OleDb).sql | 12 +++------- ....OrderByDistinctAll1(Access.Jet.OleDb).sql | 23 ++++++++++++++++++ ....OrderByDistinctAll2(Access.Jet.OleDb).sql | 24 +++++++++++++++++++ 24 files changed, 236 insertions(+), 144 deletions(-) create mode 100644 Access.Jet.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.Odbc.LinqService).sql create mode 100644 Access.Jet.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.Odbc.LinqService).sql create mode 100644 Access.Jet.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.Odbc).sql create mode 100644 Access.Jet.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.Odbc).sql create mode 100644 Access.Jet.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.OleDb.LinqService).sql create mode 100644 Access.Jet.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.OleDb.LinqService).sql create mode 100644 Access.Jet.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.OleDb).sql create mode 100644 Access.Jet.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.OleDb).sql diff --git a/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.Odbc.LinqService).sql b/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.Odbc.LinqService).sql index ccc10ff9c3a7..faf76143521d 100644 --- a/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.Odbc.LinqService).sql +++ b/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.Odbc.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + INNER JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.Odbc.LinqService).sql b/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.Odbc.LinqService).sql index e5adaed671ba..15d54cac72a6 100644 --- a/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.Odbc.LinqService).sql +++ b/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.Odbc.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + INNER JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.Odbc.LinqService).sql b/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.Odbc.LinqService).sql index 8c0a01d97dec..96ffde04e1f0 100644 --- a/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.Odbc.LinqService).sql +++ b/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.Odbc.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.Odbc.LinqService).sql b/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.Odbc.LinqService).sql index 24d9fe03b775..70ad1094b42d 100644 --- a/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.Odbc.LinqService).sql +++ b/Access.Jet.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.Odbc.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Jet.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.Odbc.LinqService).sql b/Access.Jet.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.Odbc.LinqService).sql new file mode 100644 index 000000000000..5dd1de753c9b --- /dev/null +++ b/Access.Jet.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.Odbc.LinqService).sql @@ -0,0 +1,23 @@ +BeforeExecute +-- Access.Jet.Odbc AccessODBC (asynchronously) + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Jet.Odbc AccessODBC (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Jet.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.Odbc.LinqService).sql b/Access.Jet.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.Odbc.LinqService).sql new file mode 100644 index 000000000000..80196ff52764 --- /dev/null +++ b/Access.Jet.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.Odbc.LinqService).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- Access.Jet.Odbc AccessODBC (asynchronously) + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Jet.Odbc AccessODBC (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.Odbc).sql b/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.Odbc).sql index 8dca6ffd1112..ec8f996ec9e4 100644 --- a/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.Odbc).sql +++ b/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.Odbc).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + INNER JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.Odbc).sql b/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.Odbc).sql index 8917ae0751da..520abf2e101b 100644 --- a/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.Odbc).sql +++ b/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.Odbc).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + INNER JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.Odbc).sql b/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.Odbc).sql index 738b31e6231e..340f2ac619d2 100644 --- a/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.Odbc).sql +++ b/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.Odbc).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.Odbc).sql b/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.Odbc).sql index c9e7f1216c0c..5f2cf925bcac 100644 --- a/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.Odbc).sql +++ b/Access.Jet.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.Odbc).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Jet.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.Odbc).sql b/Access.Jet.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.Odbc).sql new file mode 100644 index 000000000000..19b8f5c9e1cb --- /dev/null +++ b/Access.Jet.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.Odbc).sql @@ -0,0 +1,23 @@ +BeforeExecute +-- Access.Jet.Odbc AccessODBC + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Jet.Odbc AccessODBC + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Jet.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.Odbc).sql b/Access.Jet.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.Odbc).sql new file mode 100644 index 000000000000..8bcdc7463bbf --- /dev/null +++ b/Access.Jet.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.Odbc).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- Access.Jet.Odbc AccessODBC + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Jet.Odbc AccessODBC + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.OleDb.LinqService).sql b/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.OleDb.LinqService).sql index 30bd2c0533f1..39215188a7fa 100644 --- a/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.OleDb.LinqService).sql +++ b/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.OleDb.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + INNER JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.OleDb.LinqService).sql b/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.OleDb.LinqService).sql index b48bb7647798..f51742580e3f 100644 --- a/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.OleDb.LinqService).sql +++ b/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.OleDb.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + INNER JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.OleDb.LinqService).sql b/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.OleDb.LinqService).sql index 67d54c43606a..573d584c348d 100644 --- a/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.OleDb.LinqService).sql +++ b/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.OleDb.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.OleDb.LinqService).sql b/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.OleDb.LinqService).sql index 897b275357da..a55f0c54392e 100644 --- a/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.OleDb.LinqService).sql +++ b/Access.Jet.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.OleDb.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Jet.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.OleDb.LinqService).sql b/Access.Jet.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.OleDb.LinqService).sql new file mode 100644 index 000000000000..42a57dd7b73d --- /dev/null +++ b/Access.Jet.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.OleDb.LinqService).sql @@ -0,0 +1,23 @@ +BeforeExecute +-- Access.Jet.OleDb AccessOleDb (asynchronously) + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Jet.OleDb AccessOleDb (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Jet.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.OleDb.LinqService).sql b/Access.Jet.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.OleDb.LinqService).sql new file mode 100644 index 000000000000..744c029f304d --- /dev/null +++ b/Access.Jet.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.OleDb.LinqService).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- Access.Jet.OleDb AccessOleDb (asynchronously) + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Jet.OleDb AccessOleDb (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.OleDb).sql b/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.OleDb).sql index 9e58b75f4f6a..cc9c02ca0009 100644 --- a/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.OleDb).sql +++ b/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Jet.OleDb).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + INNER JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.OleDb).sql b/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.OleDb).sql index d534de0d80f4..820f12d60a00 100644 --- a/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.OleDb).sql +++ b/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Jet.OleDb).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + INNER JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.OleDb).sql b/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.OleDb).sql index bf0ba806eac5..756343ede3bb 100644 --- a/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.OleDb).sql +++ b/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Jet.OleDb).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.OleDb).sql b/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.OleDb).sql index 0724288f2a2f..284121f25503 100644 --- a/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.OleDb).sql +++ b/Access.Jet.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Jet.OleDb).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Jet.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.OleDb).sql b/Access.Jet.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.OleDb).sql new file mode 100644 index 000000000000..16913a24c6ae --- /dev/null +++ b/Access.Jet.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Jet.OleDb).sql @@ -0,0 +1,23 @@ +BeforeExecute +-- Access.Jet.OleDb AccessOleDb + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Jet.OleDb AccessOleDb + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Jet.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.OleDb).sql b/Access.Jet.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.OleDb).sql new file mode 100644 index 000000000000..7d024ae3d4d7 --- /dev/null +++ b/Access.Jet.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Jet.OleDb).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- Access.Jet.OleDb AccessOleDb + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Jet.OleDb AccessOleDb + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From 9226f490df2db189cac81e851aca6fbff845cd30 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:36:17 +0000 Subject: [PATCH 10/42] [Linux / DB2 LUW 11.5] baselines --- ...s.Linq.CteTests.Test5(DB2.LinqService).sql | 36 +++++-------------- ...Tests.TestCustomCount(DB2.LinqService).sql | 8 ++--- ...sts.InnerJoinDistinct(DB2.LinqService).sql | 12 ++----- ...nnerJoinDistinctWhere(DB2.LinqService).sql | 12 ++----- ...ests.LeftJoinDistinct(DB2.LinqService).sql | 12 ++----- ...LeftJoinDistinctWhere(DB2.LinqService).sql | 12 ++----- ...s.OrderByDistinctAll1(DB2.LinqService).sql | 26 ++++++++++++++ ...s.OrderByDistinctAll2(DB2.LinqService).sql | 27 ++++++++++++++ .../Tests.Linq.CteTests.Test5(DB2).sql | 36 +++++-------------- ...sts.Linq.CteTests.TestCustomCount(DB2).sql | 8 ++--- ...nToLimitedTests.InnerJoinDistinct(DB2).sql | 12 ++----- ...mitedTests.InnerJoinDistinctWhere(DB2).sql | 12 ++----- ...inToLimitedTests.LeftJoinDistinct(DB2).sql | 12 ++----- ...imitedTests.LeftJoinDistinctWhere(DB2).sql | 12 ++----- ...DistinctTests.OrderByDistinctAll1(DB2).sql | 26 ++++++++++++++ ...DistinctTests.OrderByDistinctAll2(DB2).sql | 27 ++++++++++++++ 16 files changed, 154 insertions(+), 136 deletions(-) create mode 100644 DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(DB2.LinqService).sql create mode 100644 DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(DB2.LinqService).sql create mode 100644 DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(DB2).sql create mode 100644 DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(DB2).sql diff --git a/DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(DB2.LinqService).sql b/DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(DB2.LinqService).sql index e12507edab5c..8d43016ba5b9 100644 --- a/DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(DB2.LinqService).sql +++ b/DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(DB2.LinqService).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - "t1"."ParentID" + "c_1"."ParentID" FROM - ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "t1" + "Child" "c_1" + WHERE + "c_1"."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" "p" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "c_2" ON "p"."ParentID" = "c_2"."ParentID" - INNER JOIN ( - SELECT DISTINCT - "c2"."ParentID", - "c2"."ChildID" - FROM - "Child" "c2" - WHERE - "c2"."ParentID" > 1 - ) "c2_1" ON "p"."ParentID" = "c2_1"."ParentID" + INNER JOIN "Child" "c_1" ON "p"."ParentID" = "c_1"."ParentID" + INNER JOIN "Child" "c2" ON "p"."ParentID" = "c2"."ParentID" +WHERE + "c_1"."ParentID" > 1 AND "c2"."ParentID" > 1 diff --git a/DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(DB2.LinqService).sql b/DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(DB2.LinqService).sql index 8d54492d416e..1eddfd7f9382 100644 --- a/DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(DB2.LinqService).sql +++ b/DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(DB2.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- DB2 DB2.LUW DB2LUW (asynchronously) -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" + SELECT + 1 FROM "Child" "c_1" WHERE diff --git a/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(DB2.LinqService).sql b/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(DB2.LinqService).sql index 5254e7c3b98a..0fd1773ef8fd 100644 --- a/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(DB2.LinqService).sql +++ b/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(DB2.LinqService).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "o"."ParentID" = "c_2"."ParentID" + INNER JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(DB2.LinqService).sql b/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(DB2.LinqService).sql index dd9eba3d4432..f57612056219 100644 --- a/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(DB2.LinqService).sql +++ b/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(DB2.LinqService).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "c_2"."ParentID" = "o"."ParentID" + INNER JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(DB2.LinqService).sql b/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(DB2.LinqService).sql index 1f9848588211..a002835c89d1 100644 --- a/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(DB2.LinqService).sql +++ b/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(DB2.LinqService).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "o"."ParentID" = "c_2"."ParentID" + LEFT JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(DB2.LinqService).sql b/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(DB2.LinqService).sql index 47db27fc1c86..702440835aa5 100644 --- a/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(DB2.LinqService).sql +++ b/DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(DB2.LinqService).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "c_2"."ParentID" = "o"."ParentID" + LEFT JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(DB2.LinqService).sql b/DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(DB2.LinqService).sql new file mode 100644 index 000000000000..109caf52202c --- /dev/null +++ b/DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(DB2.LinqService).sql @@ -0,0 +1,26 @@ +BeforeExecute +-- DB2 DB2.LUW DB2LUW (asynchronously) +DECLARE @take Integer(4) -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET 1 ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- DB2 DB2.LUW DB2LUW (asynchronously) + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(DB2.LinqService).sql b/DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(DB2.LinqService).sql new file mode 100644 index 000000000000..982d4374376a --- /dev/null +++ b/DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(DB2.LinqService).sql @@ -0,0 +1,27 @@ +BeforeExecute +-- DB2 DB2.LUW DB2LUW (asynchronously) +DECLARE @take Integer(4) -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName", + "r"."FirstName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET 1 ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- DB2 DB2.LUW DB2LUW (asynchronously) + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(DB2).sql b/DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(DB2).sql index 54954dbf7d75..1eb7b6f4d573 100644 --- a/DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(DB2).sql +++ b/DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(DB2).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - "t1"."ParentID" + "c_1"."ParentID" FROM - ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "t1" + "Child" "c_1" + WHERE + "c_1"."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" "p" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "c_2" ON "p"."ParentID" = "c_2"."ParentID" - INNER JOIN ( - SELECT DISTINCT - "c2"."ParentID", - "c2"."ChildID" - FROM - "Child" "c2" - WHERE - "c2"."ParentID" > 1 - ) "c2_1" ON "p"."ParentID" = "c2_1"."ParentID" + INNER JOIN "Child" "c_1" ON "p"."ParentID" = "c_1"."ParentID" + INNER JOIN "Child" "c2" ON "p"."ParentID" = "c2"."ParentID" +WHERE + "c_1"."ParentID" > 1 AND "c2"."ParentID" > 1 diff --git a/DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(DB2).sql b/DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(DB2).sql index c8d14ba95326..38f521e9fd96 100644 --- a/DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(DB2).sql +++ b/DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(DB2).sql @@ -1,11 +1,11 @@ BeforeExecute -- DB2 DB2.LUW DB2LUW -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" + SELECT + 1 FROM "Child" "c_1" WHERE diff --git a/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(DB2).sql b/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(DB2).sql index 3c6fb8501e1f..c9b3f3a16198 100644 --- a/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(DB2).sql +++ b/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(DB2).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "o"."ParentID" = "c_2"."ParentID" + INNER JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(DB2).sql b/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(DB2).sql index 9373ef140d03..4e01ec2fa946 100644 --- a/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(DB2).sql +++ b/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(DB2).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "c_2"."ParentID" = "o"."ParentID" + INNER JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(DB2).sql b/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(DB2).sql index 52a1259a43d2..d2287d3ff1e5 100644 --- a/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(DB2).sql +++ b/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(DB2).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "o"."ParentID" = "c_2"."ParentID" + LEFT JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(DB2).sql b/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(DB2).sql index 35aea4c81031..1a1fb7b7f04b 100644 --- a/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(DB2).sql +++ b/DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(DB2).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "c_2"."ParentID" = "o"."ParentID" + LEFT JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(DB2).sql b/DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(DB2).sql new file mode 100644 index 000000000000..bc207df8460b --- /dev/null +++ b/DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(DB2).sql @@ -0,0 +1,26 @@ +BeforeExecute +-- DB2 DB2.LUW DB2LUW +DECLARE @take Integer(4) -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET 1 ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- DB2 DB2.LUW DB2LUW + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(DB2).sql b/DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(DB2).sql new file mode 100644 index 000000000000..7888d10879ce --- /dev/null +++ b/DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(DB2).sql @@ -0,0 +1,27 @@ +BeforeExecute +-- DB2 DB2.LUW DB2LUW +DECLARE @take Integer(4) -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName", + "r"."FirstName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET 1 ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- DB2 DB2.LUW DB2LUW + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + From db2ab0bbe00925b26cb693be2840f4c8e449ff7c Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:36:37 +0000 Subject: [PATCH 11/42] [Linux / Firebird 2.5] baselines --- ...eTests.Test5(Firebird.2.5.LinqService).sql | 36 +++++-------------- ...tCustomCount(Firebird.2.5.LinqService).sql | 8 ++--- ...JoinDistinct(Firebird.2.5.LinqService).sql | 12 ++----- ...istinctWhere(Firebird.2.5.LinqService).sql | 12 ++----- ...JoinDistinct(Firebird.2.5.LinqService).sql | 12 ++----- ...istinctWhere(Firebird.2.5.LinqService).sql | 12 ++----- ...DistinctAll1(Firebird.2.5.LinqService).sql | 27 ++++++++++++++ ...DistinctAll2(Firebird.2.5.LinqService).sql | 28 +++++++++++++++ ...ests.Linq.CteTests.Test5(Firebird.2.5).sql | 36 +++++-------------- ...CteTests.TestCustomCount(Firebird.2.5).sql | 8 ++--- ...dTests.InnerJoinDistinct(Firebird.2.5).sql | 12 ++----- ...s.InnerJoinDistinctWhere(Firebird.2.5).sql | 12 ++----- ...edTests.LeftJoinDistinct(Firebird.2.5).sql | 12 ++----- ...ts.LeftJoinDistinctWhere(Firebird.2.5).sql | 12 ++----- ...ests.OrderByDistinctAll1(Firebird.2.5).sql | 27 ++++++++++++++ ...ests.OrderByDistinctAll2(Firebird.2.5).sql | 28 +++++++++++++++ 16 files changed, 158 insertions(+), 136 deletions(-) create mode 100644 Firebird.2.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.2.5.LinqService).sql create mode 100644 Firebird.2.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.2.5.LinqService).sql create mode 100644 Firebird.2.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.2.5).sql create mode 100644 Firebird.2.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.2.5).sql diff --git a/Firebird.2.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.2.5.LinqService).sql b/Firebird.2.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.2.5.LinqService).sql index 4ed61d6a4fbd..9c358e80039f 100644 --- a/Firebird.2.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.2.5.LinqService).sql +++ b/Firebird.2.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.2.5.LinqService).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - "t1"."ParentID" + "c_1"."ParentID" FROM - ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "t1" + "Child" "c_1" + WHERE + "c_1"."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" "p" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "c_2" ON "p"."ParentID" = "c_2"."ParentID" - INNER JOIN ( - SELECT DISTINCT - "c2"."ParentID", - "c2"."ChildID" - FROM - "Child" "c2" - WHERE - "c2"."ParentID" > 1 - ) "c2_1" ON "p"."ParentID" = "c2_1"."ParentID" + INNER JOIN "Child" "c_1" ON "p"."ParentID" = "c_1"."ParentID" + INNER JOIN "Child" "c2" ON "p"."ParentID" = "c2"."ParentID" +WHERE + "c_1"."ParentID" > 1 AND "c2"."ParentID" > 1 diff --git a/Firebird.2.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.2.5.LinqService).sql b/Firebird.2.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.2.5.LinqService).sql index 6304baa2cba2..af770e7bd825 100644 --- a/Firebird.2.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.2.5.LinqService).sql +++ b/Firebird.2.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.2.5.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- Firebird.2.5 Firebird (asynchronously) -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" + SELECT + 1 FROM "Child" "c_1" WHERE diff --git a/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.2.5.LinqService).sql b/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.2.5.LinqService).sql index 3f1e7d2e0299..9c4d0b98c375 100644 --- a/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.2.5.LinqService).sql +++ b/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.2.5.LinqService).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "o"."ParentID" = "c_2"."ParentID" + INNER JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.2.5.LinqService).sql b/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.2.5.LinqService).sql index 3a44b496bc4e..082f0adcf6c4 100644 --- a/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.2.5.LinqService).sql +++ b/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.2.5.LinqService).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "c_2"."ParentID" = "o"."ParentID" + INNER JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.2.5.LinqService).sql b/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.2.5.LinqService).sql index f38e38a700dc..5d95f44de7b9 100644 --- a/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.2.5.LinqService).sql +++ b/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.2.5.LinqService).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "o"."ParentID" = "c_2"."ParentID" + LEFT JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.2.5.LinqService).sql b/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.2.5.LinqService).sql index f906e5846690..dcc4fd60372b 100644 --- a/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.2.5.LinqService).sql +++ b/Firebird.2.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.2.5.LinqService).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "c_2"."ParentID" = "o"."ParentID" + LEFT JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.2.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.2.5.LinqService).sql b/Firebird.2.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.2.5.LinqService).sql new file mode 100644 index 000000000000..0834c074047e --- /dev/null +++ b/Firebird.2.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.2.5.LinqService).sql @@ -0,0 +1,27 @@ +BeforeExecute +-- Firebird.2.5 Firebird (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT FIRST @take SKIP @skip + "r"."PersonID", + "r"."LastName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" + +BeforeExecute +-- Firebird.2.5 Firebird (asynchronously) + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/Firebird.2.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.2.5.LinqService).sql b/Firebird.2.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.2.5.LinqService).sql new file mode 100644 index 000000000000..d90359bcc0ab --- /dev/null +++ b/Firebird.2.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.2.5.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Firebird.2.5 Firebird (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT FIRST @take SKIP @skip + "r"."PersonID", + "r"."LastName", + "r"."FirstName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" + +BeforeExecute +-- Firebird.2.5 Firebird (asynchronously) + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/Firebird.2.5/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.2.5).sql b/Firebird.2.5/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.2.5).sql index a4f1be1d61e0..5b995a82a81a 100644 --- a/Firebird.2.5/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.2.5).sql +++ b/Firebird.2.5/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.2.5).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - "t1"."ParentID" + "c_1"."ParentID" FROM - ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "t1" + "Child" "c_1" + WHERE + "c_1"."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" "p" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "c_2" ON "p"."ParentID" = "c_2"."ParentID" - INNER JOIN ( - SELECT DISTINCT - "c2"."ParentID", - "c2"."ChildID" - FROM - "Child" "c2" - WHERE - "c2"."ParentID" > 1 - ) "c2_1" ON "p"."ParentID" = "c2_1"."ParentID" + INNER JOIN "Child" "c_1" ON "p"."ParentID" = "c_1"."ParentID" + INNER JOIN "Child" "c2" ON "p"."ParentID" = "c2"."ParentID" +WHERE + "c_1"."ParentID" > 1 AND "c2"."ParentID" > 1 diff --git a/Firebird.2.5/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.2.5).sql b/Firebird.2.5/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.2.5).sql index 78189c21078f..e54cfbe92f75 100644 --- a/Firebird.2.5/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.2.5).sql +++ b/Firebird.2.5/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.2.5).sql @@ -1,11 +1,11 @@ BeforeExecute -- Firebird.2.5 Firebird -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" + SELECT + 1 FROM "Child" "c_1" WHERE diff --git a/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.2.5).sql b/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.2.5).sql index eda8def871b6..42591a36d74a 100644 --- a/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.2.5).sql +++ b/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.2.5).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "o"."ParentID" = "c_2"."ParentID" + INNER JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.2.5).sql b/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.2.5).sql index b3228b387a7c..845bbd31ce89 100644 --- a/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.2.5).sql +++ b/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.2.5).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "c_2"."ParentID" = "o"."ParentID" + INNER JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.2.5).sql b/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.2.5).sql index ecc0d414109c..d6f7f8043bf2 100644 --- a/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.2.5).sql +++ b/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.2.5).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "o"."ParentID" = "c_2"."ParentID" + LEFT JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.2.5).sql b/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.2.5).sql index 04200fb03b29..c27e0025cce9 100644 --- a/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.2.5).sql +++ b/Firebird.2.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.2.5).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "c_2"."ParentID" = "o"."ParentID" + LEFT JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.2.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.2.5).sql b/Firebird.2.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.2.5).sql new file mode 100644 index 000000000000..1b28432d250f --- /dev/null +++ b/Firebird.2.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.2.5).sql @@ -0,0 +1,27 @@ +BeforeExecute +-- Firebird.2.5 Firebird +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT FIRST @take SKIP @skip + "r"."PersonID", + "r"."LastName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" + +BeforeExecute +-- Firebird.2.5 Firebird + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/Firebird.2.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.2.5).sql b/Firebird.2.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.2.5).sql new file mode 100644 index 000000000000..7c775c5731ca --- /dev/null +++ b/Firebird.2.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.2.5).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Firebird.2.5 Firebird +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT FIRST @take SKIP @skip + "r"."PersonID", + "r"."LastName", + "r"."FirstName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" + +BeforeExecute +-- Firebird.2.5 Firebird + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + From 192a0fd82b2da40b94a56fb7c7b41ba35dbbfdf3 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:38:13 +0000 Subject: [PATCH 12/42] [Windows / Access ACE (OLEDB/ODBC) x86] baselines --- ...nDistinct(Access.Ace.Odbc.LinqService).sql | 12 +++------- ...inctWhere(Access.Ace.Odbc.LinqService).sql | 12 +++------- ...nDistinct(Access.Ace.Odbc.LinqService).sql | 12 +++------- ...inctWhere(Access.Ace.Odbc.LinqService).sql | 12 +++------- ...tinctAll1(Access.Ace.Odbc.LinqService).sql | 23 ++++++++++++++++++ ...tinctAll2(Access.Ace.Odbc.LinqService).sql | 24 +++++++++++++++++++ ...sts.InnerJoinDistinct(Access.Ace.Odbc).sql | 12 +++------- ...nnerJoinDistinctWhere(Access.Ace.Odbc).sql | 12 +++------- ...ests.LeftJoinDistinct(Access.Ace.Odbc).sql | 12 +++------- ...LeftJoinDistinctWhere(Access.Ace.Odbc).sql | 12 +++------- ...s.OrderByDistinctAll1(Access.Ace.Odbc).sql | 23 ++++++++++++++++++ ...s.OrderByDistinctAll2(Access.Ace.Odbc).sql | 24 +++++++++++++++++++ ...Distinct(Access.Ace.OleDb.LinqService).sql | 12 +++------- ...nctWhere(Access.Ace.OleDb.LinqService).sql | 12 +++------- ...Distinct(Access.Ace.OleDb.LinqService).sql | 12 +++------- ...nctWhere(Access.Ace.OleDb.LinqService).sql | 12 +++------- ...inctAll1(Access.Ace.OleDb.LinqService).sql | 23 ++++++++++++++++++ ...inctAll2(Access.Ace.OleDb.LinqService).sql | 24 +++++++++++++++++++ ...ts.InnerJoinDistinct(Access.Ace.OleDb).sql | 12 +++------- ...nerJoinDistinctWhere(Access.Ace.OleDb).sql | 12 +++------- ...sts.LeftJoinDistinct(Access.Ace.OleDb).sql | 12 +++------- ...eftJoinDistinctWhere(Access.Ace.OleDb).sql | 12 +++------- ....OrderByDistinctAll1(Access.Ace.OleDb).sql | 23 ++++++++++++++++++ ....OrderByDistinctAll2(Access.Ace.OleDb).sql | 24 +++++++++++++++++++ 24 files changed, 236 insertions(+), 144 deletions(-) create mode 100644 Access.Ace.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.Odbc.LinqService).sql create mode 100644 Access.Ace.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.Odbc.LinqService).sql create mode 100644 Access.Ace.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.Odbc).sql create mode 100644 Access.Ace.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.Odbc).sql create mode 100644 Access.Ace.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.OleDb.LinqService).sql create mode 100644 Access.Ace.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.OleDb.LinqService).sql create mode 100644 Access.Ace.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.OleDb).sql create mode 100644 Access.Ace.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.OleDb).sql diff --git a/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.Odbc.LinqService).sql b/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.Odbc.LinqService).sql index 300f25fa05aa..2946ffeac377 100644 --- a/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.Odbc.LinqService).sql +++ b/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.Odbc.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + INNER JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.Odbc.LinqService).sql b/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.Odbc.LinqService).sql index 7a2e1856e8cf..c70bb39a5052 100644 --- a/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.Odbc.LinqService).sql +++ b/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.Odbc.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + INNER JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.Odbc.LinqService).sql b/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.Odbc.LinqService).sql index 785ecf20f033..d25ed2aade96 100644 --- a/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.Odbc.LinqService).sql +++ b/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.Odbc.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.Odbc.LinqService).sql b/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.Odbc.LinqService).sql index 9851c029b6b9..c05e748a7c66 100644 --- a/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.Odbc.LinqService).sql +++ b/Access.Ace.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.Odbc.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Ace.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.Odbc.LinqService).sql b/Access.Ace.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.Odbc.LinqService).sql new file mode 100644 index 000000000000..ae1feccd262e --- /dev/null +++ b/Access.Ace.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.Odbc.LinqService).sql @@ -0,0 +1,23 @@ +BeforeExecute +-- Access.Ace.Odbc AccessODBC (asynchronously) + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Ace.Odbc AccessODBC (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Ace.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.Odbc.LinqService).sql b/Access.Ace.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.Odbc.LinqService).sql new file mode 100644 index 000000000000..1fe63028de65 --- /dev/null +++ b/Access.Ace.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.Odbc.LinqService).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- Access.Ace.Odbc AccessODBC (asynchronously) + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Ace.Odbc AccessODBC (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.Odbc).sql b/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.Odbc).sql index 444490f6d34c..d89641389d3c 100644 --- a/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.Odbc).sql +++ b/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.Odbc).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + INNER JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.Odbc).sql b/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.Odbc).sql index fb3db0b3c6c5..c9ab5794384a 100644 --- a/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.Odbc).sql +++ b/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.Odbc).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + INNER JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.Odbc).sql b/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.Odbc).sql index 5c196b356117..fb787c65c49e 100644 --- a/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.Odbc).sql +++ b/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.Odbc).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.Odbc).sql b/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.Odbc).sql index cfee115d0ebd..e711dac51371 100644 --- a/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.Odbc).sql +++ b/Access.Ace.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.Odbc).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Ace.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.Odbc).sql b/Access.Ace.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.Odbc).sql new file mode 100644 index 000000000000..b5d28de35862 --- /dev/null +++ b/Access.Ace.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.Odbc).sql @@ -0,0 +1,23 @@ +BeforeExecute +-- Access.Ace.Odbc AccessODBC + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Ace.Odbc AccessODBC + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Ace.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.Odbc).sql b/Access.Ace.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.Odbc).sql new file mode 100644 index 000000000000..4bb74772ac85 --- /dev/null +++ b/Access.Ace.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.Odbc).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- Access.Ace.Odbc AccessODBC + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Ace.Odbc AccessODBC + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.OleDb.LinqService).sql b/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.OleDb.LinqService).sql index 4ae747df6186..002d56e7000d 100644 --- a/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.OleDb.LinqService).sql +++ b/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.OleDb.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + INNER JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.OleDb.LinqService).sql b/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.OleDb.LinqService).sql index 76d7cb0a39b3..d7ee3891297c 100644 --- a/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.OleDb.LinqService).sql +++ b/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.OleDb.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + INNER JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.OleDb.LinqService).sql b/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.OleDb.LinqService).sql index 9c97a9bc1410..614dee75751d 100644 --- a/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.OleDb.LinqService).sql +++ b/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.OleDb.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.OleDb.LinqService).sql b/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.OleDb.LinqService).sql index feb216ef4b15..0169fa507942 100644 --- a/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.OleDb.LinqService).sql +++ b/Access.Ace.OleDb.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.OleDb.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Ace.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.OleDb.LinqService).sql b/Access.Ace.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.OleDb.LinqService).sql new file mode 100644 index 000000000000..86942857297e --- /dev/null +++ b/Access.Ace.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.OleDb.LinqService).sql @@ -0,0 +1,23 @@ +BeforeExecute +-- Access.Ace.OleDb AccessOleDb (asynchronously) + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Ace.OleDb AccessOleDb (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Ace.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.OleDb.LinqService).sql b/Access.Ace.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.OleDb.LinqService).sql new file mode 100644 index 000000000000..1f6da82dde42 --- /dev/null +++ b/Access.Ace.OleDb.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.OleDb.LinqService).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- Access.Ace.OleDb AccessOleDb (asynchronously) + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Ace.OleDb AccessOleDb (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.OleDb).sql b/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.OleDb).sql index 0e35057fa8e9..4b4d47db3e50 100644 --- a/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.OleDb).sql +++ b/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Access.Ace.OleDb).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + INNER JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.OleDb).sql b/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.OleDb).sql index 1afb3f10ba94..6339df842101 100644 --- a/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.OleDb).sql +++ b/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Access.Ace.OleDb).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + INNER JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.OleDb).sql b/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.OleDb).sql index 4ab2a9b0340c..3213ba54fd22 100644 --- a/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.OleDb).sql +++ b/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Access.Ace.OleDb).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([o].[ParentID] = [c_2].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([o].[ParentID] = [c_1].[ParentID]) diff --git a/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.OleDb).sql b/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.OleDb).sql index edc9c3b59797..02ab46afdca5 100644 --- a/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.OleDb).sql +++ b/Access.Ace.OleDb/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Access.Ace.OleDb).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON ([c_2].[ParentID] = [o].[ParentID]) + LEFT JOIN [Child] [c_1] ON ([c_1].[ParentID] = [o].[ParentID]) diff --git a/Access.Ace.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.OleDb).sql b/Access.Ace.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.OleDb).sql new file mode 100644 index 000000000000..f7e54d1c3f6e --- /dev/null +++ b/Access.Ace.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Access.Ace.OleDb).sql @@ -0,0 +1,23 @@ +BeforeExecute +-- Access.Ace.OleDb AccessOleDb + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Ace.OleDb AccessOleDb + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Access.Ace.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.OleDb).sql b/Access.Ace.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.OleDb).sql new file mode 100644 index 000000000000..61a83caee2c6 --- /dev/null +++ b/Access.Ace.OleDb/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Access.Ace.OleDb).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- Access.Ace.OleDb AccessOleDb + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Access.Ace.OleDb AccessOleDb + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From bc36f247b0b07ac8acf001f790974688f5c24fb4 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:41:00 +0000 Subject: [PATCH 13/42] [Linux / Firebird 3.0] baselines --- ...CteTests.Test5(Firebird.3.LinqService).sql | 36 +++++-------------- ...estCustomCount(Firebird.3.LinqService).sql | 8 ++--- ...erJoinDistinct(Firebird.3.LinqService).sql | 12 ++----- ...nDistinctWhere(Firebird.3.LinqService).sql | 12 ++----- ...ftJoinDistinct(Firebird.3.LinqService).sql | 12 ++----- ...nDistinctWhere(Firebird.3.LinqService).sql | 12 ++----- ...ByDistinctAll1(Firebird.3.LinqService).sql | 28 +++++++++++++++ ...ByDistinctAll2(Firebird.3.LinqService).sql | 29 +++++++++++++++ .../Tests.Linq.CteTests.Test5(Firebird.3).sql | 36 +++++-------------- ...q.CteTests.TestCustomCount(Firebird.3).sql | 8 ++--- ...tedTests.InnerJoinDistinct(Firebird.3).sql | 12 ++----- ...sts.InnerJoinDistinctWhere(Firebird.3).sql | 12 ++----- ...itedTests.LeftJoinDistinct(Firebird.3).sql | 12 ++----- ...ests.LeftJoinDistinctWhere(Firebird.3).sql | 12 ++----- ...tTests.OrderByDistinctAll1(Firebird.3).sql | 28 +++++++++++++++ ...tTests.OrderByDistinctAll2(Firebird.3).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 136 deletions(-) create mode 100644 Firebird.3.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.3.LinqService).sql create mode 100644 Firebird.3.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.3.LinqService).sql create mode 100644 Firebird.3/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.3).sql create mode 100644 Firebird.3/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.3).sql diff --git a/Firebird.3.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.3.LinqService).sql b/Firebird.3.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.3.LinqService).sql index 3f3a613f1323..62d356aadc77 100644 --- a/Firebird.3.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.3.LinqService).sql +++ b/Firebird.3.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.3.LinqService).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - "t1"."ParentID" + "c_1"."ParentID" FROM - ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "t1" + "Child" "c_1" + WHERE + "c_1"."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" "p" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "c_2" ON "p"."ParentID" = "c_2"."ParentID" - INNER JOIN ( - SELECT DISTINCT - "c2"."ParentID", - "c2"."ChildID" - FROM - "Child" "c2" - WHERE - "c2"."ParentID" > 1 - ) "c2_1" ON "p"."ParentID" = "c2_1"."ParentID" + INNER JOIN "Child" "c_1" ON "p"."ParentID" = "c_1"."ParentID" + INNER JOIN "Child" "c2" ON "p"."ParentID" = "c2"."ParentID" +WHERE + "c_1"."ParentID" > 1 AND "c2"."ParentID" > 1 diff --git a/Firebird.3.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.3.LinqService).sql b/Firebird.3.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.3.LinqService).sql index abcd25270308..678b59b1c762 100644 --- a/Firebird.3.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.3.LinqService).sql +++ b/Firebird.3.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.3.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- Firebird.3 Firebird3 (asynchronously) -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" + SELECT + 1 FROM "Child" "c_1" WHERE diff --git a/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.3.LinqService).sql b/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.3.LinqService).sql index 7f4cf90e2747..d78f426b4555 100644 --- a/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.3.LinqService).sql +++ b/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.3.LinqService).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "o"."ParentID" = "c_2"."ParentID" + INNER JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.3.LinqService).sql b/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.3.LinqService).sql index e458be14be08..1867c55c6cb4 100644 --- a/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.3.LinqService).sql +++ b/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.3.LinqService).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "c_2"."ParentID" = "o"."ParentID" + INNER JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.3.LinqService).sql b/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.3.LinqService).sql index 1543be0d75fb..bbd6b48adbba 100644 --- a/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.3.LinqService).sql +++ b/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.3.LinqService).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "o"."ParentID" = "c_2"."ParentID" + LEFT JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.3.LinqService).sql b/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.3.LinqService).sql index 70715d1db493..7a752378eaf0 100644 --- a/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.3.LinqService).sql +++ b/Firebird.3.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.3.LinqService).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "c_2"."ParentID" = "o"."ParentID" + LEFT JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.3.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.3.LinqService).sql b/Firebird.3.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.3.LinqService).sql new file mode 100644 index 000000000000..9fe25bbd7e87 --- /dev/null +++ b/Firebird.3.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.3.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Firebird.3 Firebird3 (asynchronously) +DECLARE @skip Integer -- Int32 +SET @skip = 1 +DECLARE @take Integer -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- Firebird.3 Firebird3 (asynchronously) + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/Firebird.3.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.3.LinqService).sql b/Firebird.3.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.3.LinqService).sql new file mode 100644 index 000000000000..74a0c18367b4 --- /dev/null +++ b/Firebird.3.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.3.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Firebird.3 Firebird3 (asynchronously) +DECLARE @skip Integer -- Int32 +SET @skip = 1 +DECLARE @take Integer -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName", + "r"."FirstName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- Firebird.3 Firebird3 (asynchronously) + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/Firebird.3/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.3).sql b/Firebird.3/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.3).sql index 661f4894ea11..c4c6e2090a80 100644 --- a/Firebird.3/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.3).sql +++ b/Firebird.3/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.3).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - "t1"."ParentID" + "c_1"."ParentID" FROM - ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "t1" + "Child" "c_1" + WHERE + "c_1"."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" "p" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "c_2" ON "p"."ParentID" = "c_2"."ParentID" - INNER JOIN ( - SELECT DISTINCT - "c2"."ParentID", - "c2"."ChildID" - FROM - "Child" "c2" - WHERE - "c2"."ParentID" > 1 - ) "c2_1" ON "p"."ParentID" = "c2_1"."ParentID" + INNER JOIN "Child" "c_1" ON "p"."ParentID" = "c_1"."ParentID" + INNER JOIN "Child" "c2" ON "p"."ParentID" = "c2"."ParentID" +WHERE + "c_1"."ParentID" > 1 AND "c2"."ParentID" > 1 diff --git a/Firebird.3/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.3).sql b/Firebird.3/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.3).sql index 363afa8b26b6..d680bcad2d6e 100644 --- a/Firebird.3/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.3).sql +++ b/Firebird.3/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.3).sql @@ -1,11 +1,11 @@ BeforeExecute -- Firebird.3 Firebird3 -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" + SELECT + 1 FROM "Child" "c_1" WHERE diff --git a/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.3).sql b/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.3).sql index 0f77ed3f61e7..5269ae52c3ef 100644 --- a/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.3).sql +++ b/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.3).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "o"."ParentID" = "c_2"."ParentID" + INNER JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.3).sql b/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.3).sql index db839e92083a..fd7ed04197f8 100644 --- a/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.3).sql +++ b/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.3).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "c_2"."ParentID" = "o"."ParentID" + INNER JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.3).sql b/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.3).sql index a1ea74f35767..53b0b9e0178d 100644 --- a/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.3).sql +++ b/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.3).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "o"."ParentID" = "c_2"."ParentID" + LEFT JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.3).sql b/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.3).sql index a1aae91736c4..b46c7f317854 100644 --- a/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.3).sql +++ b/Firebird.3/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.3).sql @@ -4,15 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - ) "c_2" ON "c_2"."ParentID" = "o"."ParentID" + LEFT JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.3/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.3).sql b/Firebird.3/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.3).sql new file mode 100644 index 000000000000..4f80881393d3 --- /dev/null +++ b/Firebird.3/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.3).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Firebird.3 Firebird3 +DECLARE @skip Integer -- Int32 +SET @skip = 1 +DECLARE @take Integer -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- Firebird.3 Firebird3 + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/Firebird.3/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.3).sql b/Firebird.3/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.3).sql new file mode 100644 index 000000000000..317e1324a00a --- /dev/null +++ b/Firebird.3/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.3).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Firebird.3 Firebird3 +DECLARE @skip Integer -- Int32 +SET @skip = 1 +DECLARE @take Integer -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName", + "r"."FirstName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- Firebird.3 Firebird3 + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + From 28af8b8d12e725e212fa54fa2d06efbbdd404586 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:42:23 +0000 Subject: [PATCH 14/42] [Linux / Firebird 4.0] baselines --- ...CteTests.Test5(Firebird.4.LinqService).sql | 36 +++++-------------- ...estCustomCount(Firebird.4.LinqService).sql | 8 ++--- ...erJoinDistinct(Firebird.4.LinqService).sql | 14 ++------ ...nDistinctWhere(Firebird.4.LinqService).sql | 14 ++------ ...ftJoinDistinct(Firebird.4.LinqService).sql | 14 ++------ ...nDistinctWhere(Firebird.4.LinqService).sql | 14 ++------ ...ByDistinctAll1(Firebird.4.LinqService).sql | 28 +++++++++++++++ ...ByDistinctAll2(Firebird.4.LinqService).sql | 29 +++++++++++++++ .../Tests.Linq.CteTests.Test5(Firebird.4).sql | 36 +++++-------------- ...q.CteTests.TestCustomCount(Firebird.4).sql | 8 ++--- ...tedTests.InnerJoinDistinct(Firebird.4).sql | 14 ++------ ...sts.InnerJoinDistinctWhere(Firebird.4).sql | 14 ++------ ...itedTests.LeftJoinDistinct(Firebird.4).sql | 14 ++------ ...ests.LeftJoinDistinctWhere(Firebird.4).sql | 14 ++------ ...tTests.OrderByDistinctAll1(Firebird.4).sql | 28 +++++++++++++++ ...tTests.OrderByDistinctAll2(Firebird.4).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 Firebird.4.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.4.LinqService).sql create mode 100644 Firebird.4.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.4.LinqService).sql create mode 100644 Firebird.4/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.4).sql create mode 100644 Firebird.4/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.4).sql diff --git a/Firebird.4.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.4.LinqService).sql b/Firebird.4.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.4.LinqService).sql index dd01963c23ea..c24771cd0315 100644 --- a/Firebird.4.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.4.LinqService).sql +++ b/Firebird.4.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.4.LinqService).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - "t1"."ParentID" + "c_1"."ParentID" FROM - ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "t1" + "Child" "c_1" + WHERE + "c_1"."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" "p" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "c_2" ON "p"."ParentID" = "c_2"."ParentID" - INNER JOIN ( - SELECT DISTINCT - "c2"."ParentID", - "c2"."ChildID" - FROM - "Child" "c2" - WHERE - "c2"."ParentID" > 1 - ) "c2_1" ON "p"."ParentID" = "c2_1"."ParentID" + INNER JOIN "Child" "c_1" ON "p"."ParentID" = "c_1"."ParentID" + INNER JOIN "Child" "c2" ON "p"."ParentID" = "c2"."ParentID" +WHERE + "c_1"."ParentID" > 1 AND "c2"."ParentID" > 1 diff --git a/Firebird.4.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.4.LinqService).sql b/Firebird.4.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.4.LinqService).sql index bcceaea5d114..d420b8f92295 100644 --- a/Firebird.4.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.4.LinqService).sql +++ b/Firebird.4.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.4.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- Firebird.4 Firebird4 (asynchronously) -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" + SELECT + 1 FROM "Child" "c_1" WHERE diff --git a/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.4.LinqService).sql b/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.4.LinqService).sql index 446fe7f8b58d..158f6c18305a 100644 --- a/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.4.LinqService).sql +++ b/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.4.LinqService).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - CROSS JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "o"."ParentID" = "c_1"."ParentID" - ) "c_2" + INNER JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.4.LinqService).sql b/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.4.LinqService).sql index f41d8af87f38..7b600e182818 100644 --- a/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.4.LinqService).sql +++ b/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.4.LinqService).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - CROSS JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" = "o"."ParentID" - ) "c_2" + INNER JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.4.LinqService).sql b/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.4.LinqService).sql index cada40e882b8..d1078713d290 100644 --- a/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.4.LinqService).sql +++ b/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.4.LinqService).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "o"."ParentID" = "c_1"."ParentID" - ) "c_2" ON 1=1 + LEFT JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.4.LinqService).sql b/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.4.LinqService).sql index 60bd6ea4dcb9..c71df72bbaf6 100644 --- a/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.4.LinqService).sql +++ b/Firebird.4.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.4.LinqService).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" = "o"."ParentID" - ) "c_2" ON 1=1 + LEFT JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.4.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.4.LinqService).sql b/Firebird.4.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.4.LinqService).sql new file mode 100644 index 000000000000..0cc0f507b6f2 --- /dev/null +++ b/Firebird.4.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.4.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Firebird.4 Firebird4 (asynchronously) +DECLARE @skip Integer -- Int32 +SET @skip = 1 +DECLARE @take Integer -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- Firebird.4 Firebird4 (asynchronously) + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/Firebird.4.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.4.LinqService).sql b/Firebird.4.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.4.LinqService).sql new file mode 100644 index 000000000000..12648ffd247d --- /dev/null +++ b/Firebird.4.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.4.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Firebird.4 Firebird4 (asynchronously) +DECLARE @skip Integer -- Int32 +SET @skip = 1 +DECLARE @take Integer -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName", + "r"."FirstName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- Firebird.4 Firebird4 (asynchronously) + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/Firebird.4/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.4).sql b/Firebird.4/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.4).sql index 3b53d8b68399..54feaf95ea40 100644 --- a/Firebird.4/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.4).sql +++ b/Firebird.4/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.4).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - "t1"."ParentID" + "c_1"."ParentID" FROM - ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "t1" + "Child" "c_1" + WHERE + "c_1"."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" "p" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "c_2" ON "p"."ParentID" = "c_2"."ParentID" - INNER JOIN ( - SELECT DISTINCT - "c2"."ParentID", - "c2"."ChildID" - FROM - "Child" "c2" - WHERE - "c2"."ParentID" > 1 - ) "c2_1" ON "p"."ParentID" = "c2_1"."ParentID" + INNER JOIN "Child" "c_1" ON "p"."ParentID" = "c_1"."ParentID" + INNER JOIN "Child" "c2" ON "p"."ParentID" = "c2"."ParentID" +WHERE + "c_1"."ParentID" > 1 AND "c2"."ParentID" > 1 diff --git a/Firebird.4/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.4).sql b/Firebird.4/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.4).sql index 225025cf6b50..1a92b394e0cf 100644 --- a/Firebird.4/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.4).sql +++ b/Firebird.4/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.4).sql @@ -1,11 +1,11 @@ BeforeExecute -- Firebird.4 Firebird4 -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" + SELECT + 1 FROM "Child" "c_1" WHERE diff --git a/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.4).sql b/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.4).sql index 2a33a2a7b114..7e0c4847c5e1 100644 --- a/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.4).sql +++ b/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.4).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - CROSS JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "o"."ParentID" = "c_1"."ParentID" - ) "c_2" + INNER JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.4).sql b/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.4).sql index cafd69ebf691..4eca9deffb07 100644 --- a/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.4).sql +++ b/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.4).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - CROSS JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" = "o"."ParentID" - ) "c_2" + INNER JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.4).sql b/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.4).sql index 89b2e9c0bb34..ef5cb622cb80 100644 --- a/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.4).sql +++ b/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.4).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "o"."ParentID" = "c_1"."ParentID" - ) "c_2" ON 1=1 + LEFT JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.4).sql b/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.4).sql index 5784673d1c5f..be627405e0a7 100644 --- a/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.4).sql +++ b/Firebird.4/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.4).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" = "o"."ParentID" - ) "c_2" ON 1=1 + LEFT JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.4/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.4).sql b/Firebird.4/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.4).sql new file mode 100644 index 000000000000..094378b5b68c --- /dev/null +++ b/Firebird.4/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.4).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Firebird.4 Firebird4 +DECLARE @skip Integer -- Int32 +SET @skip = 1 +DECLARE @take Integer -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- Firebird.4 Firebird4 + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/Firebird.4/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.4).sql b/Firebird.4/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.4).sql new file mode 100644 index 000000000000..88918fc8a434 --- /dev/null +++ b/Firebird.4/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.4).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Firebird.4 Firebird4 +DECLARE @skip Integer -- Int32 +SET @skip = 1 +DECLARE @take Integer -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName", + "r"."FirstName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- Firebird.4 Firebird4 + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + From 58265b8604bef8b76ae6989a06d4df1aa0dc7344 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:42:31 +0000 Subject: [PATCH 15/42] [Linux / Informix 14.10] baselines --- ...eTests.Test5(Informix.DB2.LinqService).sql | 36 +++++-------------- ...tCustomCount(Informix.DB2.LinqService).sql | 8 ++--- ...JoinDistinct(Informix.DB2.LinqService).sql | 12 ++----- ...istinctWhere(Informix.DB2.LinqService).sql | 12 ++----- ...JoinDistinct(Informix.DB2.LinqService).sql | 12 ++----- ...istinctWhere(Informix.DB2.LinqService).sql | 12 ++----- ...DistinctAll1(Informix.DB2.LinqService).sql | 27 ++++++++++++++ ...DistinctAll2(Informix.DB2.LinqService).sql | 28 +++++++++++++++ ...ests.Linq.CteTests.Test5(Informix.DB2).sql | 36 +++++-------------- ...CteTests.TestCustomCount(Informix.DB2).sql | 8 ++--- ...dTests.InnerJoinDistinct(Informix.DB2).sql | 12 ++----- ...s.InnerJoinDistinctWhere(Informix.DB2).sql | 12 ++----- ...edTests.LeftJoinDistinct(Informix.DB2).sql | 12 ++----- ...ts.LeftJoinDistinctWhere(Informix.DB2).sql | 12 ++----- ...ests.OrderByDistinctAll1(Informix.DB2).sql | 27 ++++++++++++++ ...ests.OrderByDistinctAll2(Informix.DB2).sql | 28 +++++++++++++++ 16 files changed, 158 insertions(+), 136 deletions(-) create mode 100644 Informix.DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Informix.DB2.LinqService).sql create mode 100644 Informix.DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Informix.DB2.LinqService).sql create mode 100644 Informix.DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Informix.DB2).sql create mode 100644 Informix.DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Informix.DB2).sql diff --git a/Informix.DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Informix.DB2.LinqService).sql b/Informix.DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Informix.DB2.LinqService).sql index fabe7025c5ca..80e8456af4e6 100644 --- a/Informix.DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Informix.DB2.LinqService).sql +++ b/Informix.DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Informix.DB2.LinqService).sql @@ -5,17 +5,11 @@ WITH CTE_1 (ParentID) AS ( SELECT - t1.ParentID + c_1.ParentID FROM - ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) t1 + Child c_1 + WHERE + c_1.ParentID > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM Parent p - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) c_2 ON p.ParentID = c_2.ParentID - INNER JOIN ( - SELECT DISTINCT - c2.ParentID, - c2.ChildID - FROM - Child c2 - WHERE - c2.ParentID > 1 - ) c2_1 ON p.ParentID = c2_1.ParentID + INNER JOIN Child c_1 ON p.ParentID = c_1.ParentID + INNER JOIN Child c2 ON p.ParentID = c2.ParentID +WHERE + c_1.ParentID > 1 AND c2.ParentID > 1 diff --git a/Informix.DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Informix.DB2.LinqService).sql b/Informix.DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Informix.DB2.LinqService).sql index de0cb7db46c7..da359655690b 100644 --- a/Informix.DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Informix.DB2.LinqService).sql +++ b/Informix.DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Informix.DB2.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- Informix.DB2 Informix (asynchronously) -WITH CTE_1 AS +WITH CTE_1 (c1) +AS ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID + SELECT + 1 FROM Child c_1 WHERE diff --git a/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Informix.DB2.LinqService).sql b/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Informix.DB2.LinqService).sql index 64de8e73bb25..36904787ea12 100644 --- a/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Informix.DB2.LinqService).sql +++ b/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Informix.DB2.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + INNER JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Informix.DB2.LinqService).sql b/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Informix.DB2.LinqService).sql index c22565ae6c0c..3652d131c394 100644 --- a/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Informix.DB2.LinqService).sql +++ b/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Informix.DB2.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + INNER JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Informix.DB2.LinqService).sql b/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Informix.DB2.LinqService).sql index d1351acada1a..09f2bb49d9f8 100644 --- a/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Informix.DB2.LinqService).sql +++ b/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Informix.DB2.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + LEFT JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Informix.DB2.LinqService).sql b/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Informix.DB2.LinqService).sql index 5e373d5b0bca..54fcea32995e 100644 --- a/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Informix.DB2.LinqService).sql +++ b/Informix.DB2.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Informix.DB2.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + LEFT JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/Informix.DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Informix.DB2.LinqService).sql b/Informix.DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Informix.DB2.LinqService).sql new file mode 100644 index 000000000000..ddc2c1663295 --- /dev/null +++ b/Informix.DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Informix.DB2.LinqService).sql @@ -0,0 +1,27 @@ +BeforeExecute +-- Informix.DB2 Informix (asynchronously) +DECLARE @skip Integer(4) -- Int32 +SET @skip = 1 +DECLARE @take Integer(4) -- Int32 +SET @take = 2 + +SELECT SKIP @skip FIRST @take + r.PersonID, + r.LastName +FROM + Person r +ORDER BY + r.FirstName + +BeforeExecute +-- Informix.DB2 Informix (asynchronously) + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/Informix.DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Informix.DB2.LinqService).sql b/Informix.DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Informix.DB2.LinqService).sql new file mode 100644 index 000000000000..e1d15ac45219 --- /dev/null +++ b/Informix.DB2.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Informix.DB2.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Informix.DB2 Informix (asynchronously) +DECLARE @skip Integer(4) -- Int32 +SET @skip = 1 +DECLARE @take Integer(4) -- Int32 +SET @take = 2 + +SELECT SKIP @skip FIRST @take + r.PersonID, + r.LastName, + r.FirstName +FROM + Person r +ORDER BY + r.FirstName + +BeforeExecute +-- Informix.DB2 Informix (asynchronously) + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/Informix.DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Informix.DB2).sql b/Informix.DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Informix.DB2).sql index be500b4724b5..f061f8a2bb56 100644 --- a/Informix.DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Informix.DB2).sql +++ b/Informix.DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Informix.DB2).sql @@ -5,17 +5,11 @@ WITH CTE_1 (ParentID) AS ( SELECT - t1.ParentID + c_1.ParentID FROM - ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) t1 + Child c_1 + WHERE + c_1.ParentID > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM Parent p - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) c_2 ON p.ParentID = c_2.ParentID - INNER JOIN ( - SELECT DISTINCT - c2.ParentID, - c2.ChildID - FROM - Child c2 - WHERE - c2.ParentID > 1 - ) c2_1 ON p.ParentID = c2_1.ParentID + INNER JOIN Child c_1 ON p.ParentID = c_1.ParentID + INNER JOIN Child c2 ON p.ParentID = c2.ParentID +WHERE + c_1.ParentID > 1 AND c2.ParentID > 1 diff --git a/Informix.DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Informix.DB2).sql b/Informix.DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Informix.DB2).sql index 0fdeb23b1132..5e9ea41881f8 100644 --- a/Informix.DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Informix.DB2).sql +++ b/Informix.DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Informix.DB2).sql @@ -1,11 +1,11 @@ BeforeExecute -- Informix.DB2 Informix -WITH CTE_1 AS +WITH CTE_1 (c1) +AS ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID + SELECT + 1 FROM Child c_1 WHERE diff --git a/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Informix.DB2).sql b/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Informix.DB2).sql index 957aa212cad7..21d3f904d5df 100644 --- a/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Informix.DB2).sql +++ b/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Informix.DB2).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + INNER JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Informix.DB2).sql b/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Informix.DB2).sql index 2ef42079a79c..2f815ecd8d34 100644 --- a/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Informix.DB2).sql +++ b/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Informix.DB2).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + INNER JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Informix.DB2).sql b/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Informix.DB2).sql index 8e815b2462b7..d421e56ad506 100644 --- a/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Informix.DB2).sql +++ b/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Informix.DB2).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + LEFT JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Informix.DB2).sql b/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Informix.DB2).sql index 678dc2b712ac..406c3e1083e2 100644 --- a/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Informix.DB2).sql +++ b/Informix.DB2/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Informix.DB2).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + LEFT JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/Informix.DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Informix.DB2).sql b/Informix.DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Informix.DB2).sql new file mode 100644 index 000000000000..cf06c693ef46 --- /dev/null +++ b/Informix.DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Informix.DB2).sql @@ -0,0 +1,27 @@ +BeforeExecute +-- Informix.DB2 Informix +DECLARE @skip Integer(4) -- Int32 +SET @skip = 1 +DECLARE @take Integer(4) -- Int32 +SET @take = 2 + +SELECT SKIP @skip FIRST @take + r.PersonID, + r.LastName +FROM + Person r +ORDER BY + r.FirstName + +BeforeExecute +-- Informix.DB2 Informix + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/Informix.DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Informix.DB2).sql b/Informix.DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Informix.DB2).sql new file mode 100644 index 000000000000..e27cda76ee3f --- /dev/null +++ b/Informix.DB2/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Informix.DB2).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Informix.DB2 Informix +DECLARE @skip Integer(4) -- Int32 +SET @skip = 1 +DECLARE @take Integer(4) -- Int32 +SET @take = 2 + +SELECT SKIP @skip FIRST @take + r.PersonID, + r.LastName, + r.FirstName +FROM + Person r +ORDER BY + r.FirstName + +BeforeExecute +-- Informix.DB2 Informix + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + From 901d8f2dd9ae4d0e1f6499961f652b05bc602042 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:44:38 +0000 Subject: [PATCH 16/42] [Linux / Firebird 5.0] baselines --- ...CteTests.Test5(Firebird.5.LinqService).sql | 36 +++++-------------- ...estCustomCount(Firebird.5.LinqService).sql | 8 ++--- ...erJoinDistinct(Firebird.5.LinqService).sql | 14 ++------ ...nDistinctWhere(Firebird.5.LinqService).sql | 14 ++------ ...ftJoinDistinct(Firebird.5.LinqService).sql | 14 ++------ ...nDistinctWhere(Firebird.5.LinqService).sql | 14 ++------ ...ByDistinctAll1(Firebird.5.LinqService).sql | 28 +++++++++++++++ ...ByDistinctAll2(Firebird.5.LinqService).sql | 29 +++++++++++++++ .../Tests.Linq.CteTests.Test5(Firebird.5).sql | 36 +++++-------------- ...q.CteTests.TestCustomCount(Firebird.5).sql | 8 ++--- ...tedTests.InnerJoinDistinct(Firebird.5).sql | 14 ++------ ...sts.InnerJoinDistinctWhere(Firebird.5).sql | 14 ++------ ...itedTests.LeftJoinDistinct(Firebird.5).sql | 14 ++------ ...ests.LeftJoinDistinctWhere(Firebird.5).sql | 14 ++------ ...tTests.OrderByDistinctAll1(Firebird.5).sql | 28 +++++++++++++++ ...tTests.OrderByDistinctAll2(Firebird.5).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 Firebird.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.5.LinqService).sql create mode 100644 Firebird.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.5.LinqService).sql create mode 100644 Firebird.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.5).sql create mode 100644 Firebird.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.5).sql diff --git a/Firebird.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.5.LinqService).sql b/Firebird.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.5.LinqService).sql index 04b7611d9e44..36b76d9ed58f 100644 --- a/Firebird.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.5.LinqService).sql +++ b/Firebird.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.5.LinqService).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - "t1"."ParentID" + "c_1"."ParentID" FROM - ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "t1" + "Child" "c_1" + WHERE + "c_1"."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" "p" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "c_2" ON "p"."ParentID" = "c_2"."ParentID" - INNER JOIN ( - SELECT DISTINCT - "c2"."ParentID", - "c2"."ChildID" - FROM - "Child" "c2" - WHERE - "c2"."ParentID" > 1 - ) "c2_1" ON "p"."ParentID" = "c2_1"."ParentID" + INNER JOIN "Child" "c_1" ON "p"."ParentID" = "c_1"."ParentID" + INNER JOIN "Child" "c2" ON "p"."ParentID" = "c2"."ParentID" +WHERE + "c_1"."ParentID" > 1 AND "c2"."ParentID" > 1 diff --git a/Firebird.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.5.LinqService).sql b/Firebird.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.5.LinqService).sql index da6b0faf26a8..9ecf00e18b79 100644 --- a/Firebird.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.5.LinqService).sql +++ b/Firebird.5.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.5.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- Firebird.5 Firebird4 (asynchronously) -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" + SELECT + 1 FROM "Child" "c_1" WHERE diff --git a/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.5.LinqService).sql b/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.5.LinqService).sql index efe1692aa223..bc19324a4ace 100644 --- a/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.5.LinqService).sql +++ b/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.5.LinqService).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - CROSS JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "o"."ParentID" = "c_1"."ParentID" - ) "c_2" + INNER JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.5.LinqService).sql b/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.5.LinqService).sql index 4def238bbb33..b2776559843f 100644 --- a/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.5.LinqService).sql +++ b/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.5.LinqService).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - CROSS JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" = "o"."ParentID" - ) "c_2" + INNER JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.5.LinqService).sql b/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.5.LinqService).sql index cc0b73ddd4c9..ab10abfbd537 100644 --- a/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.5.LinqService).sql +++ b/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.5.LinqService).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "o"."ParentID" = "c_1"."ParentID" - ) "c_2" ON 1=1 + LEFT JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.5.LinqService).sql b/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.5.LinqService).sql index 28e923b119fd..597be365ddd0 100644 --- a/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.5.LinqService).sql +++ b/Firebird.5.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.5.LinqService).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" = "o"."ParentID" - ) "c_2" ON 1=1 + LEFT JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.5.LinqService).sql b/Firebird.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.5.LinqService).sql new file mode 100644 index 000000000000..4d052b8956cf --- /dev/null +++ b/Firebird.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.5.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Firebird.5 Firebird4 (asynchronously) +DECLARE @skip Integer -- Int32 +SET @skip = 1 +DECLARE @take Integer -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- Firebird.5 Firebird4 (asynchronously) + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/Firebird.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.5.LinqService).sql b/Firebird.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.5.LinqService).sql new file mode 100644 index 000000000000..8861e06834ca --- /dev/null +++ b/Firebird.5.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.5.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Firebird.5 Firebird4 (asynchronously) +DECLARE @skip Integer -- Int32 +SET @skip = 1 +DECLARE @take Integer -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName", + "r"."FirstName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- Firebird.5 Firebird4 (asynchronously) + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/Firebird.5/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.5).sql b/Firebird.5/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.5).sql index 8c7d2e43c7f3..7e2c3cf50068 100644 --- a/Firebird.5/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.5).sql +++ b/Firebird.5/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Firebird.5).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - "t1"."ParentID" + "c_1"."ParentID" FROM - ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "t1" + "Child" "c_1" + WHERE + "c_1"."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" "p" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "c_2" ON "p"."ParentID" = "c_2"."ParentID" - INNER JOIN ( - SELECT DISTINCT - "c2"."ParentID", - "c2"."ChildID" - FROM - "Child" "c2" - WHERE - "c2"."ParentID" > 1 - ) "c2_1" ON "p"."ParentID" = "c2_1"."ParentID" + INNER JOIN "Child" "c_1" ON "p"."ParentID" = "c_1"."ParentID" + INNER JOIN "Child" "c2" ON "p"."ParentID" = "c2"."ParentID" +WHERE + "c_1"."ParentID" > 1 AND "c2"."ParentID" > 1 diff --git a/Firebird.5/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.5).sql b/Firebird.5/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.5).sql index 5822f3e1d440..1ad3c6a21cd1 100644 --- a/Firebird.5/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.5).sql +++ b/Firebird.5/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Firebird.5).sql @@ -1,11 +1,11 @@ BeforeExecute -- Firebird.5 Firebird4 -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" + SELECT + 1 FROM "Child" "c_1" WHERE diff --git a/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.5).sql b/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.5).sql index 0c56375f5f59..4e2af91f75c5 100644 --- a/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.5).sql +++ b/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Firebird.5).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - CROSS JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "o"."ParentID" = "c_1"."ParentID" - ) "c_2" + INNER JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.5).sql b/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.5).sql index d0e58e36299d..0e1eee96ae13 100644 --- a/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.5).sql +++ b/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Firebird.5).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - CROSS JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" = "o"."ParentID" - ) "c_2" + INNER JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.5).sql b/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.5).sql index 84f8b7f7607f..6b35abc22f1f 100644 --- a/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.5).sql +++ b/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Firebird.5).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "o"."ParentID" = "c_1"."ParentID" - ) "c_2" ON 1=1 + LEFT JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.5).sql b/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.5).sql index fc8c48e72fef..061c151fe402 100644 --- a/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.5).sql +++ b/Firebird.5/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Firebird.5).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" = "o"."ParentID" - ) "c_2" ON 1=1 + LEFT JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/Firebird.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.5).sql b/Firebird.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.5).sql new file mode 100644 index 000000000000..1ad2eb0bba49 --- /dev/null +++ b/Firebird.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Firebird.5).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Firebird.5 Firebird4 +DECLARE @skip Integer -- Int32 +SET @skip = 1 +DECLARE @take Integer -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- Firebird.5 Firebird4 + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/Firebird.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.5).sql b/Firebird.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.5).sql new file mode 100644 index 000000000000..261cb4facdc3 --- /dev/null +++ b/Firebird.5/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Firebird.5).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Firebird.5 Firebird4 +DECLARE @skip Integer -- Int32 +SET @skip = 1 +DECLARE @take Integer -- Int32 +SET @take = 2 + +SELECT + "r"."PersonID", + "r"."LastName", + "r"."FirstName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- Firebird.5 Firebird4 + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + From 07c0b5d5ff4c4e90645a10b6c25c5d8c464227b1 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:47:40 +0000 Subject: [PATCH 17/42] [Linux / ClickHouse Driver] baselines --- ...s.Test5(ClickHouse.Driver.LinqService).sql | 36 +++++-------------- ...omCount(ClickHouse.Driver.LinqService).sql | 5 ++- ...nctJoin(ClickHouse.Driver.LinqService).sql | 16 ++------- ...istinct(ClickHouse.Driver.LinqService).sql | 12 ++----- ...ctWhere(ClickHouse.Driver.LinqService).sql | 12 ++----- ...istinct(ClickHouse.Driver.LinqService).sql | 12 ++----- ...ctWhere(ClickHouse.Driver.LinqService).sql | 12 ++----- ...nctAll1(ClickHouse.Driver.LinqService).sql | 24 +++++++++++++ ...nctAll2(ClickHouse.Driver.LinqService).sql | 25 +++++++++++++ ...Linq.CteTests.Test5(ClickHouse.Driver).sql | 36 +++++-------------- ...sts.TestCustomCount(ClickHouse.Driver).sql | 5 ++- ...tTests.DistinctJoin(ClickHouse.Driver).sql | 16 ++------- ...s.InnerJoinDistinct(ClickHouse.Driver).sql | 12 ++----- ...erJoinDistinctWhere(ClickHouse.Driver).sql | 12 ++----- ...ts.LeftJoinDistinct(ClickHouse.Driver).sql | 12 ++----- ...ftJoinDistinctWhere(ClickHouse.Driver).sql | 12 ++----- ...OrderByDistinctAll1(ClickHouse.Driver).sql | 24 +++++++++++++ ...OrderByDistinctAll2(ClickHouse.Driver).sql | 25 +++++++++++++ 18 files changed, 146 insertions(+), 162 deletions(-) create mode 100644 ClickHouse.Driver.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Driver.LinqService).sql create mode 100644 ClickHouse.Driver.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Driver.LinqService).sql create mode 100644 ClickHouse.Driver/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Driver).sql create mode 100644 ClickHouse.Driver/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Driver).sql diff --git a/ClickHouse.Driver.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Driver.LinqService).sql b/ClickHouse.Driver.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Driver.LinqService).sql index 7cdf60751098..2a9319c9fd7d 100644 --- a/ClickHouse.Driver.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Driver.LinqService).sql +++ b/ClickHouse.Driver.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Driver.LinqService).sql @@ -4,17 +4,11 @@ WITH CTE_1 AS ( SELECT - t1.ParentID + c_1.ParentID FROM - ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) t1 + Child c_1 + WHERE + c_1.ParentID > 1 ) SELECT COUNT(*) @@ -30,22 +24,8 @@ SELECT COUNT(*) FROM Parent p - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) c_2 ON p.ParentID = c_2.ParentID - INNER JOIN ( - SELECT DISTINCT - c2.ParentID as ParentID, - c2.ChildID as ChildID - FROM - Child c2 - WHERE - c2.ParentID > 1 - ) c2_1 ON p.ParentID = c2_1.ParentID + INNER JOIN Child c_1 ON p.ParentID = c_1.ParentID + INNER JOIN Child c2 ON p.ParentID = c2.ParentID +WHERE + c_1.ParentID > 1 AND c2.ParentID > 1 diff --git a/ClickHouse.Driver.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Driver.LinqService).sql b/ClickHouse.Driver.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Driver.LinqService).sql index 4142dd0f26ff..49dc9a19335f 100644 --- a/ClickHouse.Driver.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Driver.LinqService).sql +++ b/ClickHouse.Driver.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Driver.LinqService).sql @@ -3,9 +3,8 @@ WITH CTE_1 AS ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID + SELECT + 1 as c1 FROM Child c_1 WHERE diff --git a/ClickHouse.Driver.LinqService/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Driver.LinqService).sql b/ClickHouse.Driver.LinqService/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Driver.LinqService).sql index 0fc04af16e3f..59412774e664 100644 --- a/ClickHouse.Driver.LinqService/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Driver.LinqService).sql +++ b/ClickHouse.Driver.LinqService/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Driver.LinqService).sql @@ -5,18 +5,6 @@ SELECT e.ID, p.SmallIntValue FROM - ( - SELECT DISTINCT - t1.ID as ID, - t1.SmallIntValue as SmallIntValue - FROM - LinqDataTypes t1 - ) e - LEFT JOIN ( - SELECT DISTINCT - t2.ID as ID, - t2.SmallIntValue as SmallIntValue - FROM - LinqDataTypes t2 - ) p ON p.ID = e.ID + LinqDataTypes e + LEFT JOIN LinqDataTypes p ON p.ID = e.ID diff --git a/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Driver.LinqService).sql b/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Driver.LinqService).sql index 4ce092ad2afa..605b4617ded4 100644 --- a/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Driver.LinqService).sql +++ b/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Driver.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + INNER JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Driver.LinqService).sql b/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Driver.LinqService).sql index d5b4312d9034..93f5025f3fd4 100644 --- a/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Driver.LinqService).sql +++ b/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Driver.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + INNER JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Driver.LinqService).sql b/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Driver.LinqService).sql index d2bd1e9edfe2..b31d7c40bc36 100644 --- a/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Driver.LinqService).sql +++ b/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Driver.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + LEFT JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Driver.LinqService).sql b/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Driver.LinqService).sql index b687e0b243d0..a7b7c2b609ca 100644 --- a/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Driver.LinqService).sql +++ b/ClickHouse.Driver.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Driver.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + LEFT JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/ClickHouse.Driver.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Driver.LinqService).sql b/ClickHouse.Driver.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Driver.LinqService).sql new file mode 100644 index 000000000000..04a9655263c4 --- /dev/null +++ b/ClickHouse.Driver.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Driver.LinqService).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- ClickHouse.Driver ClickHouse (asynchronously) + +SELECT + r.PersonID, + r.LastName +FROM + Person r +ORDER BY + r.FirstName +LIMIT 1, 2 + +BeforeExecute +-- ClickHouse.Driver ClickHouse (asynchronously) + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/ClickHouse.Driver.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Driver.LinqService).sql b/ClickHouse.Driver.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Driver.LinqService).sql new file mode 100644 index 000000000000..1e742491dd59 --- /dev/null +++ b/ClickHouse.Driver.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Driver.LinqService).sql @@ -0,0 +1,25 @@ +BeforeExecute +-- ClickHouse.Driver ClickHouse (asynchronously) + +SELECT + r.PersonID, + r.LastName, + r.FirstName +FROM + Person r +ORDER BY + r.FirstName +LIMIT 1, 2 + +BeforeExecute +-- ClickHouse.Driver ClickHouse (asynchronously) + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/ClickHouse.Driver/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Driver).sql b/ClickHouse.Driver/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Driver).sql index aec8b9bf5107..6eb326824775 100644 --- a/ClickHouse.Driver/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Driver).sql +++ b/ClickHouse.Driver/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Driver).sql @@ -4,17 +4,11 @@ WITH CTE_1 AS ( SELECT - t1.ParentID + c_1.ParentID FROM - ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) t1 + Child c_1 + WHERE + c_1.ParentID > 1 ) SELECT COUNT(*) @@ -30,22 +24,8 @@ SELECT COUNT(*) FROM Parent p - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) c_2 ON p.ParentID = c_2.ParentID - INNER JOIN ( - SELECT DISTINCT - c2.ParentID as ParentID, - c2.ChildID as ChildID - FROM - Child c2 - WHERE - c2.ParentID > 1 - ) c2_1 ON p.ParentID = c2_1.ParentID + INNER JOIN Child c_1 ON p.ParentID = c_1.ParentID + INNER JOIN Child c2 ON p.ParentID = c2.ParentID +WHERE + c_1.ParentID > 1 AND c2.ParentID > 1 diff --git a/ClickHouse.Driver/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Driver).sql b/ClickHouse.Driver/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Driver).sql index dd4e7c3f5229..1fa856ef41da 100644 --- a/ClickHouse.Driver/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Driver).sql +++ b/ClickHouse.Driver/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Driver).sql @@ -3,9 +3,8 @@ WITH CTE_1 AS ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID + SELECT + 1 as c1 FROM Child c_1 WHERE diff --git a/ClickHouse.Driver/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Driver).sql b/ClickHouse.Driver/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Driver).sql index 098fd421c744..e5483ef71232 100644 --- a/ClickHouse.Driver/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Driver).sql +++ b/ClickHouse.Driver/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Driver).sql @@ -5,18 +5,6 @@ SELECT e.ID, p.SmallIntValue FROM - ( - SELECT DISTINCT - t1.ID as ID, - t1.SmallIntValue as SmallIntValue - FROM - LinqDataTypes t1 - ) e - LEFT JOIN ( - SELECT DISTINCT - t2.ID as ID, - t2.SmallIntValue as SmallIntValue - FROM - LinqDataTypes t2 - ) p ON p.ID = e.ID + LinqDataTypes e + LEFT JOIN LinqDataTypes p ON p.ID = e.ID diff --git a/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Driver).sql b/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Driver).sql index 1a7aaa441e54..18c8e5126164 100644 --- a/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Driver).sql +++ b/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Driver).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + INNER JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Driver).sql b/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Driver).sql index 9ee8135fc6ee..c45c35917faa 100644 --- a/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Driver).sql +++ b/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Driver).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + INNER JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Driver).sql b/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Driver).sql index 907e28afde14..809565de7f34 100644 --- a/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Driver).sql +++ b/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Driver).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + LEFT JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Driver).sql b/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Driver).sql index 7b1e627f928e..81c1d923e379 100644 --- a/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Driver).sql +++ b/ClickHouse.Driver/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Driver).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + LEFT JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/ClickHouse.Driver/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Driver).sql b/ClickHouse.Driver/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Driver).sql new file mode 100644 index 000000000000..5428d9cdb640 --- /dev/null +++ b/ClickHouse.Driver/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Driver).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- ClickHouse.Driver ClickHouse + +SELECT + r.PersonID, + r.LastName +FROM + Person r +ORDER BY + r.FirstName +LIMIT 1, 2 + +BeforeExecute +-- ClickHouse.Driver ClickHouse + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/ClickHouse.Driver/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Driver).sql b/ClickHouse.Driver/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Driver).sql new file mode 100644 index 000000000000..85d5981e0360 --- /dev/null +++ b/ClickHouse.Driver/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Driver).sql @@ -0,0 +1,25 @@ +BeforeExecute +-- ClickHouse.Driver ClickHouse + +SELECT + r.PersonID, + r.LastName, + r.FirstName +FROM + Person r +ORDER BY + r.FirstName +LIMIT 1, 2 + +BeforeExecute +-- ClickHouse.Driver ClickHouse + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + From d31f90c5e6751cc1221b47957096ba9da1ab688b Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:48:13 +0000 Subject: [PATCH 18/42] [Linux / MariaDB 11] baselines --- ...CteTests.Test5(MariaDB.11.LinqService).sql | 36 +++++-------------- ...estCustomCount(MariaDB.11.LinqService).sql | 8 ++--- ...erJoinDistinct(MariaDB.11.LinqService).sql | 12 ++----- ...nDistinctWhere(MariaDB.11.LinqService).sql | 12 ++----- ...ftJoinDistinct(MariaDB.11.LinqService).sql | 12 ++----- ...nDistinctWhere(MariaDB.11.LinqService).sql | 12 ++----- ...ByDistinctAll1(MariaDB.11.LinqService).sql | 28 +++++++++++++++ ...ByDistinctAll2(MariaDB.11.LinqService).sql | 29 +++++++++++++++ .../Tests.Linq.CteTests.Test5(MariaDB.11).sql | 36 +++++-------------- ...q.CteTests.TestCustomCount(MariaDB.11).sql | 8 ++--- ...tedTests.InnerJoinDistinct(MariaDB.11).sql | 12 ++----- ...sts.InnerJoinDistinctWhere(MariaDB.11).sql | 12 ++----- ...itedTests.LeftJoinDistinct(MariaDB.11).sql | 12 ++----- ...ests.LeftJoinDistinctWhere(MariaDB.11).sql | 12 ++----- ...tTests.OrderByDistinctAll1(MariaDB.11).sql | 28 +++++++++++++++ ...tTests.OrderByDistinctAll2(MariaDB.11).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 136 deletions(-) create mode 100644 MariaDB.11.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MariaDB.11.LinqService).sql create mode 100644 MariaDB.11.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MariaDB.11.LinqService).sql create mode 100644 MariaDB.11/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MariaDB.11).sql create mode 100644 MariaDB.11/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MariaDB.11).sql diff --git a/MariaDB.11.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MariaDB.11.LinqService).sql b/MariaDB.11.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MariaDB.11.LinqService).sql index 74ef493d2830..3a0913350e5d 100644 --- a/MariaDB.11.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MariaDB.11.LinqService).sql +++ b/MariaDB.11.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MariaDB.11.LinqService).sql @@ -5,17 +5,11 @@ WITH `CTE_1` (`ParentID`) AS ( SELECT - `t1`.`ParentID` + `c_1`.`ParentID` FROM - ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` > 1 - ) `t1` + `Child` `c_1` + WHERE + `c_1`.`ParentID` > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM `Parent` `p` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` > 1 - ) `c_2` ON `p`.`ParentID` = `c_2`.`ParentID` - INNER JOIN ( - SELECT DISTINCT - `c2`.`ParentID`, - `c2`.`ChildID` - FROM - `Child` `c2` - WHERE - `c2`.`ParentID` > 1 - ) `c2_1` ON `p`.`ParentID` = `c2_1`.`ParentID` + INNER JOIN `Child` `c_1` ON `p`.`ParentID` = `c_1`.`ParentID` + INNER JOIN `Child` `c2` ON `p`.`ParentID` = `c2`.`ParentID` +WHERE + `c_1`.`ParentID` > 1 AND `c2`.`ParentID` > 1 diff --git a/MariaDB.11.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MariaDB.11.LinqService).sql b/MariaDB.11.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MariaDB.11.LinqService).sql index 94f79f6301b3..72980c2f23db 100644 --- a/MariaDB.11.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MariaDB.11.LinqService).sql +++ b/MariaDB.11.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MariaDB.11.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- MariaDB.11 MariaDB.10.MySqlConnector MySql (asynchronously) -WITH `CTE_1` AS +WITH `CTE_1` (`c1`) +AS ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` + SELECT + 1 FROM `Child` `c_1` WHERE diff --git a/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MariaDB.11.LinqService).sql b/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MariaDB.11.LinqService).sql index a7a3b93b78e2..84fc49ee5ba9 100644 --- a/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MariaDB.11.LinqService).sql +++ b/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MariaDB.11.LinqService).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `o`.`ParentID` = `c_2`.`ParentID` + INNER JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MariaDB.11.LinqService).sql b/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MariaDB.11.LinqService).sql index 28972eb5e2f2..c787a7cacd4a 100644 --- a/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MariaDB.11.LinqService).sql +++ b/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MariaDB.11.LinqService).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `c_2`.`ParentID` = `o`.`ParentID` + INNER JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MariaDB.11.LinqService).sql b/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MariaDB.11.LinqService).sql index 9521c5abb04d..16bc9b159ac1 100644 --- a/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MariaDB.11.LinqService).sql +++ b/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MariaDB.11.LinqService).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `o`.`ParentID` = `c_2`.`ParentID` + LEFT JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MariaDB.11.LinqService).sql b/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MariaDB.11.LinqService).sql index 361879e36752..8945035f9b23 100644 --- a/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MariaDB.11.LinqService).sql +++ b/MariaDB.11.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MariaDB.11.LinqService).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `c_2`.`ParentID` = `o`.`ParentID` + LEFT JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MariaDB.11.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MariaDB.11.LinqService).sql b/MariaDB.11.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MariaDB.11.LinqService).sql new file mode 100644 index 000000000000..19d66632098b --- /dev/null +++ b/MariaDB.11.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MariaDB.11.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- MariaDB.11 MariaDB.10.MySqlConnector MySql (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MariaDB.11 MariaDB.10.MySqlConnector MySql (asynchronously) + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MariaDB.11.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MariaDB.11.LinqService).sql b/MariaDB.11.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MariaDB.11.LinqService).sql new file mode 100644 index 000000000000..00cec0c281e4 --- /dev/null +++ b/MariaDB.11.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MariaDB.11.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- MariaDB.11 MariaDB.10.MySqlConnector MySql (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName`, + `r`.`FirstName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MariaDB.11 MariaDB.10.MySqlConnector MySql (asynchronously) + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MariaDB.11/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MariaDB.11).sql b/MariaDB.11/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MariaDB.11).sql index 375bd7c2a566..7de664e6ec3c 100644 --- a/MariaDB.11/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MariaDB.11).sql +++ b/MariaDB.11/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MariaDB.11).sql @@ -5,17 +5,11 @@ WITH `CTE_1` (`ParentID`) AS ( SELECT - `t1`.`ParentID` + `c_1`.`ParentID` FROM - ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` > 1 - ) `t1` + `Child` `c_1` + WHERE + `c_1`.`ParentID` > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM `Parent` `p` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` > 1 - ) `c_2` ON `p`.`ParentID` = `c_2`.`ParentID` - INNER JOIN ( - SELECT DISTINCT - `c2`.`ParentID`, - `c2`.`ChildID` - FROM - `Child` `c2` - WHERE - `c2`.`ParentID` > 1 - ) `c2_1` ON `p`.`ParentID` = `c2_1`.`ParentID` + INNER JOIN `Child` `c_1` ON `p`.`ParentID` = `c_1`.`ParentID` + INNER JOIN `Child` `c2` ON `p`.`ParentID` = `c2`.`ParentID` +WHERE + `c_1`.`ParentID` > 1 AND `c2`.`ParentID` > 1 diff --git a/MariaDB.11/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MariaDB.11).sql b/MariaDB.11/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MariaDB.11).sql index 4be152fa00b8..4e8a1170960f 100644 --- a/MariaDB.11/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MariaDB.11).sql +++ b/MariaDB.11/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MariaDB.11).sql @@ -1,11 +1,11 @@ BeforeExecute -- MariaDB.11 MariaDB.10.MySqlConnector MySql -WITH `CTE_1` AS +WITH `CTE_1` (`c1`) +AS ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` + SELECT + 1 FROM `Child` `c_1` WHERE diff --git a/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MariaDB.11).sql b/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MariaDB.11).sql index 0223f3a4f4cd..4e47ec7a2236 100644 --- a/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MariaDB.11).sql +++ b/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MariaDB.11).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `o`.`ParentID` = `c_2`.`ParentID` + INNER JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MariaDB.11).sql b/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MariaDB.11).sql index 5e258fe2b06d..063450ec6459 100644 --- a/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MariaDB.11).sql +++ b/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MariaDB.11).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `c_2`.`ParentID` = `o`.`ParentID` + INNER JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MariaDB.11).sql b/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MariaDB.11).sql index 1306be765710..9f76e11d72b1 100644 --- a/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MariaDB.11).sql +++ b/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MariaDB.11).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `o`.`ParentID` = `c_2`.`ParentID` + LEFT JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MariaDB.11).sql b/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MariaDB.11).sql index d8d20e42ea53..991767fa64b4 100644 --- a/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MariaDB.11).sql +++ b/MariaDB.11/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MariaDB.11).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `c_2`.`ParentID` = `o`.`ParentID` + LEFT JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MariaDB.11/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MariaDB.11).sql b/MariaDB.11/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MariaDB.11).sql new file mode 100644 index 000000000000..800e49d8e23c --- /dev/null +++ b/MariaDB.11/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MariaDB.11).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- MariaDB.11 MariaDB.10.MySqlConnector MySql +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MariaDB.11 MariaDB.10.MySqlConnector MySql + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MariaDB.11/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MariaDB.11).sql b/MariaDB.11/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MariaDB.11).sql new file mode 100644 index 000000000000..3a957ab4145d --- /dev/null +++ b/MariaDB.11/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MariaDB.11).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- MariaDB.11 MariaDB.10.MySqlConnector MySql +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName`, + `r`.`FirstName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MariaDB.11 MariaDB.10.MySqlConnector MySql + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + From f0afb0cdf6cd8f2df38fec458a7a3735c756c60a Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:48:30 +0000 Subject: [PATCH 19/42] [Linux / ClickHouse MySql] baselines --- ...ts.Test5(ClickHouse.MySql.LinqService).sql | 36 +++++-------------- ...tomCount(ClickHouse.MySql.LinqService).sql | 5 ++- ...inctJoin(ClickHouse.MySql.LinqService).sql | 16 ++------- ...Distinct(ClickHouse.MySql.LinqService).sql | 12 ++----- ...nctWhere(ClickHouse.MySql.LinqService).sql | 12 ++----- ...Distinct(ClickHouse.MySql.LinqService).sql | 12 ++----- ...nctWhere(ClickHouse.MySql.LinqService).sql | 12 ++----- ...inctAll1(ClickHouse.MySql.LinqService).sql | 24 +++++++++++++ ...inctAll2(ClickHouse.MySql.LinqService).sql | 25 +++++++++++++ ....Linq.CteTests.Test5(ClickHouse.MySql).sql | 36 +++++-------------- ...ests.TestCustomCount(ClickHouse.MySql).sql | 5 ++- ...ctTests.DistinctJoin(ClickHouse.MySql).sql | 16 ++------- ...ts.InnerJoinDistinct(ClickHouse.MySql).sql | 12 ++----- ...nerJoinDistinctWhere(ClickHouse.MySql).sql | 12 ++----- ...sts.LeftJoinDistinct(ClickHouse.MySql).sql | 12 ++----- ...eftJoinDistinctWhere(ClickHouse.MySql).sql | 12 ++----- ....OrderByDistinctAll1(ClickHouse.MySql).sql | 24 +++++++++++++ ....OrderByDistinctAll2(ClickHouse.MySql).sql | 25 +++++++++++++ 18 files changed, 146 insertions(+), 162 deletions(-) create mode 100644 ClickHouse.MySql.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.MySql.LinqService).sql create mode 100644 ClickHouse.MySql.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.MySql.LinqService).sql create mode 100644 ClickHouse.MySql/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.MySql).sql create mode 100644 ClickHouse.MySql/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.MySql).sql diff --git a/ClickHouse.MySql.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.MySql.LinqService).sql b/ClickHouse.MySql.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.MySql.LinqService).sql index a7b40557863b..687d8102e08b 100644 --- a/ClickHouse.MySql.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.MySql.LinqService).sql +++ b/ClickHouse.MySql.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.MySql.LinqService).sql @@ -4,17 +4,11 @@ WITH CTE_1 AS ( SELECT - t1.ParentID + c_1.ParentID FROM - ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) t1 + Child c_1 + WHERE + c_1.ParentID > 1 ) SELECT COUNT(*) @@ -30,22 +24,8 @@ SELECT COUNT(*) FROM Parent p - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) c_2 ON p.ParentID = c_2.ParentID - INNER JOIN ( - SELECT DISTINCT - c2.ParentID as ParentID, - c2.ChildID as ChildID - FROM - Child c2 - WHERE - c2.ParentID > 1 - ) c2_1 ON p.ParentID = c2_1.ParentID + INNER JOIN Child c_1 ON p.ParentID = c_1.ParentID + INNER JOIN Child c2 ON p.ParentID = c2.ParentID +WHERE + c_1.ParentID > 1 AND c2.ParentID > 1 diff --git a/ClickHouse.MySql.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.MySql.LinqService).sql b/ClickHouse.MySql.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.MySql.LinqService).sql index 2f5d754f7175..98e680fc80db 100644 --- a/ClickHouse.MySql.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.MySql.LinqService).sql +++ b/ClickHouse.MySql.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.MySql.LinqService).sql @@ -3,9 +3,8 @@ WITH CTE_1 AS ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID + SELECT + 1 as c1 FROM Child c_1 WHERE diff --git a/ClickHouse.MySql.LinqService/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.MySql.LinqService).sql b/ClickHouse.MySql.LinqService/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.MySql.LinqService).sql index c4e7cfe95553..a185b8dda67d 100644 --- a/ClickHouse.MySql.LinqService/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.MySql.LinqService).sql +++ b/ClickHouse.MySql.LinqService/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.MySql.LinqService).sql @@ -5,18 +5,6 @@ SELECT e.ID, p.SmallIntValue FROM - ( - SELECT DISTINCT - t1.ID as ID, - t1.SmallIntValue as SmallIntValue - FROM - LinqDataTypes t1 - ) e - LEFT JOIN ( - SELECT DISTINCT - t2.ID as ID, - t2.SmallIntValue as SmallIntValue - FROM - LinqDataTypes t2 - ) p ON p.ID = e.ID + LinqDataTypes e + LEFT JOIN LinqDataTypes p ON p.ID = e.ID diff --git a/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.MySql.LinqService).sql b/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.MySql.LinqService).sql index e368e3a71893..6a471cd6a821 100644 --- a/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.MySql.LinqService).sql +++ b/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.MySql.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + INNER JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.MySql.LinqService).sql b/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.MySql.LinqService).sql index a1e0611b659b..f364bc4ea89d 100644 --- a/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.MySql.LinqService).sql +++ b/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.MySql.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + INNER JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.MySql.LinqService).sql b/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.MySql.LinqService).sql index 4552362f1457..e49a57a1a31f 100644 --- a/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.MySql.LinqService).sql +++ b/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.MySql.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + LEFT JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.MySql.LinqService).sql b/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.MySql.LinqService).sql index a9decd3c0f95..fc24a0b3f34e 100644 --- a/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.MySql.LinqService).sql +++ b/ClickHouse.MySql.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.MySql.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + LEFT JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/ClickHouse.MySql.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.MySql.LinqService).sql b/ClickHouse.MySql.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.MySql.LinqService).sql new file mode 100644 index 000000000000..fd7754becc89 --- /dev/null +++ b/ClickHouse.MySql.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.MySql.LinqService).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- ClickHouse.MySql ClickHouse (asynchronously) + +SELECT + r.PersonID, + r.LastName +FROM + Person r +ORDER BY + r.FirstName +LIMIT 1, 2 + +BeforeExecute +-- ClickHouse.MySql ClickHouse (asynchronously) + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/ClickHouse.MySql.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.MySql.LinqService).sql b/ClickHouse.MySql.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.MySql.LinqService).sql new file mode 100644 index 000000000000..9f9a349f23fc --- /dev/null +++ b/ClickHouse.MySql.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.MySql.LinqService).sql @@ -0,0 +1,25 @@ +BeforeExecute +-- ClickHouse.MySql ClickHouse (asynchronously) + +SELECT + r.PersonID, + r.LastName, + r.FirstName +FROM + Person r +ORDER BY + r.FirstName +LIMIT 1, 2 + +BeforeExecute +-- ClickHouse.MySql ClickHouse (asynchronously) + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/ClickHouse.MySql/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.MySql).sql b/ClickHouse.MySql/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.MySql).sql index 4168ca748909..8a4b61984094 100644 --- a/ClickHouse.MySql/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.MySql).sql +++ b/ClickHouse.MySql/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.MySql).sql @@ -4,17 +4,11 @@ WITH CTE_1 AS ( SELECT - t1.ParentID + c_1.ParentID FROM - ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) t1 + Child c_1 + WHERE + c_1.ParentID > 1 ) SELECT COUNT(*) @@ -30,22 +24,8 @@ SELECT COUNT(*) FROM Parent p - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) c_2 ON p.ParentID = c_2.ParentID - INNER JOIN ( - SELECT DISTINCT - c2.ParentID as ParentID, - c2.ChildID as ChildID - FROM - Child c2 - WHERE - c2.ParentID > 1 - ) c2_1 ON p.ParentID = c2_1.ParentID + INNER JOIN Child c_1 ON p.ParentID = c_1.ParentID + INNER JOIN Child c2 ON p.ParentID = c2.ParentID +WHERE + c_1.ParentID > 1 AND c2.ParentID > 1 diff --git a/ClickHouse.MySql/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.MySql).sql b/ClickHouse.MySql/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.MySql).sql index 213028d4e392..1d979f08795f 100644 --- a/ClickHouse.MySql/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.MySql).sql +++ b/ClickHouse.MySql/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.MySql).sql @@ -3,9 +3,8 @@ WITH CTE_1 AS ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID + SELECT + 1 as c1 FROM Child c_1 WHERE diff --git a/ClickHouse.MySql/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.MySql).sql b/ClickHouse.MySql/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.MySql).sql index 8ce99090328f..a33c5e7fbf33 100644 --- a/ClickHouse.MySql/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.MySql).sql +++ b/ClickHouse.MySql/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.MySql).sql @@ -5,18 +5,6 @@ SELECT e.ID, p.SmallIntValue FROM - ( - SELECT DISTINCT - t1.ID as ID, - t1.SmallIntValue as SmallIntValue - FROM - LinqDataTypes t1 - ) e - LEFT JOIN ( - SELECT DISTINCT - t2.ID as ID, - t2.SmallIntValue as SmallIntValue - FROM - LinqDataTypes t2 - ) p ON p.ID = e.ID + LinqDataTypes e + LEFT JOIN LinqDataTypes p ON p.ID = e.ID diff --git a/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.MySql).sql b/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.MySql).sql index 0068b19d607c..303354d5fa3b 100644 --- a/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.MySql).sql +++ b/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.MySql).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + INNER JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.MySql).sql b/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.MySql).sql index dcb66d564bdb..a3479a95120d 100644 --- a/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.MySql).sql +++ b/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.MySql).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + INNER JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.MySql).sql b/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.MySql).sql index 858fe118827d..4c4b03d9c605 100644 --- a/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.MySql).sql +++ b/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.MySql).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + LEFT JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.MySql).sql b/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.MySql).sql index 1863ac6f66e9..723d5ddfead8 100644 --- a/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.MySql).sql +++ b/ClickHouse.MySql/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.MySql).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + LEFT JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/ClickHouse.MySql/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.MySql).sql b/ClickHouse.MySql/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.MySql).sql new file mode 100644 index 000000000000..643b6640b697 --- /dev/null +++ b/ClickHouse.MySql/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.MySql).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- ClickHouse.MySql ClickHouse + +SELECT + r.PersonID, + r.LastName +FROM + Person r +ORDER BY + r.FirstName +LIMIT 1, 2 + +BeforeExecute +-- ClickHouse.MySql ClickHouse + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/ClickHouse.MySql/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.MySql).sql b/ClickHouse.MySql/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.MySql).sql new file mode 100644 index 000000000000..b31c5ac25913 --- /dev/null +++ b/ClickHouse.MySql/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.MySql).sql @@ -0,0 +1,25 @@ +BeforeExecute +-- ClickHouse.MySql ClickHouse + +SELECT + r.PersonID, + r.LastName, + r.FirstName +FROM + Person r +ORDER BY + r.FirstName +LIMIT 1, 2 + +BeforeExecute +-- ClickHouse.MySql ClickHouse + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + From 4050480a8a74895bfe2eee91c58c7967f45f74f1 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:51:34 +0000 Subject: [PATCH 20/42] [Windows / SQL Server 2016] baselines --- ...ests.Test5(SqlServer.2016.LinqService).sql | 36 +++++-------------- ...ustomCount(SqlServer.2016.LinqService).sql | 8 ++--- ...inDistinct(SqlServer.2016.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2016.LinqService).sql | 14 ++------ ...inDistinct(SqlServer.2016.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2016.LinqService).sql | 14 ++------ ...stinctAll1(SqlServer.2016.LinqService).sql | 28 +++++++++++++++ ...stinctAll2(SqlServer.2016.LinqService).sql | 29 +++++++++++++++ ...s.Test5(SqlServer.2016.MS.LinqService).sql | 36 +++++-------------- ...omCount(SqlServer.2016.MS.LinqService).sql | 8 ++--- ...istinct(SqlServer.2016.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2016.MS.LinqService).sql | 14 ++------ ...istinct(SqlServer.2016.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2016.MS.LinqService).sql | 14 ++------ ...nctAll1(SqlServer.2016.MS.LinqService).sql | 28 +++++++++++++++ ...nctAll2(SqlServer.2016.MS.LinqService).sql | 29 +++++++++++++++ ...Linq.CteTests.Test5(SqlServer.2016.MS).sql | 36 +++++-------------- ...sts.TestCustomCount(SqlServer.2016.MS).sql | 8 ++--- ...s.InnerJoinDistinct(SqlServer.2016.MS).sql | 14 ++------ ...erJoinDistinctWhere(SqlServer.2016.MS).sql | 14 ++------ ...ts.LeftJoinDistinct(SqlServer.2016.MS).sql | 14 ++------ ...ftJoinDistinctWhere(SqlServer.2016.MS).sql | 14 ++------ ...OrderByDistinctAll1(SqlServer.2016.MS).sql | 28 +++++++++++++++ ...OrderByDistinctAll2(SqlServer.2016.MS).sql | 29 +++++++++++++++ ...ts.Linq.CteTests.Test5(SqlServer.2016).sql | 36 +++++-------------- ...eTests.TestCustomCount(SqlServer.2016).sql | 8 ++--- ...ests.InnerJoinDistinct(SqlServer.2016).sql | 14 ++------ ...InnerJoinDistinctWhere(SqlServer.2016).sql | 14 ++------ ...Tests.LeftJoinDistinct(SqlServer.2016).sql | 14 ++------ ....LeftJoinDistinctWhere(SqlServer.2016).sql | 14 ++------ ...ts.OrderByDistinctAll1(SqlServer.2016).sql | 28 +++++++++++++++ ...ts.OrderByDistinctAll2(SqlServer.2016).sql | 29 +++++++++++++++ 32 files changed, 324 insertions(+), 304 deletions(-) create mode 100644 SqlServer.2016.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016.LinqService).sql create mode 100644 SqlServer.2016.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016.LinqService).sql create mode 100644 SqlServer.2016.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016.MS.LinqService).sql create mode 100644 SqlServer.2016.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016.MS.LinqService).sql create mode 100644 SqlServer.2016.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016.MS).sql create mode 100644 SqlServer.2016.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016.MS).sql create mode 100644 SqlServer.2016/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016).sql create mode 100644 SqlServer.2016/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016).sql diff --git a/SqlServer.2016.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016.LinqService).sql b/SqlServer.2016.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016.LinqService).sql index ebe40b5084a1..4f7aa70c5052 100644 --- a/SqlServer.2016.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016.LinqService).sql +++ b/SqlServer.2016.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2016.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016.LinqService).sql b/SqlServer.2016.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016.LinqService).sql index 006edea13262..fc7e6b64908f 100644 --- a/SqlServer.2016.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016.LinqService).sql +++ b/SqlServer.2016.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2016 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016.LinqService).sql b/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016.LinqService).sql index 29a4771a162c..ab887e80ff80 100644 --- a/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016.LinqService).sql +++ b/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016.LinqService).sql b/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016.LinqService).sql index 36059ba45546..2560dee8bbf8 100644 --- a/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016.LinqService).sql +++ b/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016.LinqService).sql b/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016.LinqService).sql index 781a9b50f8d3..8b95667168eb 100644 --- a/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016.LinqService).sql +++ b/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016.LinqService).sql b/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016.LinqService).sql index e52a1848eed2..1f37d7475fd0 100644 --- a/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016.LinqService).sql +++ b/SqlServer.2016.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2016.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016.LinqService).sql b/SqlServer.2016.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016.LinqService).sql new file mode 100644 index 000000000000..5992a3fc077e --- /dev/null +++ b/SqlServer.2016.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2016 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2016 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2016.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016.LinqService).sql b/SqlServer.2016.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016.LinqService).sql new file mode 100644 index 000000000000..6760d62f3eed --- /dev/null +++ b/SqlServer.2016.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2016 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2016 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2016.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016.MS.LinqService).sql b/SqlServer.2016.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016.MS.LinqService).sql index 3237c8ef63da..c3ae199116a2 100644 --- a/SqlServer.2016.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016.MS.LinqService).sql +++ b/SqlServer.2016.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016.MS.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2016.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016.MS.LinqService).sql b/SqlServer.2016.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016.MS.LinqService).sql index 1cd754d17691..52584f45b72b 100644 --- a/SqlServer.2016.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016.MS.LinqService).sql +++ b/SqlServer.2016.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016.MS.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2016.MS SqlServer.2016 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016.MS.LinqService).sql b/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016.MS.LinqService).sql index b6d926cbe092..e8cc1805d3e4 100644 --- a/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016.MS.LinqService).sql +++ b/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016.MS.LinqService).sql b/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016.MS.LinqService).sql index de1c1aedb659..4dd99a03c028 100644 --- a/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016.MS.LinqService).sql +++ b/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016.MS.LinqService).sql b/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016.MS.LinqService).sql index 6ba3144aa25e..65d4a0cb63cd 100644 --- a/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016.MS.LinqService).sql +++ b/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016.MS.LinqService).sql b/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016.MS.LinqService).sql index be128c3674a9..a716eca424b2 100644 --- a/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016.MS.LinqService).sql +++ b/SqlServer.2016.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2016.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016.MS.LinqService).sql b/SqlServer.2016.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016.MS.LinqService).sql new file mode 100644 index 000000000000..9e709984c5da --- /dev/null +++ b/SqlServer.2016.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016.MS.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2016.MS SqlServer.2016 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2016.MS SqlServer.2016 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2016.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016.MS.LinqService).sql b/SqlServer.2016.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016.MS.LinqService).sql new file mode 100644 index 000000000000..8dc4e606928d --- /dev/null +++ b/SqlServer.2016.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016.MS.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2016.MS SqlServer.2016 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2016.MS SqlServer.2016 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2016.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016.MS).sql b/SqlServer.2016.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016.MS).sql index db7a7cf08121..abcd3cc8dc51 100644 --- a/SqlServer.2016.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016.MS).sql +++ b/SqlServer.2016.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016.MS).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2016.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016.MS).sql b/SqlServer.2016.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016.MS).sql index 5399deeda211..359c9886e74e 100644 --- a/SqlServer.2016.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016.MS).sql +++ b/SqlServer.2016.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016.MS).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2016.MS SqlServer.2016 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016.MS).sql b/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016.MS).sql index a96005a46506..d2170f93ce4b 100644 --- a/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016.MS).sql +++ b/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016.MS).sql b/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016.MS).sql index 6a59a4f27afd..08aef711800e 100644 --- a/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016.MS).sql +++ b/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016.MS).sql b/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016.MS).sql index 3cdcd71bc9c3..b7080bbcba1e 100644 --- a/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016.MS).sql +++ b/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016.MS).sql b/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016.MS).sql index 4372927578b0..53fe53cc50ba 100644 --- a/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016.MS).sql +++ b/SqlServer.2016.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2016.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016.MS).sql b/SqlServer.2016.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016.MS).sql new file mode 100644 index 000000000000..682167867459 --- /dev/null +++ b/SqlServer.2016.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016.MS).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2016.MS SqlServer.2016 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2016.MS SqlServer.2016 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2016.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016.MS).sql b/SqlServer.2016.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016.MS).sql new file mode 100644 index 000000000000..7c26fc46c15d --- /dev/null +++ b/SqlServer.2016.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016.MS).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2016.MS SqlServer.2016 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2016.MS SqlServer.2016 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2016/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016).sql b/SqlServer.2016/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016).sql index efd9dad83de5..fcedbcab8f4c 100644 --- a/SqlServer.2016/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016).sql +++ b/SqlServer.2016/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2016).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2016/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016).sql b/SqlServer.2016/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016).sql index 547191e87647..34e138f80440 100644 --- a/SqlServer.2016/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016).sql +++ b/SqlServer.2016/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2016).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2016 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016).sql b/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016).sql index 000afbc18fe3..ef16af81a780 100644 --- a/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016).sql +++ b/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2016).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016).sql b/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016).sql index a7d3af2887ba..74bc20da2dd6 100644 --- a/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016).sql +++ b/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2016).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016).sql b/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016).sql index e2386f8c4d63..2194c3abd32c 100644 --- a/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016).sql +++ b/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2016).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016).sql b/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016).sql index a73901c69b46..7302bc35bb95 100644 --- a/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016).sql +++ b/SqlServer.2016/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2016).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2016/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016).sql b/SqlServer.2016/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016).sql new file mode 100644 index 000000000000..443c93236cd3 --- /dev/null +++ b/SqlServer.2016/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2016).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2016 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2016 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2016/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016).sql b/SqlServer.2016/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016).sql new file mode 100644 index 000000000000..99fa8a1db1c1 --- /dev/null +++ b/SqlServer.2016/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2016).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2016 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2016 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From e7a9dc7f032d8dd214e4523e27833b169586449e Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:53:38 +0000 Subject: [PATCH 21/42] [Windows / SQL Server 2017] baselines --- ...ests.Test5(SqlServer.2017.LinqService).sql | 36 +++++-------------- ...ustomCount(SqlServer.2017.LinqService).sql | 8 ++--- ...inDistinct(SqlServer.2017.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2017.LinqService).sql | 14 ++------ ...inDistinct(SqlServer.2017.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2017.LinqService).sql | 14 ++------ ...stinctAll1(SqlServer.2017.LinqService).sql | 28 +++++++++++++++ ...stinctAll2(SqlServer.2017.LinqService).sql | 29 +++++++++++++++ ...s.Test5(SqlServer.2017.MS.LinqService).sql | 36 +++++-------------- ...omCount(SqlServer.2017.MS.LinqService).sql | 8 ++--- ...istinct(SqlServer.2017.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2017.MS.LinqService).sql | 14 ++------ ...istinct(SqlServer.2017.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2017.MS.LinqService).sql | 14 ++------ ...nctAll1(SqlServer.2017.MS.LinqService).sql | 28 +++++++++++++++ ...nctAll2(SqlServer.2017.MS.LinqService).sql | 29 +++++++++++++++ ...Linq.CteTests.Test5(SqlServer.2017.MS).sql | 36 +++++-------------- ...sts.TestCustomCount(SqlServer.2017.MS).sql | 8 ++--- ...s.InnerJoinDistinct(SqlServer.2017.MS).sql | 14 ++------ ...erJoinDistinctWhere(SqlServer.2017.MS).sql | 14 ++------ ...ts.LeftJoinDistinct(SqlServer.2017.MS).sql | 14 ++------ ...ftJoinDistinctWhere(SqlServer.2017.MS).sql | 14 ++------ ...OrderByDistinctAll1(SqlServer.2017.MS).sql | 28 +++++++++++++++ ...OrderByDistinctAll2(SqlServer.2017.MS).sql | 29 +++++++++++++++ ...ts.Linq.CteTests.Test5(SqlServer.2017).sql | 36 +++++-------------- ...eTests.TestCustomCount(SqlServer.2017).sql | 8 ++--- ...ests.InnerJoinDistinct(SqlServer.2017).sql | 14 ++------ ...InnerJoinDistinctWhere(SqlServer.2017).sql | 14 ++------ ...Tests.LeftJoinDistinct(SqlServer.2017).sql | 14 ++------ ....LeftJoinDistinctWhere(SqlServer.2017).sql | 14 ++------ ...ts.OrderByDistinctAll1(SqlServer.2017).sql | 28 +++++++++++++++ ...ts.OrderByDistinctAll2(SqlServer.2017).sql | 29 +++++++++++++++ 32 files changed, 324 insertions(+), 304 deletions(-) create mode 100644 SqlServer.2017.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017.LinqService).sql create mode 100644 SqlServer.2017.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017.LinqService).sql create mode 100644 SqlServer.2017.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017.MS.LinqService).sql create mode 100644 SqlServer.2017.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017.MS.LinqService).sql create mode 100644 SqlServer.2017.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017.MS).sql create mode 100644 SqlServer.2017.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017.MS).sql create mode 100644 SqlServer.2017/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017).sql create mode 100644 SqlServer.2017/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017).sql diff --git a/SqlServer.2017.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017.LinqService).sql b/SqlServer.2017.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017.LinqService).sql index d560d2d803b6..ef86c629a35d 100644 --- a/SqlServer.2017.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017.LinqService).sql +++ b/SqlServer.2017.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2017.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017.LinqService).sql b/SqlServer.2017.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017.LinqService).sql index 6b6f2d233766..c3a16d9248ed 100644 --- a/SqlServer.2017.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017.LinqService).sql +++ b/SqlServer.2017.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2017 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017.LinqService).sql b/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017.LinqService).sql index b19677a33daf..d71edaa68eb0 100644 --- a/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017.LinqService).sql +++ b/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017.LinqService).sql b/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017.LinqService).sql index a80710c2951d..658664c1d54a 100644 --- a/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017.LinqService).sql +++ b/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017.LinqService).sql b/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017.LinqService).sql index c6860104abf3..194c2f227a36 100644 --- a/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017.LinqService).sql +++ b/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017.LinqService).sql b/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017.LinqService).sql index 57e0a37e1ed2..133e864b65b2 100644 --- a/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017.LinqService).sql +++ b/SqlServer.2017.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2017.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017.LinqService).sql b/SqlServer.2017.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017.LinqService).sql new file mode 100644 index 000000000000..cd25d1660019 --- /dev/null +++ b/SqlServer.2017.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2017 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2017 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2017.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017.LinqService).sql b/SqlServer.2017.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017.LinqService).sql new file mode 100644 index 000000000000..783c9e5df086 --- /dev/null +++ b/SqlServer.2017.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2017 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2017 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2017.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017.MS.LinqService).sql b/SqlServer.2017.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017.MS.LinqService).sql index 1db6f37466f9..13dda37bdf2c 100644 --- a/SqlServer.2017.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017.MS.LinqService).sql +++ b/SqlServer.2017.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017.MS.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2017.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017.MS.LinqService).sql b/SqlServer.2017.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017.MS.LinqService).sql index b7453f5ae9f4..7eed1d426dcb 100644 --- a/SqlServer.2017.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017.MS.LinqService).sql +++ b/SqlServer.2017.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017.MS.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2017.MS SqlServer.2017 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017.MS.LinqService).sql b/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017.MS.LinqService).sql index ba84a4885bbe..5b226a9ed56f 100644 --- a/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017.MS.LinqService).sql +++ b/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017.MS.LinqService).sql b/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017.MS.LinqService).sql index 9b8255dd7a4a..148d12150fc8 100644 --- a/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017.MS.LinqService).sql +++ b/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017.MS.LinqService).sql b/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017.MS.LinqService).sql index 22a39d73dc86..161605c95e6d 100644 --- a/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017.MS.LinqService).sql +++ b/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017.MS.LinqService).sql b/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017.MS.LinqService).sql index ffcd9093873c..845756e63b2d 100644 --- a/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017.MS.LinqService).sql +++ b/SqlServer.2017.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2017.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017.MS.LinqService).sql b/SqlServer.2017.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017.MS.LinqService).sql new file mode 100644 index 000000000000..0c6d8a846cb5 --- /dev/null +++ b/SqlServer.2017.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017.MS.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2017.MS SqlServer.2017 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2017.MS SqlServer.2017 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2017.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017.MS.LinqService).sql b/SqlServer.2017.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017.MS.LinqService).sql new file mode 100644 index 000000000000..b6d12b500856 --- /dev/null +++ b/SqlServer.2017.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017.MS.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2017.MS SqlServer.2017 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2017.MS SqlServer.2017 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2017.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017.MS).sql b/SqlServer.2017.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017.MS).sql index 067897ae11de..64d895ec86d4 100644 --- a/SqlServer.2017.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017.MS).sql +++ b/SqlServer.2017.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017.MS).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2017.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017.MS).sql b/SqlServer.2017.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017.MS).sql index 9d58f9e7fe7f..450e53c9bd98 100644 --- a/SqlServer.2017.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017.MS).sql +++ b/SqlServer.2017.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017.MS).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2017.MS SqlServer.2017 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017.MS).sql b/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017.MS).sql index 2b43f6d501b3..30e8fb6d5014 100644 --- a/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017.MS).sql +++ b/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017.MS).sql b/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017.MS).sql index 38c3e0a281c0..df199679dc7e 100644 --- a/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017.MS).sql +++ b/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017.MS).sql b/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017.MS).sql index 96d70456240d..8b6d49d0ee8e 100644 --- a/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017.MS).sql +++ b/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017.MS).sql b/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017.MS).sql index 40df3915752b..6a5229af706c 100644 --- a/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017.MS).sql +++ b/SqlServer.2017.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2017.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017.MS).sql b/SqlServer.2017.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017.MS).sql new file mode 100644 index 000000000000..77601b6b79c8 --- /dev/null +++ b/SqlServer.2017.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017.MS).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2017.MS SqlServer.2017 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2017.MS SqlServer.2017 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2017.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017.MS).sql b/SqlServer.2017.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017.MS).sql new file mode 100644 index 000000000000..49ef0246b12a --- /dev/null +++ b/SqlServer.2017.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017.MS).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2017.MS SqlServer.2017 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2017.MS SqlServer.2017 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2017/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017).sql b/SqlServer.2017/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017).sql index 0479c33e6074..69714cbee28b 100644 --- a/SqlServer.2017/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017).sql +++ b/SqlServer.2017/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2017).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2017/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017).sql b/SqlServer.2017/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017).sql index a16d217fbcd6..cfd4434cc2af 100644 --- a/SqlServer.2017/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017).sql +++ b/SqlServer.2017/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2017).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2017 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017).sql b/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017).sql index 8a0601eba82c..93a5ac4b8a2e 100644 --- a/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017).sql +++ b/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2017).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017).sql b/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017).sql index 4e442e28d9ca..f91994d6f7a4 100644 --- a/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017).sql +++ b/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2017).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017).sql b/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017).sql index 12a7f6768a87..18fc52790ff7 100644 --- a/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017).sql +++ b/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2017).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017).sql b/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017).sql index 0f494ac5d31a..1bcd7c625e73 100644 --- a/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017).sql +++ b/SqlServer.2017/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2017).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2017/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017).sql b/SqlServer.2017/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017).sql new file mode 100644 index 000000000000..1e5862442a72 --- /dev/null +++ b/SqlServer.2017/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2017).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2017 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2017 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2017/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017).sql b/SqlServer.2017/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017).sql new file mode 100644 index 000000000000..298533acf768 --- /dev/null +++ b/SqlServer.2017/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2017).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2017 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2017 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From fc941ce8a9d96942edba4fc2205935d924c3bb4c Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:54:14 +0000 Subject: [PATCH 22/42] [Linux / MySQL 9 (both providers)] baselines --- ....CteTests.Test5(MySql.8.0.LinqService).sql | 36 +++++-------------- ...TestCustomCount(MySql.8.0.LinqService).sql | 8 ++--- ...nerJoinDistinct(MySql.8.0.LinqService).sql | 14 ++------ ...inDistinctWhere(MySql.8.0.LinqService).sql | 14 ++------ ...eftJoinDistinct(MySql.8.0.LinqService).sql | 14 ++------ ...inDistinctWhere(MySql.8.0.LinqService).sql | 14 ++------ ...rByDistinctAll1(MySql.8.0.LinqService).sql | 28 +++++++++++++++ ...rByDistinctAll2(MySql.8.0.LinqService).sql | 29 +++++++++++++++ .../Tests.Linq.CteTests.Test5(MySql.8.0).sql | 36 +++++-------------- ...nq.CteTests.TestCustomCount(MySql.8.0).sql | 8 ++--- ...itedTests.InnerJoinDistinct(MySql.8.0).sql | 14 ++------ ...ests.InnerJoinDistinctWhere(MySql.8.0).sql | 14 ++------ ...mitedTests.LeftJoinDistinct(MySql.8.0).sql | 14 ++------ ...Tests.LeftJoinDistinctWhere(MySql.8.0).sql | 14 ++------ ...ctTests.OrderByDistinctAll1(MySql.8.0).sql | 28 +++++++++++++++ ...ctTests.OrderByDistinctAll2(MySql.8.0).sql | 29 +++++++++++++++ ....Test5(MySqlConnector.8.0.LinqService).sql | 36 +++++-------------- ...mCount(MySqlConnector.8.0.LinqService).sql | 8 ++--- ...stinct(MySqlConnector.8.0.LinqService).sql | 14 ++------ ...tWhere(MySqlConnector.8.0.LinqService).sql | 14 ++------ ...stinct(MySqlConnector.8.0.LinqService).sql | 14 ++------ ...tWhere(MySqlConnector.8.0.LinqService).sql | 14 ++------ ...ctAll1(MySqlConnector.8.0.LinqService).sql | 28 +++++++++++++++ ...ctAll2(MySqlConnector.8.0.LinqService).sql | 29 +++++++++++++++ ...inq.CteTests.Test5(MySqlConnector.8.0).sql | 36 +++++-------------- ...ts.TestCustomCount(MySqlConnector.8.0).sql | 8 ++--- ....InnerJoinDistinct(MySqlConnector.8.0).sql | 14 ++------ ...rJoinDistinctWhere(MySqlConnector.8.0).sql | 14 ++------ ...s.LeftJoinDistinct(MySqlConnector.8.0).sql | 14 ++------ ...tJoinDistinctWhere(MySqlConnector.8.0).sql | 14 ++------ ...rderByDistinctAll1(MySqlConnector.8.0).sql | 28 +++++++++++++++ ...rderByDistinctAll2(MySqlConnector.8.0).sql | 29 +++++++++++++++ 32 files changed, 324 insertions(+), 304 deletions(-) create mode 100644 MySql.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.8.0.LinqService).sql create mode 100644 MySql.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.8.0.LinqService).sql create mode 100644 MySql.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.8.0).sql create mode 100644 MySql.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.8.0).sql create mode 100644 MySqlConnector.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.8.0.LinqService).sql create mode 100644 MySqlConnector.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.8.0.LinqService).sql create mode 100644 MySqlConnector.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.8.0).sql create mode 100644 MySqlConnector.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.8.0).sql diff --git a/MySql.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySql.8.0.LinqService).sql b/MySql.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySql.8.0.LinqService).sql index 52c26cf9e686..854935dd7d57 100644 --- a/MySql.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySql.8.0.LinqService).sql +++ b/MySql.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySql.8.0.LinqService).sql @@ -5,17 +5,11 @@ WITH `CTE_1` (`ParentID`) AS ( SELECT - `t1`.`ParentID` + `c_1`.`ParentID` FROM - ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` > 1 - ) `t1` + `Child` `c_1` + WHERE + `c_1`.`ParentID` > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM `Parent` `p` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` > 1 - ) `c_2` ON `p`.`ParentID` = `c_2`.`ParentID` - INNER JOIN ( - SELECT DISTINCT - `c2`.`ParentID`, - `c2`.`ChildID` - FROM - `Child` `c2` - WHERE - `c2`.`ParentID` > 1 - ) `c2_1` ON `p`.`ParentID` = `c2_1`.`ParentID` + INNER JOIN `Child` `c_1` ON `p`.`ParentID` = `c_1`.`ParentID` + INNER JOIN `Child` `c2` ON `p`.`ParentID` = `c2`.`ParentID` +WHERE + `c_1`.`ParentID` > 1 AND `c2`.`ParentID` > 1 diff --git a/MySql.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySql.8.0.LinqService).sql b/MySql.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySql.8.0.LinqService).sql index d87707de55d9..367acdeb6cf8 100644 --- a/MySql.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySql.8.0.LinqService).sql +++ b/MySql.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySql.8.0.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- MySql.8.0 MySql.8.0.MySql.Data MySql80 (asynchronously) -WITH `CTE_1` AS +WITH `CTE_1` (`c1`) +AS ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` + SELECT + 1 FROM `Child` `c_1` WHERE diff --git a/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.8.0.LinqService).sql b/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.8.0.LinqService).sql index add64ee19b73..9d6a7bc05b82 100644 --- a/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.8.0.LinqService).sql +++ b/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.8.0.LinqService).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `o`.`ParentID` = `c_1`.`ParentID` - ) `c_2` ON 1=1 + INNER JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.8.0.LinqService).sql b/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.8.0.LinqService).sql index 0e0e7f4c6c70..e0c65cf25611 100644 --- a/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.8.0.LinqService).sql +++ b/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.8.0.LinqService).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` = `o`.`ParentID` - ) `c_2` ON 1=1 + INNER JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.8.0.LinqService).sql b/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.8.0.LinqService).sql index 44381332bc24..b7958c2eeb67 100644 --- a/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.8.0.LinqService).sql +++ b/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.8.0.LinqService).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `o`.`ParentID` = `c_1`.`ParentID` - ) `c_2` ON 1=1 + LEFT JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.8.0.LinqService).sql b/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.8.0.LinqService).sql index 03b3f4ee2114..733f01e4ba59 100644 --- a/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.8.0.LinqService).sql +++ b/MySql.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.8.0.LinqService).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` = `o`.`ParentID` - ) `c_2` ON 1=1 + LEFT JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySql.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.8.0.LinqService).sql b/MySql.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.8.0.LinqService).sql new file mode 100644 index 000000000000..2ebb483c7715 --- /dev/null +++ b/MySql.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.8.0.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- MySql.8.0 MySql.8.0.MySql.Data MySql80 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySql.8.0 MySql.8.0.MySql.Data MySql80 (asynchronously) + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySql.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.8.0.LinqService).sql b/MySql.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.8.0.LinqService).sql new file mode 100644 index 000000000000..154fcee39ba0 --- /dev/null +++ b/MySql.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.8.0.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- MySql.8.0 MySql.8.0.MySql.Data MySql80 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName`, + `r`.`FirstName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySql.8.0 MySql.8.0.MySql.Data MySql80 (asynchronously) + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySql.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySql.8.0).sql b/MySql.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySql.8.0).sql index 91703b045add..88025bb14ad5 100644 --- a/MySql.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySql.8.0).sql +++ b/MySql.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySql.8.0).sql @@ -5,17 +5,11 @@ WITH `CTE_1` (`ParentID`) AS ( SELECT - `t1`.`ParentID` + `c_1`.`ParentID` FROM - ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` > 1 - ) `t1` + `Child` `c_1` + WHERE + `c_1`.`ParentID` > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM `Parent` `p` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` > 1 - ) `c_2` ON `p`.`ParentID` = `c_2`.`ParentID` - INNER JOIN ( - SELECT DISTINCT - `c2`.`ParentID`, - `c2`.`ChildID` - FROM - `Child` `c2` - WHERE - `c2`.`ParentID` > 1 - ) `c2_1` ON `p`.`ParentID` = `c2_1`.`ParentID` + INNER JOIN `Child` `c_1` ON `p`.`ParentID` = `c_1`.`ParentID` + INNER JOIN `Child` `c2` ON `p`.`ParentID` = `c2`.`ParentID` +WHERE + `c_1`.`ParentID` > 1 AND `c2`.`ParentID` > 1 diff --git a/MySql.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySql.8.0).sql b/MySql.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySql.8.0).sql index 670882e959a4..c708fb13f47e 100644 --- a/MySql.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySql.8.0).sql +++ b/MySql.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySql.8.0).sql @@ -1,11 +1,11 @@ BeforeExecute -- MySql.8.0 MySql.8.0.MySql.Data MySql80 -WITH `CTE_1` AS +WITH `CTE_1` (`c1`) +AS ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` + SELECT + 1 FROM `Child` `c_1` WHERE diff --git a/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.8.0).sql b/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.8.0).sql index c13f359d4ddd..bcd4ef0130e9 100644 --- a/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.8.0).sql +++ b/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.8.0).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `o`.`ParentID` = `c_1`.`ParentID` - ) `c_2` ON 1=1 + INNER JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.8.0).sql b/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.8.0).sql index 62fc29d960bf..9053005d904c 100644 --- a/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.8.0).sql +++ b/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.8.0).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` = `o`.`ParentID` - ) `c_2` ON 1=1 + INNER JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.8.0).sql b/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.8.0).sql index 53205940335c..35a46be905ae 100644 --- a/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.8.0).sql +++ b/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.8.0).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `o`.`ParentID` = `c_1`.`ParentID` - ) `c_2` ON 1=1 + LEFT JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.8.0).sql b/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.8.0).sql index 746fc7583698..0bc84d97a7a7 100644 --- a/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.8.0).sql +++ b/MySql.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.8.0).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` = `o`.`ParentID` - ) `c_2` ON 1=1 + LEFT JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySql.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.8.0).sql b/MySql.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.8.0).sql new file mode 100644 index 000000000000..168170876d12 --- /dev/null +++ b/MySql.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.8.0).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- MySql.8.0 MySql.8.0.MySql.Data MySql80 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySql.8.0 MySql.8.0.MySql.Data MySql80 + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySql.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.8.0).sql b/MySql.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.8.0).sql new file mode 100644 index 000000000000..fa334301a191 --- /dev/null +++ b/MySql.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.8.0).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- MySql.8.0 MySql.8.0.MySql.Data MySql80 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName`, + `r`.`FirstName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySql.8.0 MySql.8.0.MySql.Data MySql80 + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySqlConnector.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySqlConnector.8.0.LinqService).sql b/MySqlConnector.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySqlConnector.8.0.LinqService).sql index f3e58c0e6c44..89071a53bc87 100644 --- a/MySqlConnector.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySqlConnector.8.0.LinqService).sql +++ b/MySqlConnector.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySqlConnector.8.0.LinqService).sql @@ -5,17 +5,11 @@ WITH `CTE_1` (`ParentID`) AS ( SELECT - `t1`.`ParentID` + `c_1`.`ParentID` FROM - ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` > 1 - ) `t1` + `Child` `c_1` + WHERE + `c_1`.`ParentID` > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM `Parent` `p` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` > 1 - ) `c_2` ON `p`.`ParentID` = `c_2`.`ParentID` - INNER JOIN ( - SELECT DISTINCT - `c2`.`ParentID`, - `c2`.`ChildID` - FROM - `Child` `c2` - WHERE - `c2`.`ParentID` > 1 - ) `c2_1` ON `p`.`ParentID` = `c2_1`.`ParentID` + INNER JOIN `Child` `c_1` ON `p`.`ParentID` = `c_1`.`ParentID` + INNER JOIN `Child` `c2` ON `p`.`ParentID` = `c2`.`ParentID` +WHERE + `c_1`.`ParentID` > 1 AND `c2`.`ParentID` > 1 diff --git a/MySqlConnector.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySqlConnector.8.0.LinqService).sql b/MySqlConnector.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySqlConnector.8.0.LinqService).sql index ee375531f52d..76e9639867b1 100644 --- a/MySqlConnector.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySqlConnector.8.0.LinqService).sql +++ b/MySqlConnector.8.0.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySqlConnector.8.0.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- MySqlConnector.8.0 MySql.8.0.MySqlConnector MySql80 (asynchronously) -WITH `CTE_1` AS +WITH `CTE_1` (`c1`) +AS ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` + SELECT + 1 FROM `Child` `c_1` WHERE diff --git a/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.8.0.LinqService).sql b/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.8.0.LinqService).sql index e3f21363e047..c400127c9af1 100644 --- a/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.8.0.LinqService).sql +++ b/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.8.0.LinqService).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `o`.`ParentID` = `c_1`.`ParentID` - ) `c_2` ON 1=1 + INNER JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.8.0.LinqService).sql b/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.8.0.LinqService).sql index 2638de861b70..702fb0ba9bd3 100644 --- a/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.8.0.LinqService).sql +++ b/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.8.0.LinqService).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` = `o`.`ParentID` - ) `c_2` ON 1=1 + INNER JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.8.0.LinqService).sql b/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.8.0.LinqService).sql index 4b80421703e8..5d8e4e53cfc3 100644 --- a/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.8.0.LinqService).sql +++ b/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.8.0.LinqService).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `o`.`ParentID` = `c_1`.`ParentID` - ) `c_2` ON 1=1 + LEFT JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.8.0.LinqService).sql b/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.8.0.LinqService).sql index 6880b5f462b8..ef2bcf07b6b8 100644 --- a/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.8.0.LinqService).sql +++ b/MySqlConnector.8.0.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.8.0.LinqService).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` = `o`.`ParentID` - ) `c_2` ON 1=1 + LEFT JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySqlConnector.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.8.0.LinqService).sql b/MySqlConnector.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.8.0.LinqService).sql new file mode 100644 index 000000000000..99aa05caa37a --- /dev/null +++ b/MySqlConnector.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.8.0.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- MySqlConnector.8.0 MySql.8.0.MySqlConnector MySql80 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySqlConnector.8.0 MySql.8.0.MySqlConnector MySql80 (asynchronously) + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySqlConnector.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.8.0.LinqService).sql b/MySqlConnector.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.8.0.LinqService).sql new file mode 100644 index 000000000000..aeb0fdaaae45 --- /dev/null +++ b/MySqlConnector.8.0.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.8.0.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- MySqlConnector.8.0 MySql.8.0.MySqlConnector MySql80 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName`, + `r`.`FirstName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySqlConnector.8.0 MySql.8.0.MySqlConnector MySql80 (asynchronously) + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySqlConnector.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySqlConnector.8.0).sql b/MySqlConnector.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySqlConnector.8.0).sql index 8c7c4a5d95e7..7c6c9561fcd7 100644 --- a/MySqlConnector.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySqlConnector.8.0).sql +++ b/MySqlConnector.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(MySqlConnector.8.0).sql @@ -5,17 +5,11 @@ WITH `CTE_1` (`ParentID`) AS ( SELECT - `t1`.`ParentID` + `c_1`.`ParentID` FROM - ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` > 1 - ) `t1` + `Child` `c_1` + WHERE + `c_1`.`ParentID` > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM `Parent` `p` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` > 1 - ) `c_2` ON `p`.`ParentID` = `c_2`.`ParentID` - INNER JOIN ( - SELECT DISTINCT - `c2`.`ParentID`, - `c2`.`ChildID` - FROM - `Child` `c2` - WHERE - `c2`.`ParentID` > 1 - ) `c2_1` ON `p`.`ParentID` = `c2_1`.`ParentID` + INNER JOIN `Child` `c_1` ON `p`.`ParentID` = `c_1`.`ParentID` + INNER JOIN `Child` `c2` ON `p`.`ParentID` = `c2`.`ParentID` +WHERE + `c_1`.`ParentID` > 1 AND `c2`.`ParentID` > 1 diff --git a/MySqlConnector.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySqlConnector.8.0).sql b/MySqlConnector.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySqlConnector.8.0).sql index 15339a809e50..5932f208f75f 100644 --- a/MySqlConnector.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySqlConnector.8.0).sql +++ b/MySqlConnector.8.0/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(MySqlConnector.8.0).sql @@ -1,11 +1,11 @@ BeforeExecute -- MySqlConnector.8.0 MySql.8.0.MySqlConnector MySql80 -WITH `CTE_1` AS +WITH `CTE_1` (`c1`) +AS ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` + SELECT + 1 FROM `Child` `c_1` WHERE diff --git a/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.8.0).sql b/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.8.0).sql index 5381ec6e9c45..51528afac3ab 100644 --- a/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.8.0).sql +++ b/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.8.0).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `o`.`ParentID` = `c_1`.`ParentID` - ) `c_2` ON 1=1 + INNER JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.8.0).sql b/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.8.0).sql index 7464e67356f6..97d6c6c9db27 100644 --- a/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.8.0).sql +++ b/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.8.0).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` = `o`.`ParentID` - ) `c_2` ON 1=1 + INNER JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.8.0).sql b/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.8.0).sql index 143bcbfdc1db..eee0ea16cac4 100644 --- a/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.8.0).sql +++ b/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.8.0).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `o`.`ParentID` = `c_1`.`ParentID` - ) `c_2` ON 1=1 + LEFT JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.8.0).sql b/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.8.0).sql index 767390e04eb9..cdf56283bdc7 100644 --- a/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.8.0).sql +++ b/MySqlConnector.8.0/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.8.0).sql @@ -4,17 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN LATERAL ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - WHERE - `c_1`.`ParentID` = `o`.`ParentID` - ) `c_2` ON 1=1 + LEFT JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySqlConnector.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.8.0).sql b/MySqlConnector.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.8.0).sql new file mode 100644 index 000000000000..59d4a6f72ce8 --- /dev/null +++ b/MySqlConnector.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.8.0).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- MySqlConnector.8.0 MySql.8.0.MySqlConnector MySql80 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySqlConnector.8.0 MySql.8.0.MySqlConnector MySql80 + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySqlConnector.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.8.0).sql b/MySqlConnector.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.8.0).sql new file mode 100644 index 000000000000..b51977f4bb12 --- /dev/null +++ b/MySqlConnector.8.0/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.8.0).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- MySqlConnector.8.0 MySql.8.0.MySqlConnector MySql80 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName`, + `r`.`FirstName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySqlConnector.8.0 MySql.8.0.MySqlConnector MySql80 + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + From 1594d4056dc9ca5deb065fe853fb3baaee60fb01 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 16:56:51 +0000 Subject: [PATCH 23/42] [Linux / MySQL 5.7 (both providers)] baselines --- ...nerJoinDistinct(MySql.5.7.LinqService).sql | 12 ++------ ...inDistinctWhere(MySql.5.7.LinqService).sql | 12 ++------ ...eftJoinDistinct(MySql.5.7.LinqService).sql | 12 ++------ ...inDistinctWhere(MySql.5.7.LinqService).sql | 12 ++------ ...rByDistinctAll1(MySql.5.7.LinqService).sql | 28 ++++++++++++++++++ ...rByDistinctAll2(MySql.5.7.LinqService).sql | 29 +++++++++++++++++++ ...itedTests.InnerJoinDistinct(MySql.5.7).sql | 12 ++------ ...ests.InnerJoinDistinctWhere(MySql.5.7).sql | 12 ++------ ...mitedTests.LeftJoinDistinct(MySql.5.7).sql | 12 ++------ ...Tests.LeftJoinDistinctWhere(MySql.5.7).sql | 12 ++------ ...ctTests.OrderByDistinctAll1(MySql.5.7).sql | 28 ++++++++++++++++++ ...ctTests.OrderByDistinctAll2(MySql.5.7).sql | 29 +++++++++++++++++++ ...stinct(MySqlConnector.5.7.LinqService).sql | 12 ++------ ...tWhere(MySqlConnector.5.7.LinqService).sql | 12 ++------ ...stinct(MySqlConnector.5.7.LinqService).sql | 12 ++------ ...tWhere(MySqlConnector.5.7.LinqService).sql | 12 ++------ ...ctAll1(MySqlConnector.5.7.LinqService).sql | 28 ++++++++++++++++++ ...ctAll2(MySqlConnector.5.7.LinqService).sql | 29 +++++++++++++++++++ ....InnerJoinDistinct(MySqlConnector.5.7).sql | 12 ++------ ...rJoinDistinctWhere(MySqlConnector.5.7).sql | 12 ++------ ...s.LeftJoinDistinct(MySqlConnector.5.7).sql | 12 ++------ ...tJoinDistinctWhere(MySqlConnector.5.7).sql | 12 ++------ ...rderByDistinctAll1(MySqlConnector.5.7).sql | 28 ++++++++++++++++++ ...rderByDistinctAll2(MySqlConnector.5.7).sql | 29 +++++++++++++++++++ 24 files changed, 276 insertions(+), 144 deletions(-) create mode 100644 MySql.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.5.7.LinqService).sql create mode 100644 MySql.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.5.7.LinqService).sql create mode 100644 MySql.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.5.7).sql create mode 100644 MySql.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.5.7).sql create mode 100644 MySqlConnector.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.5.7.LinqService).sql create mode 100644 MySqlConnector.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.5.7.LinqService).sql create mode 100644 MySqlConnector.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.5.7).sql create mode 100644 MySqlConnector.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.5.7).sql diff --git a/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.5.7.LinqService).sql b/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.5.7.LinqService).sql index 70da84af41cd..23f66aaccd07 100644 --- a/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.5.7.LinqService).sql +++ b/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.5.7.LinqService).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `o`.`ParentID` = `c_2`.`ParentID` + INNER JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.5.7.LinqService).sql b/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.5.7.LinqService).sql index 966d7caa7245..7ace2692c3a2 100644 --- a/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.5.7.LinqService).sql +++ b/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.5.7.LinqService).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `c_2`.`ParentID` = `o`.`ParentID` + INNER JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.5.7.LinqService).sql b/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.5.7.LinqService).sql index 811793a6a1fa..a3bc57432dda 100644 --- a/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.5.7.LinqService).sql +++ b/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.5.7.LinqService).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `o`.`ParentID` = `c_2`.`ParentID` + LEFT JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.5.7.LinqService).sql b/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.5.7.LinqService).sql index bde9f1c80fc2..e7595e05b905 100644 --- a/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.5.7.LinqService).sql +++ b/MySql.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.5.7.LinqService).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `c_2`.`ParentID` = `o`.`ParentID` + LEFT JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySql.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.5.7.LinqService).sql b/MySql.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.5.7.LinqService).sql new file mode 100644 index 000000000000..9f999b2c28f7 --- /dev/null +++ b/MySql.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.5.7.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- MySql.5.7 MySql.5.7.MySql.Data MySql57 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySql.5.7 MySql.5.7.MySql.Data MySql57 (asynchronously) + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySql.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.5.7.LinqService).sql b/MySql.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.5.7.LinqService).sql new file mode 100644 index 000000000000..e8d97706fc24 --- /dev/null +++ b/MySql.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.5.7.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- MySql.5.7 MySql.5.7.MySql.Data MySql57 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName`, + `r`.`FirstName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySql.5.7 MySql.5.7.MySql.Data MySql57 (asynchronously) + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.5.7).sql b/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.5.7).sql index 5c09854c8a96..9a39d92b9314 100644 --- a/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.5.7).sql +++ b/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySql.5.7).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `o`.`ParentID` = `c_2`.`ParentID` + INNER JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.5.7).sql b/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.5.7).sql index 50652cca1fa8..5b67fb41b0a4 100644 --- a/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.5.7).sql +++ b/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySql.5.7).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `c_2`.`ParentID` = `o`.`ParentID` + INNER JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.5.7).sql b/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.5.7).sql index d7c971303423..dfe824aea7db 100644 --- a/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.5.7).sql +++ b/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySql.5.7).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `o`.`ParentID` = `c_2`.`ParentID` + LEFT JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.5.7).sql b/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.5.7).sql index 29baf9f30fea..177acbf5d0dc 100644 --- a/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.5.7).sql +++ b/MySql.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySql.5.7).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `c_2`.`ParentID` = `o`.`ParentID` + LEFT JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySql.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.5.7).sql b/MySql.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.5.7).sql new file mode 100644 index 000000000000..0ba9624dfdc1 --- /dev/null +++ b/MySql.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySql.5.7).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- MySql.5.7 MySql.5.7.MySql.Data MySql57 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySql.5.7 MySql.5.7.MySql.Data MySql57 + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySql.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.5.7).sql b/MySql.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.5.7).sql new file mode 100644 index 000000000000..58941549a0af --- /dev/null +++ b/MySql.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySql.5.7).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- MySql.5.7 MySql.5.7.MySql.Data MySql57 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName`, + `r`.`FirstName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySql.5.7 MySql.5.7.MySql.Data MySql57 + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.5.7.LinqService).sql b/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.5.7.LinqService).sql index 782374bcd3cf..556d1a036817 100644 --- a/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.5.7.LinqService).sql +++ b/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.5.7.LinqService).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `o`.`ParentID` = `c_2`.`ParentID` + INNER JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.5.7.LinqService).sql b/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.5.7.LinqService).sql index 63fbb5b62fa9..2b0bba5ad2ba 100644 --- a/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.5.7.LinqService).sql +++ b/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.5.7.LinqService).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `c_2`.`ParentID` = `o`.`ParentID` + INNER JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.5.7.LinqService).sql b/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.5.7.LinqService).sql index f43eb3a7825c..b51b88b2df31 100644 --- a/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.5.7.LinqService).sql +++ b/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.5.7.LinqService).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `o`.`ParentID` = `c_2`.`ParentID` + LEFT JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.5.7.LinqService).sql b/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.5.7.LinqService).sql index aff337107941..9230561e84f3 100644 --- a/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.5.7.LinqService).sql +++ b/MySqlConnector.5.7.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.5.7.LinqService).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `c_2`.`ParentID` = `o`.`ParentID` + LEFT JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySqlConnector.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.5.7.LinqService).sql b/MySqlConnector.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.5.7.LinqService).sql new file mode 100644 index 000000000000..e20ef69bc4da --- /dev/null +++ b/MySqlConnector.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.5.7.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- MySqlConnector.5.7 MySql.5.7.MySqlConnector MySql57 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySqlConnector.5.7 MySql.5.7.MySqlConnector MySql57 (asynchronously) + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySqlConnector.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.5.7.LinqService).sql b/MySqlConnector.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.5.7.LinqService).sql new file mode 100644 index 000000000000..af86b278c9fc --- /dev/null +++ b/MySqlConnector.5.7.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.5.7.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- MySqlConnector.5.7 MySql.5.7.MySqlConnector MySql57 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName`, + `r`.`FirstName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySqlConnector.5.7 MySql.5.7.MySqlConnector MySql57 (asynchronously) + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.5.7).sql b/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.5.7).sql index a0dbe7a3e70a..7652d395b73e 100644 --- a/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.5.7).sql +++ b/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(MySqlConnector.5.7).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `o`.`ParentID` = `c_2`.`ParentID` + INNER JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.5.7).sql b/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.5.7).sql index 8ceca93d016c..6a07377af23e 100644 --- a/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.5.7).sql +++ b/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(MySqlConnector.5.7).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - INNER JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `c_2`.`ParentID` = `o`.`ParentID` + INNER JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.5.7).sql b/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.5.7).sql index b2f65877e7bf..33cca8d05163 100644 --- a/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.5.7).sql +++ b/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(MySqlConnector.5.7).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `o`.`ParentID` = `c_2`.`ParentID` + LEFT JOIN `Child` `c_1` ON `o`.`ParentID` = `c_1`.`ParentID` diff --git a/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.5.7).sql b/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.5.7).sql index 5f0516eaafad..5c2bff0c476b 100644 --- a/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.5.7).sql +++ b/MySqlConnector.5.7/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(MySqlConnector.5.7).sql @@ -4,15 +4,9 @@ SELECT `o`.`ParentID`, `o`.`Value1`, - `c_2`.`ParentID`, - `c_2`.`ChildID` + `c_1`.`ParentID`, + `c_1`.`ChildID` FROM `Parent` `o` - LEFT JOIN ( - SELECT DISTINCT - `c_1`.`ParentID`, - `c_1`.`ChildID` - FROM - `Child` `c_1` - ) `c_2` ON `c_2`.`ParentID` = `o`.`ParentID` + LEFT JOIN `Child` `c_1` ON `c_1`.`ParentID` = `o`.`ParentID` diff --git a/MySqlConnector.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.5.7).sql b/MySqlConnector.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.5.7).sql new file mode 100644 index 000000000000..f4b8bd5809a9 --- /dev/null +++ b/MySqlConnector.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(MySqlConnector.5.7).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- MySqlConnector.5.7 MySql.5.7.MySqlConnector MySql57 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySqlConnector.5.7 MySql.5.7.MySqlConnector MySql57 + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + diff --git a/MySqlConnector.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.5.7).sql b/MySqlConnector.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.5.7).sql new file mode 100644 index 000000000000..8ad590ab809f --- /dev/null +++ b/MySqlConnector.5.7/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(MySqlConnector.5.7).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- MySqlConnector.5.7 MySql.5.7.MySqlConnector MySql57 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + `r`.`PersonID`, + `r`.`LastName`, + `r`.`FirstName` +FROM + `Person` `r` +ORDER BY + `r`.`FirstName` +LIMIT @skip, @take + +BeforeExecute +-- MySqlConnector.5.7 MySql.5.7.MySqlConnector MySql57 + +SELECT + `t1`.`FirstName`, + `t1`.`PersonID`, + `t1`.`LastName`, + `t1`.`MiddleName`, + `t1`.`Gender` +FROM + `Person` `t1` + From f29a2bcc21b1e8e900ea97846ab6b3f8a91a3177 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 18:59:20 +0200 Subject: [PATCH 24/42] [Linux / Oracle 11g XE] baselines --- ...s.Test5(Oracle.11.Managed.LinqService).sql | 36 +++----------- ...omCount(Oracle.11.Managed.LinqService).sql | 8 +-- ...istinct(Oracle.11.Managed.LinqService).sql | 12 ++--- ...ctWhere(Oracle.11.Managed.LinqService).sql | 12 ++--- ...istinct(Oracle.11.Managed.LinqService).sql | 12 ++--- ...ctWhere(Oracle.11.Managed.LinqService).sql | 12 ++--- ...nctAll1(Oracle.11.Managed.LinqService).sql | 44 +++++++++++++++++ ...nctAll2(Oracle.11.Managed.LinqService).sql | 49 +++++++++++++++++++ ...Linq.CteTests.Test5(Oracle.11.Managed).sql | 36 +++----------- ...sts.TestCustomCount(Oracle.11.Managed).sql | 8 +-- ...s.InnerJoinDistinct(Oracle.11.Managed).sql | 12 ++--- ...erJoinDistinctWhere(Oracle.11.Managed).sql | 12 ++--- ...ts.LeftJoinDistinct(Oracle.11.Managed).sql | 12 ++--- ...ftJoinDistinctWhere(Oracle.11.Managed).sql | 12 ++--- ...OrderByDistinctAll1(Oracle.11.Managed).sql | 44 +++++++++++++++++ ...OrderByDistinctAll2(Oracle.11.Managed).sql | 49 +++++++++++++++++++ 16 files changed, 234 insertions(+), 136 deletions(-) create mode 100644 Oracle.11.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.11.Managed.LinqService).sql create mode 100644 Oracle.11.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.11.Managed.LinqService).sql create mode 100644 Oracle.11.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.11.Managed).sql create mode 100644 Oracle.11.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.11.Managed).sql diff --git a/Oracle.11.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.11.Managed.LinqService).sql b/Oracle.11.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.11.Managed.LinqService).sql index 9e5b92d9ad7c..73d584fe7293 100644 --- a/Oracle.11.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.11.Managed.LinqService).sql +++ b/Oracle.11.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.11.Managed.LinqService).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/Oracle.11.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.11.Managed.LinqService).sql b/Oracle.11.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.11.Managed.LinqService).sql index 835cea46de67..e623246312a9 100644 --- a/Oracle.11.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.11.Managed.LinqService).sql +++ b/Oracle.11.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.11.Managed.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- Oracle.11.Managed Oracle11 (asynchronously) -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.11.Managed.LinqService).sql b/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.11.Managed.LinqService).sql index beb95abe84e7..9d543fe49975 100644 --- a/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.11.Managed.LinqService).sql +++ b/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.11.Managed.LinqService).sql @@ -4,15 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - ) c_2 ON o."ParentID" = c_2."ParentID" + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.11.Managed.LinqService).sql b/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.11.Managed.LinqService).sql index 294574832cd1..eb7794dd1396 100644 --- a/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.11.Managed.LinqService).sql +++ b/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.11.Managed.LinqService).sql @@ -4,15 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - ) c_2 ON c_2."ParentID" = o."ParentID" + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.11.Managed.LinqService).sql b/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.11.Managed.LinqService).sql index 1977d940788d..b36277c20cd5 100644 --- a/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.11.Managed.LinqService).sql +++ b/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.11.Managed.LinqService).sql @@ -4,15 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - ) c_2 ON o."ParentID" = c_2."ParentID" + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.11.Managed.LinqService).sql b/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.11.Managed.LinqService).sql index 527c6221530d..286f62773dad 100644 --- a/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.11.Managed.LinqService).sql +++ b/Oracle.11.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.11.Managed.LinqService).sql @@ -4,15 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - ) c_2 ON c_2."ParentID" = o."ParentID" + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.11.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.11.Managed.LinqService).sql b/Oracle.11.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.11.Managed.LinqService).sql new file mode 100644 index 000000000000..9a2d1be9cf91 --- /dev/null +++ b/Oracle.11.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.11.Managed.LinqService).sql @@ -0,0 +1,44 @@ +BeforeExecute +-- Oracle.11.Managed Oracle11 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + t2.ID, + t2."LastName" +FROM + ( + SELECT + t1.ID, + t1."LastName", + ROWNUM as RN + FROM + ( + SELECT + r."PersonID" as ID, + r."LastName" + FROM + "Person" r + ORDER BY + r."FirstName" + ) t1 + WHERE + ROWNUM <= (:skip + :take) + ) t2 +WHERE + t2.RN > :skip + +BeforeExecute +-- Oracle.11.Managed Oracle11 (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.11.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.11.Managed.LinqService).sql b/Oracle.11.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.11.Managed.LinqService).sql new file mode 100644 index 000000000000..6d1944156e2a --- /dev/null +++ b/Oracle.11.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.11.Managed.LinqService).sql @@ -0,0 +1,49 @@ +BeforeExecute +-- Oracle.11.Managed Oracle11 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + t2.ID, + t2."LastName", + t2."FirstName" +FROM + ( + SELECT + t1.ID, + t1."LastName", + t1."FirstName", + ROWNUM as RN + FROM + ( + SELECT + r."PersonID" as ID, + r."LastName", + r."FirstName" + FROM + "Person" r + ORDER BY + r."FirstName" + ) t1 + WHERE + ROWNUM <= (:skip + :take) + ) t2 +WHERE + t2.RN > :skip +ORDER BY + t2."FirstName" + +BeforeExecute +-- Oracle.11.Managed Oracle11 (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.11.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.11.Managed).sql b/Oracle.11.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.11.Managed).sql index c120ae8059fd..95a46b69c65c 100644 --- a/Oracle.11.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.11.Managed).sql +++ b/Oracle.11.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.11.Managed).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/Oracle.11.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.11.Managed).sql b/Oracle.11.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.11.Managed).sql index 74bcc4b3bfe0..c51b02a45f1d 100644 --- a/Oracle.11.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.11.Managed).sql +++ b/Oracle.11.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.11.Managed).sql @@ -1,11 +1,11 @@ BeforeExecute -- Oracle.11.Managed Oracle11 -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.11.Managed).sql b/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.11.Managed).sql index 321fd4969238..3546dc3817c7 100644 --- a/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.11.Managed).sql +++ b/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.11.Managed).sql @@ -4,15 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - ) c_2 ON o."ParentID" = c_2."ParentID" + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.11.Managed).sql b/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.11.Managed).sql index 5061dd1c2118..ee821b22862c 100644 --- a/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.11.Managed).sql +++ b/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.11.Managed).sql @@ -4,15 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - ) c_2 ON c_2."ParentID" = o."ParentID" + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.11.Managed).sql b/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.11.Managed).sql index 935184c29588..9a5136af23f2 100644 --- a/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.11.Managed).sql +++ b/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.11.Managed).sql @@ -4,15 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - ) c_2 ON o."ParentID" = c_2."ParentID" + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.11.Managed).sql b/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.11.Managed).sql index ff3a9fb14e59..0714e7ffce24 100644 --- a/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.11.Managed).sql +++ b/Oracle.11.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.11.Managed).sql @@ -4,15 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - ) c_2 ON c_2."ParentID" = o."ParentID" + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.11.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.11.Managed).sql b/Oracle.11.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.11.Managed).sql new file mode 100644 index 000000000000..920541af0d11 --- /dev/null +++ b/Oracle.11.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.11.Managed).sql @@ -0,0 +1,44 @@ +BeforeExecute +-- Oracle.11.Managed Oracle11 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + t2.ID, + t2."LastName" +FROM + ( + SELECT + t1.ID, + t1."LastName", + ROWNUM as RN + FROM + ( + SELECT + r."PersonID" as ID, + r."LastName" + FROM + "Person" r + ORDER BY + r."FirstName" + ) t1 + WHERE + ROWNUM <= (:skip + :take) + ) t2 +WHERE + t2.RN > :skip + +BeforeExecute +-- Oracle.11.Managed Oracle11 + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.11.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.11.Managed).sql b/Oracle.11.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.11.Managed).sql new file mode 100644 index 000000000000..7fceaf26a08d --- /dev/null +++ b/Oracle.11.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.11.Managed).sql @@ -0,0 +1,49 @@ +BeforeExecute +-- Oracle.11.Managed Oracle11 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + t2.ID, + t2."LastName", + t2."FirstName" +FROM + ( + SELECT + t1.ID, + t1."LastName", + t1."FirstName", + ROWNUM as RN + FROM + ( + SELECT + r."PersonID" as ID, + r."LastName", + r."FirstName" + FROM + "Person" r + ORDER BY + r."FirstName" + ) t1 + WHERE + ROWNUM <= (:skip + :take) + ) t2 +WHERE + t2.RN > :skip +ORDER BY + t2."FirstName" + +BeforeExecute +-- Oracle.11.Managed Oracle11 + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + From 8dd9f117e3255ca82dbae1fafc2daa48ea27ee06 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:02:57 +0000 Subject: [PATCH 25/42] [Windows / SQL Server 2022] baselines --- ...ests.Test5(SqlServer.2022.LinqService).sql | 36 +++++-------------- ...ustomCount(SqlServer.2022.LinqService).sql | 8 ++--- ...inDistinct(SqlServer.2022.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2022.LinqService).sql | 14 ++------ ...inDistinct(SqlServer.2022.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2022.LinqService).sql | 14 ++------ ...stinctAll1(SqlServer.2022.LinqService).sql | 28 +++++++++++++++ ...stinctAll2(SqlServer.2022.LinqService).sql | 29 +++++++++++++++ ...s.Test5(SqlServer.2022.MS.LinqService).sql | 36 +++++-------------- ...omCount(SqlServer.2022.MS.LinqService).sql | 8 ++--- ...istinct(SqlServer.2022.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2022.MS.LinqService).sql | 14 ++------ ...istinct(SqlServer.2022.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2022.MS.LinqService).sql | 14 ++------ ...nctAll1(SqlServer.2022.MS.LinqService).sql | 28 +++++++++++++++ ...nctAll2(SqlServer.2022.MS.LinqService).sql | 29 +++++++++++++++ ...Linq.CteTests.Test5(SqlServer.2022.MS).sql | 36 +++++-------------- ...sts.TestCustomCount(SqlServer.2022.MS).sql | 8 ++--- ...s.InnerJoinDistinct(SqlServer.2022.MS).sql | 14 ++------ ...erJoinDistinctWhere(SqlServer.2022.MS).sql | 14 ++------ ...ts.LeftJoinDistinct(SqlServer.2022.MS).sql | 14 ++------ ...ftJoinDistinctWhere(SqlServer.2022.MS).sql | 14 ++------ ...OrderByDistinctAll1(SqlServer.2022.MS).sql | 28 +++++++++++++++ ...OrderByDistinctAll2(SqlServer.2022.MS).sql | 29 +++++++++++++++ ...ts.Linq.CteTests.Test5(SqlServer.2022).sql | 36 +++++-------------- ...eTests.TestCustomCount(SqlServer.2022).sql | 8 ++--- ...ests.InnerJoinDistinct(SqlServer.2022).sql | 14 ++------ ...InnerJoinDistinctWhere(SqlServer.2022).sql | 14 ++------ ...Tests.LeftJoinDistinct(SqlServer.2022).sql | 14 ++------ ....LeftJoinDistinctWhere(SqlServer.2022).sql | 14 ++------ ...ts.OrderByDistinctAll1(SqlServer.2022).sql | 28 +++++++++++++++ ...ts.OrderByDistinctAll2(SqlServer.2022).sql | 29 +++++++++++++++ 32 files changed, 324 insertions(+), 304 deletions(-) create mode 100644 SqlServer.2022.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022.LinqService).sql create mode 100644 SqlServer.2022.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022.LinqService).sql create mode 100644 SqlServer.2022.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022.MS.LinqService).sql create mode 100644 SqlServer.2022.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022.MS.LinqService).sql create mode 100644 SqlServer.2022.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022.MS).sql create mode 100644 SqlServer.2022.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022.MS).sql create mode 100644 SqlServer.2022/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022).sql create mode 100644 SqlServer.2022/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022).sql diff --git a/SqlServer.2022.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022.LinqService).sql b/SqlServer.2022.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022.LinqService).sql index e799cb5e3c0f..656c92c24527 100644 --- a/SqlServer.2022.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022.LinqService).sql +++ b/SqlServer.2022.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2022.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022.LinqService).sql b/SqlServer.2022.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022.LinqService).sql index 6918d5caad6e..5cd46a9e09a1 100644 --- a/SqlServer.2022.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022.LinqService).sql +++ b/SqlServer.2022.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2022 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022.LinqService).sql b/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022.LinqService).sql index 3a5606c0614d..421188281612 100644 --- a/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022.LinqService).sql +++ b/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022.LinqService).sql b/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022.LinqService).sql index 46714767aea7..10b22d975aa2 100644 --- a/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022.LinqService).sql +++ b/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022.LinqService).sql b/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022.LinqService).sql index c2ff3fb998cf..5be8e067c76c 100644 --- a/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022.LinqService).sql +++ b/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022.LinqService).sql b/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022.LinqService).sql index cdad6c903ebf..61d3c01a994c 100644 --- a/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022.LinqService).sql +++ b/SqlServer.2022.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2022.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022.LinqService).sql b/SqlServer.2022.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022.LinqService).sql new file mode 100644 index 000000000000..5d452f994572 --- /dev/null +++ b/SqlServer.2022.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2022 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2022 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2022.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022.LinqService).sql b/SqlServer.2022.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022.LinqService).sql new file mode 100644 index 000000000000..cc3296fc3fc2 --- /dev/null +++ b/SqlServer.2022.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2022 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2022 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2022.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022.MS.LinqService).sql b/SqlServer.2022.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022.MS.LinqService).sql index 1c0ee648bc96..56cf734a4c79 100644 --- a/SqlServer.2022.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022.MS.LinqService).sql +++ b/SqlServer.2022.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022.MS.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2022.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022.MS.LinqService).sql b/SqlServer.2022.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022.MS.LinqService).sql index e2bbd91af3f5..22b8ace14628 100644 --- a/SqlServer.2022.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022.MS.LinqService).sql +++ b/SqlServer.2022.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022.MS.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2022.MS SqlServer.2022 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022.MS.LinqService).sql b/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022.MS.LinqService).sql index 15da66343fd1..20afef2c4daa 100644 --- a/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022.MS.LinqService).sql +++ b/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022.MS.LinqService).sql b/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022.MS.LinqService).sql index e48ee97be64d..b11703208f65 100644 --- a/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022.MS.LinqService).sql +++ b/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022.MS.LinqService).sql b/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022.MS.LinqService).sql index b8b3517c0d41..d10014be0c9a 100644 --- a/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022.MS.LinqService).sql +++ b/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022.MS.LinqService).sql b/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022.MS.LinqService).sql index e083559f1dde..50e822cbb535 100644 --- a/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022.MS.LinqService).sql +++ b/SqlServer.2022.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2022.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022.MS.LinqService).sql b/SqlServer.2022.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022.MS.LinqService).sql new file mode 100644 index 000000000000..d7aa309612bd --- /dev/null +++ b/SqlServer.2022.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022.MS.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2022.MS SqlServer.2022 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2022.MS SqlServer.2022 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2022.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022.MS.LinqService).sql b/SqlServer.2022.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022.MS.LinqService).sql new file mode 100644 index 000000000000..e3010758b4c7 --- /dev/null +++ b/SqlServer.2022.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022.MS.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2022.MS SqlServer.2022 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2022.MS SqlServer.2022 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2022.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022.MS).sql b/SqlServer.2022.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022.MS).sql index 5ae67df8f7f4..f35def90bf12 100644 --- a/SqlServer.2022.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022.MS).sql +++ b/SqlServer.2022.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022.MS).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2022.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022.MS).sql b/SqlServer.2022.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022.MS).sql index 8c548febec53..ff9854f4d06c 100644 --- a/SqlServer.2022.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022.MS).sql +++ b/SqlServer.2022.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022.MS).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2022.MS SqlServer.2022 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022.MS).sql b/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022.MS).sql index 297f3f05f270..edaf69c3cc6f 100644 --- a/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022.MS).sql +++ b/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022.MS).sql b/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022.MS).sql index 217299b6adb9..42a05baa8c79 100644 --- a/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022.MS).sql +++ b/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022.MS).sql b/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022.MS).sql index c1df042cb74f..2dea08740866 100644 --- a/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022.MS).sql +++ b/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022.MS).sql b/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022.MS).sql index de13ed3d7866..643a2c815903 100644 --- a/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022.MS).sql +++ b/SqlServer.2022.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2022.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022.MS).sql b/SqlServer.2022.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022.MS).sql new file mode 100644 index 000000000000..b93bf43cc0c6 --- /dev/null +++ b/SqlServer.2022.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022.MS).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2022.MS SqlServer.2022 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2022.MS SqlServer.2022 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2022.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022.MS).sql b/SqlServer.2022.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022.MS).sql new file mode 100644 index 000000000000..5d72a6798f11 --- /dev/null +++ b/SqlServer.2022.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022.MS).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2022.MS SqlServer.2022 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2022.MS SqlServer.2022 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2022/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022).sql b/SqlServer.2022/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022).sql index d7a3133f263a..164adfc0a353 100644 --- a/SqlServer.2022/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022).sql +++ b/SqlServer.2022/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2022).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2022/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022).sql b/SqlServer.2022/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022).sql index 9e0f4a3acdea..9d424b1a52da 100644 --- a/SqlServer.2022/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022).sql +++ b/SqlServer.2022/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2022).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2022 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022).sql b/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022).sql index ab90db0bf71c..3bfa95601306 100644 --- a/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022).sql +++ b/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2022).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022).sql b/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022).sql index 6cef525109ef..7c34c8ff4b37 100644 --- a/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022).sql +++ b/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2022).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022).sql b/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022).sql index 53e4a625fa09..2632994e1639 100644 --- a/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022).sql +++ b/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2022).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022).sql b/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022).sql index a53249f17ea2..b21f3eac1aa8 100644 --- a/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022).sql +++ b/SqlServer.2022/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2022).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2022/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022).sql b/SqlServer.2022/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022).sql new file mode 100644 index 000000000000..ccd45a5bbea4 --- /dev/null +++ b/SqlServer.2022/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2022).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2022 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2022 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2022/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022).sql b/SqlServer.2022/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022).sql new file mode 100644 index 000000000000..93aa94e2493d --- /dev/null +++ b/SqlServer.2022/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2022).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2022 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2022 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From f6d05e77df6357583362398527d635bcf464f0df Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:03:38 +0000 Subject: [PATCH 26/42] [Linux / PostgreSQL 13] baselines --- ...Tests.Test5(PostgreSQL.13.LinqService).sql | 36 +++++-------------- ...CustomCount(PostgreSQL.13.LinqService).sql | 8 ++--- ...oinDistinct(PostgreSQL.13.LinqService).sql | 14 ++------ ...stinctWhere(PostgreSQL.13.LinqService).sql | 14 ++------ ...oinDistinct(PostgreSQL.13.LinqService).sql | 14 ++------ ...stinctWhere(PostgreSQL.13.LinqService).sql | 14 ++------ ...istinctAll1(PostgreSQL.13.LinqService).sql | 28 +++++++++++++++ ...istinctAll2(PostgreSQL.13.LinqService).sql | 29 +++++++++++++++ ...sts.Linq.CteTests.Test5(PostgreSQL.13).sql | 36 +++++-------------- ...teTests.TestCustomCount(PostgreSQL.13).sql | 8 ++--- ...Tests.InnerJoinDistinct(PostgreSQL.13).sql | 14 ++------ ....InnerJoinDistinctWhere(PostgreSQL.13).sql | 14 ++------ ...dTests.LeftJoinDistinct(PostgreSQL.13).sql | 14 ++------ ...s.LeftJoinDistinctWhere(PostgreSQL.13).sql | 14 ++------ ...sts.OrderByDistinctAll1(PostgreSQL.13).sql | 28 +++++++++++++++ ...sts.OrderByDistinctAll2(PostgreSQL.13).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 PostgreSQL.13.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.13.LinqService).sql create mode 100644 PostgreSQL.13.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.13.LinqService).sql create mode 100644 PostgreSQL.13/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.13).sql create mode 100644 PostgreSQL.13/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.13).sql diff --git a/PostgreSQL.13.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.13.LinqService).sql b/PostgreSQL.13.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.13.LinqService).sql index 5cc3e73313e9..e55c70c3bb51 100644 --- a/PostgreSQL.13.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.13.LinqService).sql +++ b/PostgreSQL.13.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.13.LinqService).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/PostgreSQL.13.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.13.LinqService).sql b/PostgreSQL.13.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.13.LinqService).sql index 439efebf312f..de371dc3ceca 100644 --- a/PostgreSQL.13.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.13.LinqService).sql +++ b/PostgreSQL.13.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.13.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- PostgreSQL.13 PostgreSQL.9.5 PostgreSQL (asynchronously) -WITH "CTE_1" AS +WITH "CTE_1" (c1) +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.13.LinqService).sql b/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.13.LinqService).sql index 835ddbb376ff..9286d580a471 100644 --- a/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.13.LinqService).sql +++ b/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.13.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.13.LinqService).sql b/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.13.LinqService).sql index 492e8ed4366f..71819ce398d8 100644 --- a/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.13.LinqService).sql +++ b/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.13.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.13.LinqService).sql b/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.13.LinqService).sql index 01e975d478db..094209d8be65 100644 --- a/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.13.LinqService).sql +++ b/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.13.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.13.LinqService).sql b/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.13.LinqService).sql index 2e375dd2255a..b14434371dd9 100644 --- a/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.13.LinqService).sql +++ b/PostgreSQL.13.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.13.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.13.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.13.LinqService).sql b/PostgreSQL.13.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.13.LinqService).sql new file mode 100644 index 000000000000..f01bc421cbb7 --- /dev/null +++ b/PostgreSQL.13.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.13.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- PostgreSQL.13 PostgreSQL.9.5 PostgreSQL (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.13 PostgreSQL.9.5 PostgreSQL (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.13.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.13.LinqService).sql b/PostgreSQL.13.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.13.LinqService).sql new file mode 100644 index 000000000000..25d2240c6747 --- /dev/null +++ b/PostgreSQL.13.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.13.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- PostgreSQL.13 PostgreSQL.9.5 PostgreSQL (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.13 PostgreSQL.9.5 PostgreSQL (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.13/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.13).sql b/PostgreSQL.13/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.13).sql index ae7bb8226b14..da380ed34f27 100644 --- a/PostgreSQL.13/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.13).sql +++ b/PostgreSQL.13/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.13).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/PostgreSQL.13/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.13).sql b/PostgreSQL.13/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.13).sql index c6bc1ed521c2..2b3b5e42d23c 100644 --- a/PostgreSQL.13/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.13).sql +++ b/PostgreSQL.13/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.13).sql @@ -1,11 +1,11 @@ BeforeExecute -- PostgreSQL.13 PostgreSQL.9.5 PostgreSQL -WITH "CTE_1" AS +WITH "CTE_1" (c1) +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.13).sql b/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.13).sql index 7ca125e66d98..b479328e6a6b 100644 --- a/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.13).sql +++ b/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.13).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.13).sql b/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.13).sql index 341a990b9cc2..ac8a2f908ed0 100644 --- a/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.13).sql +++ b/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.13).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.13).sql b/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.13).sql index 02fa9fcabe9d..850e457ba109 100644 --- a/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.13).sql +++ b/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.13).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.13).sql b/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.13).sql index aa5b589f2cec..8020b7b60063 100644 --- a/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.13).sql +++ b/PostgreSQL.13/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.13).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.13/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.13).sql b/PostgreSQL.13/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.13).sql new file mode 100644 index 000000000000..3fc5048c328d --- /dev/null +++ b/PostgreSQL.13/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.13).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- PostgreSQL.13 PostgreSQL.9.5 PostgreSQL +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.13 PostgreSQL.9.5 PostgreSQL + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.13/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.13).sql b/PostgreSQL.13/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.13).sql new file mode 100644 index 000000000000..73f588560993 --- /dev/null +++ b/PostgreSQL.13/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.13).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- PostgreSQL.13 PostgreSQL.9.5 PostgreSQL +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.13 PostgreSQL.9.5 PostgreSQL + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + From d8b416569ac477a8c173f4442c37b50f0154c72e Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 19:06:07 +0200 Subject: [PATCH 27/42] [Linux / Oracle 18c] baselines --- ...s.Test5(Oracle.18.Managed.LinqService).sql | 36 +++++-------------- ...omCount(Oracle.18.Managed.LinqService).sql | 8 ++--- ...istinct(Oracle.18.Managed.LinqService).sql | 14 ++------ ...ctWhere(Oracle.18.Managed.LinqService).sql | 14 ++------ ...istinct(Oracle.18.Managed.LinqService).sql | 14 ++------ ...ctWhere(Oracle.18.Managed.LinqService).sql | 14 ++------ ...nctAll1(Oracle.18.Managed.LinqService).sql | 28 +++++++++++++++ ...nctAll2(Oracle.18.Managed.LinqService).sql | 29 +++++++++++++++ ...Linq.CteTests.Test5(Oracle.18.Managed).sql | 36 +++++-------------- ...sts.TestCustomCount(Oracle.18.Managed).sql | 8 ++--- ...s.InnerJoinDistinct(Oracle.18.Managed).sql | 14 ++------ ...erJoinDistinctWhere(Oracle.18.Managed).sql | 14 ++------ ...ts.LeftJoinDistinct(Oracle.18.Managed).sql | 14 ++------ ...ftJoinDistinctWhere(Oracle.18.Managed).sql | 14 ++------ ...OrderByDistinctAll1(Oracle.18.Managed).sql | 28 +++++++++++++++ ...OrderByDistinctAll2(Oracle.18.Managed).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 Oracle.18.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.18.Managed.LinqService).sql create mode 100644 Oracle.18.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.18.Managed.LinqService).sql create mode 100644 Oracle.18.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.18.Managed).sql create mode 100644 Oracle.18.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.18.Managed).sql diff --git a/Oracle.18.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.18.Managed.LinqService).sql b/Oracle.18.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.18.Managed.LinqService).sql index 7b0ee135ab46..97d6d9174cb5 100644 --- a/Oracle.18.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.18.Managed.LinqService).sql +++ b/Oracle.18.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.18.Managed.LinqService).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/Oracle.18.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.18.Managed.LinqService).sql b/Oracle.18.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.18.Managed.LinqService).sql index 57289e00cafb..0ab017097498 100644 --- a/Oracle.18.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.18.Managed.LinqService).sql +++ b/Oracle.18.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.18.Managed.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- Oracle.18.Managed Oracle.Managed Oracle12 (asynchronously) -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.18.Managed.LinqService).sql b/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.18.Managed.LinqService).sql index 86f2e425667b..bd8cff44c09f 100644 --- a/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.18.Managed.LinqService).sql +++ b/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.18.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.18.Managed.LinqService).sql b/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.18.Managed.LinqService).sql index eb438b6b69b9..240971f18bb3 100644 --- a/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.18.Managed.LinqService).sql +++ b/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.18.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.18.Managed.LinqService).sql b/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.18.Managed.LinqService).sql index 70fdfa215c4d..f4ffbc1370c0 100644 --- a/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.18.Managed.LinqService).sql +++ b/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.18.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.18.Managed.LinqService).sql b/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.18.Managed.LinqService).sql index 09bf2c3d4896..929042fbc16f 100644 --- a/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.18.Managed.LinqService).sql +++ b/Oracle.18.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.18.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.18.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.18.Managed.LinqService).sql b/Oracle.18.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.18.Managed.LinqService).sql new file mode 100644 index 000000000000..4127d5c7db0d --- /dev/null +++ b/Oracle.18.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.18.Managed.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Oracle.18.Managed Oracle.Managed Oracle12 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.18.Managed Oracle.Managed Oracle12 (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.18.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.18.Managed.LinqService).sql b/Oracle.18.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.18.Managed.LinqService).sql new file mode 100644 index 000000000000..1f161082540c --- /dev/null +++ b/Oracle.18.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.18.Managed.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Oracle.18.Managed Oracle.Managed Oracle12 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.18.Managed Oracle.Managed Oracle12 (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.18.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.18.Managed).sql b/Oracle.18.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.18.Managed).sql index 75b82f74a959..ff5e2f15ac55 100644 --- a/Oracle.18.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.18.Managed).sql +++ b/Oracle.18.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.18.Managed).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/Oracle.18.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.18.Managed).sql b/Oracle.18.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.18.Managed).sql index d0f4c1e7ee4f..d4f3b5a24005 100644 --- a/Oracle.18.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.18.Managed).sql +++ b/Oracle.18.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.18.Managed).sql @@ -1,11 +1,11 @@ BeforeExecute -- Oracle.18.Managed Oracle.Managed Oracle12 -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.18.Managed).sql b/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.18.Managed).sql index aea298f4f075..e35d7a4e0820 100644 --- a/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.18.Managed).sql +++ b/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.18.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.18.Managed).sql b/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.18.Managed).sql index 8a4be643d488..61616db6b9eb 100644 --- a/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.18.Managed).sql +++ b/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.18.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.18.Managed).sql b/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.18.Managed).sql index 4a28e6421a41..d707c36baab8 100644 --- a/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.18.Managed).sql +++ b/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.18.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.18.Managed).sql b/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.18.Managed).sql index 7c00c8ba7d99..7ea9eb21d0b7 100644 --- a/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.18.Managed).sql +++ b/Oracle.18.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.18.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.18.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.18.Managed).sql b/Oracle.18.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.18.Managed).sql new file mode 100644 index 000000000000..08e9ccbc54c5 --- /dev/null +++ b/Oracle.18.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.18.Managed).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Oracle.18.Managed Oracle.Managed Oracle12 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.18.Managed Oracle.Managed Oracle12 + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.18.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.18.Managed).sql b/Oracle.18.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.18.Managed).sql new file mode 100644 index 000000000000..c4a149e03f57 --- /dev/null +++ b/Oracle.18.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.18.Managed).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Oracle.18.Managed Oracle.Managed Oracle12 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.18.Managed Oracle.Managed Oracle12 + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + From 4502754d418ea41207f4c5321dfb0537dae029eb Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 19:07:45 +0200 Subject: [PATCH 28/42] [Linux / Oracle 12c] baselines --- ...s.Test5(Oracle.12.Managed.LinqService).sql | 36 +++++-------------- ...omCount(Oracle.12.Managed.LinqService).sql | 8 ++--- ...istinct(Oracle.12.Managed.LinqService).sql | 14 ++------ ...ctWhere(Oracle.12.Managed.LinqService).sql | 14 ++------ ...istinct(Oracle.12.Managed.LinqService).sql | 14 ++------ ...ctWhere(Oracle.12.Managed.LinqService).sql | 14 ++------ ...nctAll1(Oracle.12.Managed.LinqService).sql | 28 +++++++++++++++ ...nctAll2(Oracle.12.Managed.LinqService).sql | 29 +++++++++++++++ ...Linq.CteTests.Test5(Oracle.12.Managed).sql | 36 +++++-------------- ...sts.TestCustomCount(Oracle.12.Managed).sql | 8 ++--- ...s.InnerJoinDistinct(Oracle.12.Managed).sql | 14 ++------ ...erJoinDistinctWhere(Oracle.12.Managed).sql | 14 ++------ ...ts.LeftJoinDistinct(Oracle.12.Managed).sql | 14 ++------ ...ftJoinDistinctWhere(Oracle.12.Managed).sql | 14 ++------ ...OrderByDistinctAll1(Oracle.12.Managed).sql | 28 +++++++++++++++ ...OrderByDistinctAll2(Oracle.12.Managed).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 Oracle.12.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.12.Managed.LinqService).sql create mode 100644 Oracle.12.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.12.Managed.LinqService).sql create mode 100644 Oracle.12.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.12.Managed).sql create mode 100644 Oracle.12.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.12.Managed).sql diff --git a/Oracle.12.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.12.Managed.LinqService).sql b/Oracle.12.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.12.Managed.LinqService).sql index 203975e49292..2bcc36e3b505 100644 --- a/Oracle.12.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.12.Managed.LinqService).sql +++ b/Oracle.12.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.12.Managed.LinqService).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/Oracle.12.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.12.Managed.LinqService).sql b/Oracle.12.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.12.Managed.LinqService).sql index a7d9516caeb2..23106bd55a85 100644 --- a/Oracle.12.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.12.Managed.LinqService).sql +++ b/Oracle.12.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.12.Managed.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- Oracle.12.Managed Oracle.Managed Oracle12 (asynchronously) -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.12.Managed.LinqService).sql b/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.12.Managed.LinqService).sql index 1c777bec5ed5..75299df089e1 100644 --- a/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.12.Managed.LinqService).sql +++ b/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.12.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.12.Managed.LinqService).sql b/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.12.Managed.LinqService).sql index 30332380c689..e6ef00ae7e1c 100644 --- a/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.12.Managed.LinqService).sql +++ b/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.12.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.12.Managed.LinqService).sql b/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.12.Managed.LinqService).sql index b919b6d6ab40..7d5ca14ac01b 100644 --- a/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.12.Managed.LinqService).sql +++ b/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.12.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.12.Managed.LinqService).sql b/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.12.Managed.LinqService).sql index 7e379ba1d572..05380d7ea46b 100644 --- a/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.12.Managed.LinqService).sql +++ b/Oracle.12.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.12.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.12.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.12.Managed.LinqService).sql b/Oracle.12.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.12.Managed.LinqService).sql new file mode 100644 index 000000000000..6fa67db792ea --- /dev/null +++ b/Oracle.12.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.12.Managed.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Oracle.12.Managed Oracle.Managed Oracle12 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.12.Managed Oracle.Managed Oracle12 (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.12.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.12.Managed.LinqService).sql b/Oracle.12.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.12.Managed.LinqService).sql new file mode 100644 index 000000000000..a321d5b9a366 --- /dev/null +++ b/Oracle.12.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.12.Managed.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Oracle.12.Managed Oracle.Managed Oracle12 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.12.Managed Oracle.Managed Oracle12 (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.12.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.12.Managed).sql b/Oracle.12.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.12.Managed).sql index ce073f4392d5..f3d0767797d9 100644 --- a/Oracle.12.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.12.Managed).sql +++ b/Oracle.12.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.12.Managed).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/Oracle.12.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.12.Managed).sql b/Oracle.12.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.12.Managed).sql index 19d7a7f0961b..2e2b96732e28 100644 --- a/Oracle.12.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.12.Managed).sql +++ b/Oracle.12.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.12.Managed).sql @@ -1,11 +1,11 @@ BeforeExecute -- Oracle.12.Managed Oracle.Managed Oracle12 -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.12.Managed).sql b/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.12.Managed).sql index 24afdd269b7d..9766b2d78b98 100644 --- a/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.12.Managed).sql +++ b/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.12.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.12.Managed).sql b/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.12.Managed).sql index c5b359a81a5c..8603dcbd14b9 100644 --- a/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.12.Managed).sql +++ b/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.12.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.12.Managed).sql b/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.12.Managed).sql index d4fd31166447..b641b01530da 100644 --- a/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.12.Managed).sql +++ b/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.12.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.12.Managed).sql b/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.12.Managed).sql index 6e1a2e34726e..52a1d7e6d523 100644 --- a/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.12.Managed).sql +++ b/Oracle.12.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.12.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.12.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.12.Managed).sql b/Oracle.12.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.12.Managed).sql new file mode 100644 index 000000000000..67ec11b05ae4 --- /dev/null +++ b/Oracle.12.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.12.Managed).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Oracle.12.Managed Oracle.Managed Oracle12 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.12.Managed Oracle.Managed Oracle12 + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.12.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.12.Managed).sql b/Oracle.12.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.12.Managed).sql new file mode 100644 index 000000000000..0923d9bde294 --- /dev/null +++ b/Oracle.12.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.12.Managed).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Oracle.12.Managed Oracle.Managed Oracle12 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.12.Managed Oracle.Managed Oracle12 + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + From dad4224a1cf3ddaf2d2f556be313fe1e57a51c5d Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:09:30 +0000 Subject: [PATCH 29/42] [Linux / PostgreSQL 14] baselines --- ...Tests.Test5(PostgreSQL.14.LinqService).sql | 36 +++++-------------- ...CustomCount(PostgreSQL.14.LinqService).sql | 8 ++--- ...oinDistinct(PostgreSQL.14.LinqService).sql | 14 ++------ ...stinctWhere(PostgreSQL.14.LinqService).sql | 14 ++------ ...oinDistinct(PostgreSQL.14.LinqService).sql | 14 ++------ ...stinctWhere(PostgreSQL.14.LinqService).sql | 14 ++------ ...istinctAll1(PostgreSQL.14.LinqService).sql | 28 +++++++++++++++ ...istinctAll2(PostgreSQL.14.LinqService).sql | 29 +++++++++++++++ ...sts.Linq.CteTests.Test5(PostgreSQL.14).sql | 36 +++++-------------- ...teTests.TestCustomCount(PostgreSQL.14).sql | 8 ++--- ...Tests.InnerJoinDistinct(PostgreSQL.14).sql | 14 ++------ ....InnerJoinDistinctWhere(PostgreSQL.14).sql | 14 ++------ ...dTests.LeftJoinDistinct(PostgreSQL.14).sql | 14 ++------ ...s.LeftJoinDistinctWhere(PostgreSQL.14).sql | 14 ++------ ...sts.OrderByDistinctAll1(PostgreSQL.14).sql | 28 +++++++++++++++ ...sts.OrderByDistinctAll2(PostgreSQL.14).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 PostgreSQL.14.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.14.LinqService).sql create mode 100644 PostgreSQL.14.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.14.LinqService).sql create mode 100644 PostgreSQL.14/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.14).sql create mode 100644 PostgreSQL.14/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.14).sql diff --git a/PostgreSQL.14.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.14.LinqService).sql b/PostgreSQL.14.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.14.LinqService).sql index 1dc20cd49752..1c3bad0e45aa 100644 --- a/PostgreSQL.14.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.14.LinqService).sql +++ b/PostgreSQL.14.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.14.LinqService).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/PostgreSQL.14.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.14.LinqService).sql b/PostgreSQL.14.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.14.LinqService).sql index 6845918f5de0..d199d498fc2b 100644 --- a/PostgreSQL.14.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.14.LinqService).sql +++ b/PostgreSQL.14.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.14.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- PostgreSQL.14 PostgreSQL.9.5 PostgreSQL (asynchronously) -WITH "CTE_1" AS +WITH "CTE_1" (c1) +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.14.LinqService).sql b/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.14.LinqService).sql index 649a35a73973..3383b48b4dde 100644 --- a/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.14.LinqService).sql +++ b/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.14.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.14.LinqService).sql b/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.14.LinqService).sql index 7258043b6e14..e9d3a8535df7 100644 --- a/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.14.LinqService).sql +++ b/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.14.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.14.LinqService).sql b/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.14.LinqService).sql index 13c4208850cc..b9dc607d87ab 100644 --- a/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.14.LinqService).sql +++ b/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.14.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.14.LinqService).sql b/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.14.LinqService).sql index a87843b30f38..4e19f5415843 100644 --- a/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.14.LinqService).sql +++ b/PostgreSQL.14.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.14.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.14.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.14.LinqService).sql b/PostgreSQL.14.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.14.LinqService).sql new file mode 100644 index 000000000000..d1669336bfa1 --- /dev/null +++ b/PostgreSQL.14.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.14.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- PostgreSQL.14 PostgreSQL.9.5 PostgreSQL (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.14 PostgreSQL.9.5 PostgreSQL (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.14.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.14.LinqService).sql b/PostgreSQL.14.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.14.LinqService).sql new file mode 100644 index 000000000000..317aa524b6e6 --- /dev/null +++ b/PostgreSQL.14.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.14.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- PostgreSQL.14 PostgreSQL.9.5 PostgreSQL (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.14 PostgreSQL.9.5 PostgreSQL (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.14/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.14).sql b/PostgreSQL.14/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.14).sql index a4cef1db87da..0e00a8b9d2e5 100644 --- a/PostgreSQL.14/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.14).sql +++ b/PostgreSQL.14/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.14).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/PostgreSQL.14/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.14).sql b/PostgreSQL.14/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.14).sql index 19433b6437b6..6883185f5856 100644 --- a/PostgreSQL.14/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.14).sql +++ b/PostgreSQL.14/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.14).sql @@ -1,11 +1,11 @@ BeforeExecute -- PostgreSQL.14 PostgreSQL.9.5 PostgreSQL -WITH "CTE_1" AS +WITH "CTE_1" (c1) +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.14).sql b/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.14).sql index 7449647a34ee..fb4c6ee59a6c 100644 --- a/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.14).sql +++ b/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.14).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.14).sql b/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.14).sql index ad77d96225c4..ea9bff1d863e 100644 --- a/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.14).sql +++ b/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.14).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.14).sql b/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.14).sql index 4c3fefdc7ce7..9c2a72696517 100644 --- a/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.14).sql +++ b/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.14).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.14).sql b/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.14).sql index e48ae9d74719..77cf1ad3a389 100644 --- a/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.14).sql +++ b/PostgreSQL.14/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.14).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.14/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.14).sql b/PostgreSQL.14/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.14).sql new file mode 100644 index 000000000000..de743a388b68 --- /dev/null +++ b/PostgreSQL.14/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.14).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- PostgreSQL.14 PostgreSQL.9.5 PostgreSQL +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.14 PostgreSQL.9.5 PostgreSQL + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.14/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.14).sql b/PostgreSQL.14/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.14).sql new file mode 100644 index 000000000000..2794340db275 --- /dev/null +++ b/PostgreSQL.14/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.14).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- PostgreSQL.14 PostgreSQL.9.5 PostgreSQL +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.14 PostgreSQL.9.5 PostgreSQL + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + From 59cf5fcf82ed0cf871827562f4dee768ea21c50c Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:10:09 +0000 Subject: [PATCH 30/42] [Linux / PostgreSQL 15] baselines --- ...Tests.Test5(PostgreSQL.15.LinqService).sql | 36 +++++-------------- ...CustomCount(PostgreSQL.15.LinqService).sql | 8 ++--- ...oinDistinct(PostgreSQL.15.LinqService).sql | 14 ++------ ...stinctWhere(PostgreSQL.15.LinqService).sql | 14 ++------ ...oinDistinct(PostgreSQL.15.LinqService).sql | 14 ++------ ...stinctWhere(PostgreSQL.15.LinqService).sql | 14 ++------ ...istinctAll1(PostgreSQL.15.LinqService).sql | 28 +++++++++++++++ ...istinctAll2(PostgreSQL.15.LinqService).sql | 29 +++++++++++++++ ...sts.Linq.CteTests.Test5(PostgreSQL.15).sql | 36 +++++-------------- ...teTests.TestCustomCount(PostgreSQL.15).sql | 8 ++--- ...Tests.InnerJoinDistinct(PostgreSQL.15).sql | 14 ++------ ....InnerJoinDistinctWhere(PostgreSQL.15).sql | 14 ++------ ...dTests.LeftJoinDistinct(PostgreSQL.15).sql | 14 ++------ ...s.LeftJoinDistinctWhere(PostgreSQL.15).sql | 14 ++------ ...sts.OrderByDistinctAll1(PostgreSQL.15).sql | 28 +++++++++++++++ ...sts.OrderByDistinctAll2(PostgreSQL.15).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 PostgreSQL.15.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.15.LinqService).sql create mode 100644 PostgreSQL.15.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.15.LinqService).sql create mode 100644 PostgreSQL.15/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.15).sql create mode 100644 PostgreSQL.15/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.15).sql diff --git a/PostgreSQL.15.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.15.LinqService).sql b/PostgreSQL.15.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.15.LinqService).sql index 802e78195d9c..a6e64947a0cc 100644 --- a/PostgreSQL.15.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.15.LinqService).sql +++ b/PostgreSQL.15.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.15.LinqService).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/PostgreSQL.15.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.15.LinqService).sql b/PostgreSQL.15.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.15.LinqService).sql index 3905a6c2b492..7a171e7ce050 100644 --- a/PostgreSQL.15.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.15.LinqService).sql +++ b/PostgreSQL.15.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.15.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- PostgreSQL.15 PostgreSQL (asynchronously) -WITH "CTE_1" AS +WITH "CTE_1" (c1) +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.15.LinqService).sql b/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.15.LinqService).sql index de967e854697..8403e848aae0 100644 --- a/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.15.LinqService).sql +++ b/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.15.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.15.LinqService).sql b/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.15.LinqService).sql index 2ec4cf486a48..12225fcb66b1 100644 --- a/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.15.LinqService).sql +++ b/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.15.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.15.LinqService).sql b/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.15.LinqService).sql index 3771cf9e18af..8582baacbb56 100644 --- a/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.15.LinqService).sql +++ b/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.15.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.15.LinqService).sql b/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.15.LinqService).sql index 9152b6bbfce5..3fde8f4e22ef 100644 --- a/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.15.LinqService).sql +++ b/PostgreSQL.15.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.15.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.15.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.15.LinqService).sql b/PostgreSQL.15.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.15.LinqService).sql new file mode 100644 index 000000000000..887effa092dd --- /dev/null +++ b/PostgreSQL.15.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.15.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- PostgreSQL.15 PostgreSQL (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.15 PostgreSQL (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.15.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.15.LinqService).sql b/PostgreSQL.15.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.15.LinqService).sql new file mode 100644 index 000000000000..3657deaaa0e6 --- /dev/null +++ b/PostgreSQL.15.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.15.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- PostgreSQL.15 PostgreSQL (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.15 PostgreSQL (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.15/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.15).sql b/PostgreSQL.15/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.15).sql index 9e70aa08acb5..d8700f406394 100644 --- a/PostgreSQL.15/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.15).sql +++ b/PostgreSQL.15/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.15).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/PostgreSQL.15/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.15).sql b/PostgreSQL.15/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.15).sql index b8b73d34cd2d..0c0508c1802a 100644 --- a/PostgreSQL.15/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.15).sql +++ b/PostgreSQL.15/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.15).sql @@ -1,11 +1,11 @@ BeforeExecute -- PostgreSQL.15 PostgreSQL -WITH "CTE_1" AS +WITH "CTE_1" (c1) +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.15).sql b/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.15).sql index fc06e38febde..2948319c5e07 100644 --- a/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.15).sql +++ b/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.15).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.15).sql b/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.15).sql index 1e7cac760c89..222ede86de95 100644 --- a/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.15).sql +++ b/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.15).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.15).sql b/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.15).sql index e9b5ecaeb55b..25ab011e5833 100644 --- a/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.15).sql +++ b/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.15).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.15).sql b/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.15).sql index 4925d39e4d93..8513f6334573 100644 --- a/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.15).sql +++ b/PostgreSQL.15/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.15).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.15/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.15).sql b/PostgreSQL.15/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.15).sql new file mode 100644 index 000000000000..53f3ad3c14d1 --- /dev/null +++ b/PostgreSQL.15/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.15).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- PostgreSQL.15 PostgreSQL +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.15 PostgreSQL + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.15/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.15).sql b/PostgreSQL.15/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.15).sql new file mode 100644 index 000000000000..f1fe9149a841 --- /dev/null +++ b/PostgreSQL.15/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.15).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- PostgreSQL.15 PostgreSQL +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.15 PostgreSQL + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + From c7d5c9ae8aaf9b141fd3c43d8842715841dbbfa9 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:11:49 +0000 Subject: [PATCH 31/42] [Windows / SQL Server 2025] baselines --- ...ests.Test5(SqlServer.2025.LinqService).sql | 36 +++++-------------- ...ustomCount(SqlServer.2025.LinqService).sql | 8 ++--- ...inDistinct(SqlServer.2025.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2025.LinqService).sql | 14 ++------ ...inDistinct(SqlServer.2025.LinqService).sql | 14 ++------ ...tinctWhere(SqlServer.2025.LinqService).sql | 14 ++------ ...stinctAll1(SqlServer.2025.LinqService).sql | 28 +++++++++++++++ ...stinctAll2(SqlServer.2025.LinqService).sql | 29 +++++++++++++++ ...s.Test5(SqlServer.2025.MS.LinqService).sql | 36 +++++-------------- ...omCount(SqlServer.2025.MS.LinqService).sql | 8 ++--- ...istinct(SqlServer.2025.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2025.MS.LinqService).sql | 14 ++------ ...istinct(SqlServer.2025.MS.LinqService).sql | 14 ++------ ...ctWhere(SqlServer.2025.MS.LinqService).sql | 14 ++------ ...nctAll1(SqlServer.2025.MS.LinqService).sql | 28 +++++++++++++++ ...nctAll2(SqlServer.2025.MS.LinqService).sql | 29 +++++++++++++++ ...Linq.CteTests.Test5(SqlServer.2025.MS).sql | 36 +++++-------------- ...sts.TestCustomCount(SqlServer.2025.MS).sql | 8 ++--- ...s.InnerJoinDistinct(SqlServer.2025.MS).sql | 14 ++------ ...erJoinDistinctWhere(SqlServer.2025.MS).sql | 14 ++------ ...ts.LeftJoinDistinct(SqlServer.2025.MS).sql | 14 ++------ ...ftJoinDistinctWhere(SqlServer.2025.MS).sql | 14 ++------ ...OrderByDistinctAll1(SqlServer.2025.MS).sql | 28 +++++++++++++++ ...OrderByDistinctAll2(SqlServer.2025.MS).sql | 29 +++++++++++++++ ...ts.Linq.CteTests.Test5(SqlServer.2025).sql | 36 +++++-------------- ...eTests.TestCustomCount(SqlServer.2025).sql | 8 ++--- ...ests.InnerJoinDistinct(SqlServer.2025).sql | 14 ++------ ...InnerJoinDistinctWhere(SqlServer.2025).sql | 14 ++------ ...Tests.LeftJoinDistinct(SqlServer.2025).sql | 14 ++------ ....LeftJoinDistinctWhere(SqlServer.2025).sql | 14 ++------ ...ts.OrderByDistinctAll1(SqlServer.2025).sql | 28 +++++++++++++++ ...ts.OrderByDistinctAll2(SqlServer.2025).sql | 29 +++++++++++++++ 32 files changed, 324 insertions(+), 304 deletions(-) create mode 100644 SqlServer.2025.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025.LinqService).sql create mode 100644 SqlServer.2025.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025.LinqService).sql create mode 100644 SqlServer.2025.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025.MS.LinqService).sql create mode 100644 SqlServer.2025.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025.MS.LinqService).sql create mode 100644 SqlServer.2025.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025.MS).sql create mode 100644 SqlServer.2025.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025.MS).sql create mode 100644 SqlServer.2025/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025).sql create mode 100644 SqlServer.2025/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025).sql diff --git a/SqlServer.2025.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025.LinqService).sql b/SqlServer.2025.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025.LinqService).sql index cc2c58f4ea3d..7a1b00b2d27f 100644 --- a/SqlServer.2025.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025.LinqService).sql +++ b/SqlServer.2025.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2025.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025.LinqService).sql b/SqlServer.2025.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025.LinqService).sql index 19fb124fc740..9d444b72d8b4 100644 --- a/SqlServer.2025.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025.LinqService).sql +++ b/SqlServer.2025.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2025 SqlServer.2022 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025.LinqService).sql b/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025.LinqService).sql index 499c8e5c982c..1d5eff356901 100644 --- a/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025.LinqService).sql +++ b/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025.LinqService).sql b/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025.LinqService).sql index 96609545696d..3e1e5a9b8a07 100644 --- a/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025.LinqService).sql +++ b/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025.LinqService).sql b/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025.LinqService).sql index 2b92df717a23..c93e8b6e6abc 100644 --- a/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025.LinqService).sql +++ b/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025.LinqService).sql b/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025.LinqService).sql index 9e5e36c506ff..11e3912be279 100644 --- a/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025.LinqService).sql +++ b/SqlServer.2025.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2025.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025.LinqService).sql b/SqlServer.2025.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025.LinqService).sql new file mode 100644 index 000000000000..ce0adfe7898f --- /dev/null +++ b/SqlServer.2025.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2025 SqlServer.2022 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2025 SqlServer.2022 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2025.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025.LinqService).sql b/SqlServer.2025.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025.LinqService).sql new file mode 100644 index 000000000000..c8f7a85dddee --- /dev/null +++ b/SqlServer.2025.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2025 SqlServer.2022 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2025 SqlServer.2022 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2025.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025.MS.LinqService).sql b/SqlServer.2025.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025.MS.LinqService).sql index 33addc976f92..b7613f105304 100644 --- a/SqlServer.2025.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025.MS.LinqService).sql +++ b/SqlServer.2025.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025.MS.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2025.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025.MS.LinqService).sql b/SqlServer.2025.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025.MS.LinqService).sql index 5c60123e7285..a04589fd6d81 100644 --- a/SqlServer.2025.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025.MS.LinqService).sql +++ b/SqlServer.2025.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025.MS.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2025.MS SqlServer.2025 SqlServer.2022 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025.MS.LinqService).sql b/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025.MS.LinqService).sql index f87e9d803d0d..4d538467b12c 100644 --- a/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025.MS.LinqService).sql +++ b/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025.MS.LinqService).sql b/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025.MS.LinqService).sql index a09a24c8318b..e8d1af522b15 100644 --- a/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025.MS.LinqService).sql +++ b/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025.MS.LinqService).sql b/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025.MS.LinqService).sql index 954eb3868108..0b2fb985bc17 100644 --- a/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025.MS.LinqService).sql +++ b/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025.MS.LinqService).sql b/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025.MS.LinqService).sql index a359037de6c6..876115f6bf93 100644 --- a/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025.MS.LinqService).sql +++ b/SqlServer.2025.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2025.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025.MS.LinqService).sql b/SqlServer.2025.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025.MS.LinqService).sql new file mode 100644 index 000000000000..6aae5a405e47 --- /dev/null +++ b/SqlServer.2025.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025.MS.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2025.MS SqlServer.2025 SqlServer.2022 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2025.MS SqlServer.2025 SqlServer.2022 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2025.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025.MS.LinqService).sql b/SqlServer.2025.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025.MS.LinqService).sql new file mode 100644 index 000000000000..b749e3d88449 --- /dev/null +++ b/SqlServer.2025.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025.MS.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2025.MS SqlServer.2025 SqlServer.2022 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2025.MS SqlServer.2025 SqlServer.2022 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2025.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025.MS).sql b/SqlServer.2025.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025.MS).sql index 989d62392e70..b4874c211fe5 100644 --- a/SqlServer.2025.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025.MS).sql +++ b/SqlServer.2025.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025.MS).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2025.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025.MS).sql b/SqlServer.2025.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025.MS).sql index 77a1aa783b3c..e729d0553dcb 100644 --- a/SqlServer.2025.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025.MS).sql +++ b/SqlServer.2025.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025.MS).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2025.MS SqlServer.2025 SqlServer.2022 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025.MS).sql b/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025.MS).sql index 6d4ca02e8de2..7a071d7efd23 100644 --- a/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025.MS).sql +++ b/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025.MS).sql b/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025.MS).sql index 3f1575e3a148..89c5ec183cf3 100644 --- a/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025.MS).sql +++ b/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025.MS).sql b/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025.MS).sql index 076aa22da642..5dbb9c921544 100644 --- a/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025.MS).sql +++ b/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025.MS).sql b/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025.MS).sql index 0a422e80f170..bd072f4b9a3f 100644 --- a/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025.MS).sql +++ b/SqlServer.2025.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2025.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025.MS).sql b/SqlServer.2025.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025.MS).sql new file mode 100644 index 000000000000..9520646cd270 --- /dev/null +++ b/SqlServer.2025.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025.MS).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2025.MS SqlServer.2025 SqlServer.2022 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2025.MS SqlServer.2025 SqlServer.2022 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2025.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025.MS).sql b/SqlServer.2025.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025.MS).sql new file mode 100644 index 000000000000..335d7eef0a2e --- /dev/null +++ b/SqlServer.2025.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025.MS).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2025.MS SqlServer.2025 SqlServer.2022 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2025.MS SqlServer.2025 SqlServer.2022 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2025/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025).sql b/SqlServer.2025/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025).sql index 23de5ba00e56..a67eea1110f1 100644 --- a/SqlServer.2025/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025).sql +++ b/SqlServer.2025/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.2025).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.2025/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025).sql b/SqlServer.2025/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025).sql index 02eb6ea896a4..5d56ee1fda41 100644 --- a/SqlServer.2025/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025).sql +++ b/SqlServer.2025/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.2025).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.2025 SqlServer.2022 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025).sql b/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025).sql index 69c537ab4375..815a7f18ae32 100644 --- a/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025).sql +++ b/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.2025).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025).sql b/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025).sql index 36eb1e71edf8..ee9536aa0a2c 100644 --- a/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025).sql +++ b/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.2025).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025).sql b/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025).sql index 58aad08442e6..ed4e93efdc50 100644 --- a/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025).sql +++ b/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.2025).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025).sql b/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025).sql index 056fbb5ed0c7..929b37964b30 100644 --- a/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025).sql +++ b/SqlServer.2025/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.2025).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.2025/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025).sql b/SqlServer.2025/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025).sql new file mode 100644 index 000000000000..16dd3f509873 --- /dev/null +++ b/SqlServer.2025/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.2025).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.2025 SqlServer.2022 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2025 SqlServer.2022 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.2025/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025).sql b/SqlServer.2025/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025).sql new file mode 100644 index 000000000000..f277446c72f7 --- /dev/null +++ b/SqlServer.2025/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.2025).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.2025 SqlServer.2022 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.2025 SqlServer.2022 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From d06f04a0f1013569f4ae8b7338291dd36ae07afa Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 19:12:48 +0200 Subject: [PATCH 32/42] [Linux / Oracle 23c] baselines --- ...s.Test5(Oracle.23.Managed.LinqService).sql | 36 +++++-------------- ...omCount(Oracle.23.Managed.LinqService).sql | 8 ++--- ...istinct(Oracle.23.Managed.LinqService).sql | 14 ++------ ...ctWhere(Oracle.23.Managed.LinqService).sql | 14 ++------ ...istinct(Oracle.23.Managed.LinqService).sql | 14 ++------ ...ctWhere(Oracle.23.Managed.LinqService).sql | 14 ++------ ...nctAll1(Oracle.23.Managed.LinqService).sql | 28 +++++++++++++++ ...nctAll2(Oracle.23.Managed.LinqService).sql | 29 +++++++++++++++ ...Linq.CteTests.Test5(Oracle.23.Managed).sql | 36 +++++-------------- ...sts.TestCustomCount(Oracle.23.Managed).sql | 8 ++--- ...s.InnerJoinDistinct(Oracle.23.Managed).sql | 14 ++------ ...erJoinDistinctWhere(Oracle.23.Managed).sql | 14 ++------ ...ts.LeftJoinDistinct(Oracle.23.Managed).sql | 14 ++------ ...ftJoinDistinctWhere(Oracle.23.Managed).sql | 14 ++------ ...OrderByDistinctAll1(Oracle.23.Managed).sql | 28 +++++++++++++++ ...OrderByDistinctAll2(Oracle.23.Managed).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 Oracle.23.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.23.Managed.LinqService).sql create mode 100644 Oracle.23.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.23.Managed.LinqService).sql create mode 100644 Oracle.23.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.23.Managed).sql create mode 100644 Oracle.23.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.23.Managed).sql diff --git a/Oracle.23.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.23.Managed.LinqService).sql b/Oracle.23.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.23.Managed.LinqService).sql index c60dcdb8fcd2..dc34557f8eb3 100644 --- a/Oracle.23.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.23.Managed.LinqService).sql +++ b/Oracle.23.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.23.Managed.LinqService).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/Oracle.23.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.23.Managed.LinqService).sql b/Oracle.23.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.23.Managed.LinqService).sql index 1c7790279387..965bd6c4eadd 100644 --- a/Oracle.23.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.23.Managed.LinqService).sql +++ b/Oracle.23.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.23.Managed.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- Oracle.23.Managed Oracle.Managed Oracle12 (asynchronously) -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.23.Managed.LinqService).sql b/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.23.Managed.LinqService).sql index 4ddc14411838..22d8901077f7 100644 --- a/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.23.Managed.LinqService).sql +++ b/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.23.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.23.Managed.LinqService).sql b/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.23.Managed.LinqService).sql index 9531bd8c44ef..7a6d6e864f85 100644 --- a/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.23.Managed.LinqService).sql +++ b/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.23.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.23.Managed.LinqService).sql b/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.23.Managed.LinqService).sql index 804b9c36b7ee..b5a7eb843636 100644 --- a/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.23.Managed.LinqService).sql +++ b/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.23.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.23.Managed.LinqService).sql b/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.23.Managed.LinqService).sql index 87da8536f1ee..7627c56613c2 100644 --- a/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.23.Managed.LinqService).sql +++ b/Oracle.23.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.23.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.23.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.23.Managed.LinqService).sql b/Oracle.23.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.23.Managed.LinqService).sql new file mode 100644 index 000000000000..777041c88630 --- /dev/null +++ b/Oracle.23.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.23.Managed.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Oracle.23.Managed Oracle.Managed Oracle12 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.23.Managed Oracle.Managed Oracle12 (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.23.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.23.Managed.LinqService).sql b/Oracle.23.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.23.Managed.LinqService).sql new file mode 100644 index 000000000000..9115b1e842a5 --- /dev/null +++ b/Oracle.23.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.23.Managed.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Oracle.23.Managed Oracle.Managed Oracle12 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.23.Managed Oracle.Managed Oracle12 (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.23.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.23.Managed).sql b/Oracle.23.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.23.Managed).sql index c8edc02b1373..3ace9fbf2123 100644 --- a/Oracle.23.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.23.Managed).sql +++ b/Oracle.23.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.23.Managed).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/Oracle.23.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.23.Managed).sql b/Oracle.23.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.23.Managed).sql index 1d5be992fd96..7af0a674ae7f 100644 --- a/Oracle.23.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.23.Managed).sql +++ b/Oracle.23.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.23.Managed).sql @@ -1,11 +1,11 @@ BeforeExecute -- Oracle.23.Managed Oracle.Managed Oracle12 -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.23.Managed).sql b/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.23.Managed).sql index 6122fa106968..38bf649c5863 100644 --- a/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.23.Managed).sql +++ b/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.23.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.23.Managed).sql b/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.23.Managed).sql index 04553ea66438..2fdd635d6055 100644 --- a/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.23.Managed).sql +++ b/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.23.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.23.Managed).sql b/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.23.Managed).sql index 68e1f9c8d1b0..2922ef198748 100644 --- a/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.23.Managed).sql +++ b/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.23.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.23.Managed).sql b/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.23.Managed).sql index 7d1fb9acc041..2e6aa44e462f 100644 --- a/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.23.Managed).sql +++ b/Oracle.23.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.23.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.23.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.23.Managed).sql b/Oracle.23.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.23.Managed).sql new file mode 100644 index 000000000000..144851f0318c --- /dev/null +++ b/Oracle.23.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.23.Managed).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Oracle.23.Managed Oracle.Managed Oracle12 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.23.Managed Oracle.Managed Oracle12 + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.23.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.23.Managed).sql b/Oracle.23.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.23.Managed).sql new file mode 100644 index 000000000000..371faf8aa2e1 --- /dev/null +++ b/Oracle.23.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.23.Managed).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Oracle.23.Managed Oracle.Managed Oracle12 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.23.Managed Oracle.Managed Oracle12 + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + From 64642833d5483ef14db5304a5a044727f1e69cfc Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:13:10 +0000 Subject: [PATCH 33/42] [Linux / PostgreSQL 16] baselines --- ...Tests.Test5(PostgreSQL.16.LinqService).sql | 36 +++++-------------- ...CustomCount(PostgreSQL.16.LinqService).sql | 8 ++--- ...oinDistinct(PostgreSQL.16.LinqService).sql | 14 ++------ ...stinctWhere(PostgreSQL.16.LinqService).sql | 14 ++------ ...oinDistinct(PostgreSQL.16.LinqService).sql | 14 ++------ ...stinctWhere(PostgreSQL.16.LinqService).sql | 14 ++------ ...istinctAll1(PostgreSQL.16.LinqService).sql | 28 +++++++++++++++ ...istinctAll2(PostgreSQL.16.LinqService).sql | 29 +++++++++++++++ ...sts.Linq.CteTests.Test5(PostgreSQL.16).sql | 36 +++++-------------- ...teTests.TestCustomCount(PostgreSQL.16).sql | 8 ++--- ...Tests.InnerJoinDistinct(PostgreSQL.16).sql | 14 ++------ ....InnerJoinDistinctWhere(PostgreSQL.16).sql | 14 ++------ ...dTests.LeftJoinDistinct(PostgreSQL.16).sql | 14 ++------ ...s.LeftJoinDistinctWhere(PostgreSQL.16).sql | 14 ++------ ...sts.OrderByDistinctAll1(PostgreSQL.16).sql | 28 +++++++++++++++ ...sts.OrderByDistinctAll2(PostgreSQL.16).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 PostgreSQL.16.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.16.LinqService).sql create mode 100644 PostgreSQL.16.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.16.LinqService).sql create mode 100644 PostgreSQL.16/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.16).sql create mode 100644 PostgreSQL.16/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.16).sql diff --git a/PostgreSQL.16.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.16.LinqService).sql b/PostgreSQL.16.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.16.LinqService).sql index 06b35be2a2e5..6bf915965c50 100644 --- a/PostgreSQL.16.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.16.LinqService).sql +++ b/PostgreSQL.16.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.16.LinqService).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/PostgreSQL.16.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.16.LinqService).sql b/PostgreSQL.16.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.16.LinqService).sql index e7e000ee1afb..28024638f62f 100644 --- a/PostgreSQL.16.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.16.LinqService).sql +++ b/PostgreSQL.16.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.16.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- PostgreSQL.16 PostgreSQL.15 PostgreSQL (asynchronously) -WITH "CTE_1" AS +WITH "CTE_1" (c1) +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.16.LinqService).sql b/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.16.LinqService).sql index a129f974c9c6..fb08a81c27a5 100644 --- a/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.16.LinqService).sql +++ b/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.16.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.16.LinqService).sql b/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.16.LinqService).sql index 5d0c9a06f0ff..f3883bb0d01d 100644 --- a/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.16.LinqService).sql +++ b/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.16.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.16.LinqService).sql b/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.16.LinqService).sql index 25e82b059c80..f94fa379f16c 100644 --- a/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.16.LinqService).sql +++ b/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.16.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.16.LinqService).sql b/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.16.LinqService).sql index 750e1e750cea..9e248635012e 100644 --- a/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.16.LinqService).sql +++ b/PostgreSQL.16.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.16.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.16.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.16.LinqService).sql b/PostgreSQL.16.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.16.LinqService).sql new file mode 100644 index 000000000000..60406444dbe8 --- /dev/null +++ b/PostgreSQL.16.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.16.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- PostgreSQL.16 PostgreSQL.15 PostgreSQL (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.16 PostgreSQL.15 PostgreSQL (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.16.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.16.LinqService).sql b/PostgreSQL.16.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.16.LinqService).sql new file mode 100644 index 000000000000..e9b4fff40694 --- /dev/null +++ b/PostgreSQL.16.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.16.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- PostgreSQL.16 PostgreSQL.15 PostgreSQL (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.16 PostgreSQL.15 PostgreSQL (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.16/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.16).sql b/PostgreSQL.16/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.16).sql index 8a807945a2ed..d8308fe58dda 100644 --- a/PostgreSQL.16/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.16).sql +++ b/PostgreSQL.16/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.16).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/PostgreSQL.16/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.16).sql b/PostgreSQL.16/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.16).sql index 890febce9dc5..9c30bd40cb50 100644 --- a/PostgreSQL.16/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.16).sql +++ b/PostgreSQL.16/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.16).sql @@ -1,11 +1,11 @@ BeforeExecute -- PostgreSQL.16 PostgreSQL.15 PostgreSQL -WITH "CTE_1" AS +WITH "CTE_1" (c1) +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.16).sql b/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.16).sql index 8ced9ff0ba2d..51bcb13feb68 100644 --- a/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.16).sql +++ b/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.16).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.16).sql b/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.16).sql index 6efa06fb7945..5be092a2ef15 100644 --- a/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.16).sql +++ b/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.16).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.16).sql b/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.16).sql index 1156ecbf0a13..317d5616c4d7 100644 --- a/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.16).sql +++ b/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.16).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.16).sql b/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.16).sql index a188f8664608..c9692f448520 100644 --- a/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.16).sql +++ b/PostgreSQL.16/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.16).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.16/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.16).sql b/PostgreSQL.16/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.16).sql new file mode 100644 index 000000000000..7653e07b38ca --- /dev/null +++ b/PostgreSQL.16/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.16).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- PostgreSQL.16 PostgreSQL.15 PostgreSQL +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.16 PostgreSQL.15 PostgreSQL + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.16/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.16).sql b/PostgreSQL.16/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.16).sql new file mode 100644 index 000000000000..796b4c25a58a --- /dev/null +++ b/PostgreSQL.16/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.16).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- PostgreSQL.16 PostgreSQL.15 PostgreSQL +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.16 PostgreSQL.15 PostgreSQL + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + From 024c84d889c2ad98e1be9d4291514e97b54c79f2 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 19:13:41 +0200 Subject: [PATCH 34/42] [Linux / Oracle 21c] baselines --- ...s.Test5(Oracle.21.Managed.LinqService).sql | 36 +++++-------------- ...omCount(Oracle.21.Managed.LinqService).sql | 8 ++--- ...istinct(Oracle.21.Managed.LinqService).sql | 14 ++------ ...ctWhere(Oracle.21.Managed.LinqService).sql | 14 ++------ ...istinct(Oracle.21.Managed.LinqService).sql | 14 ++------ ...ctWhere(Oracle.21.Managed.LinqService).sql | 14 ++------ ...nctAll1(Oracle.21.Managed.LinqService).sql | 28 +++++++++++++++ ...nctAll2(Oracle.21.Managed.LinqService).sql | 29 +++++++++++++++ ...Linq.CteTests.Test5(Oracle.21.Managed).sql | 36 +++++-------------- ...sts.TestCustomCount(Oracle.21.Managed).sql | 8 ++--- ...s.InnerJoinDistinct(Oracle.21.Managed).sql | 14 ++------ ...erJoinDistinctWhere(Oracle.21.Managed).sql | 14 ++------ ...ts.LeftJoinDistinct(Oracle.21.Managed).sql | 14 ++------ ...ftJoinDistinctWhere(Oracle.21.Managed).sql | 14 ++------ ...OrderByDistinctAll1(Oracle.21.Managed).sql | 28 +++++++++++++++ ...OrderByDistinctAll2(Oracle.21.Managed).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 Oracle.21.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.21.Managed.LinqService).sql create mode 100644 Oracle.21.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.21.Managed.LinqService).sql create mode 100644 Oracle.21.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.21.Managed).sql create mode 100644 Oracle.21.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.21.Managed).sql diff --git a/Oracle.21.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.21.Managed.LinqService).sql b/Oracle.21.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.21.Managed.LinqService).sql index b5ce29deb418..766615587387 100644 --- a/Oracle.21.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.21.Managed.LinqService).sql +++ b/Oracle.21.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.21.Managed.LinqService).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/Oracle.21.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.21.Managed.LinqService).sql b/Oracle.21.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.21.Managed.LinqService).sql index de79d5dcd47d..dd3ab40c36a8 100644 --- a/Oracle.21.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.21.Managed.LinqService).sql +++ b/Oracle.21.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.21.Managed.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- Oracle.21.Managed Oracle.Managed Oracle12 (asynchronously) -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.21.Managed.LinqService).sql b/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.21.Managed.LinqService).sql index fa83f02e1927..2e8228a1bf55 100644 --- a/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.21.Managed.LinqService).sql +++ b/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.21.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.21.Managed.LinqService).sql b/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.21.Managed.LinqService).sql index f40deb19b52d..c33557fa86aa 100644 --- a/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.21.Managed.LinqService).sql +++ b/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.21.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.21.Managed.LinqService).sql b/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.21.Managed.LinqService).sql index 5d54e14548f3..4c58eb098faa 100644 --- a/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.21.Managed.LinqService).sql +++ b/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.21.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.21.Managed.LinqService).sql b/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.21.Managed.LinqService).sql index 0b3664527d43..124310573f8b 100644 --- a/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.21.Managed.LinqService).sql +++ b/Oracle.21.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.21.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.21.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.21.Managed.LinqService).sql b/Oracle.21.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.21.Managed.LinqService).sql new file mode 100644 index 000000000000..9bfbaddd853d --- /dev/null +++ b/Oracle.21.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.21.Managed.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Oracle.21.Managed Oracle.Managed Oracle12 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.21.Managed Oracle.Managed Oracle12 (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.21.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.21.Managed.LinqService).sql b/Oracle.21.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.21.Managed.LinqService).sql new file mode 100644 index 000000000000..4a5cc6011d80 --- /dev/null +++ b/Oracle.21.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.21.Managed.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Oracle.21.Managed Oracle.Managed Oracle12 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.21.Managed Oracle.Managed Oracle12 (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.21.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.21.Managed).sql b/Oracle.21.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.21.Managed).sql index 1c1ed8d7769f..0e47c824fd24 100644 --- a/Oracle.21.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.21.Managed).sql +++ b/Oracle.21.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.21.Managed).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/Oracle.21.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.21.Managed).sql b/Oracle.21.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.21.Managed).sql index 21b98997a38d..b00a779fe302 100644 --- a/Oracle.21.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.21.Managed).sql +++ b/Oracle.21.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.21.Managed).sql @@ -1,11 +1,11 @@ BeforeExecute -- Oracle.21.Managed Oracle.Managed Oracle12 -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.21.Managed).sql b/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.21.Managed).sql index 5a60e38e039c..5e13fdd2ab01 100644 --- a/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.21.Managed).sql +++ b/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.21.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.21.Managed).sql b/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.21.Managed).sql index d6c7702e35ca..41103ac9da2f 100644 --- a/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.21.Managed).sql +++ b/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.21.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.21.Managed).sql b/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.21.Managed).sql index 75bcbbfa441d..9732b421f5a5 100644 --- a/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.21.Managed).sql +++ b/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.21.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.21.Managed).sql b/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.21.Managed).sql index 4da818d95fa0..3fbf370084ba 100644 --- a/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.21.Managed).sql +++ b/Oracle.21.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.21.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.21.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.21.Managed).sql b/Oracle.21.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.21.Managed).sql new file mode 100644 index 000000000000..774c44056256 --- /dev/null +++ b/Oracle.21.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.21.Managed).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Oracle.21.Managed Oracle.Managed Oracle12 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.21.Managed Oracle.Managed Oracle12 + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.21.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.21.Managed).sql b/Oracle.21.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.21.Managed).sql new file mode 100644 index 000000000000..0699203c0c35 --- /dev/null +++ b/Oracle.21.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.21.Managed).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Oracle.21.Managed Oracle.Managed Oracle12 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.21.Managed Oracle.Managed Oracle12 + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + From 617c7e1142cdb18b2f4efcae361f96b7e308e4b8 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:14:05 +0000 Subject: [PATCH 35/42] [Linux / ClickHouse Octonica] baselines --- ...Test5(ClickHouse.Octonica.LinqService).sql | 36 +++++-------------- ...Count(ClickHouse.Octonica.LinqService).sql | 5 ++- ...tJoin(ClickHouse.Octonica.LinqService).sql | 16 ++------- ...tinct(ClickHouse.Octonica.LinqService).sql | 12 ++----- ...Where(ClickHouse.Octonica.LinqService).sql | 12 ++----- ...tinct(ClickHouse.Octonica.LinqService).sql | 12 ++----- ...Where(ClickHouse.Octonica.LinqService).sql | 12 ++----- ...tAll1(ClickHouse.Octonica.LinqService).sql | 24 +++++++++++++ ...tAll2(ClickHouse.Octonica.LinqService).sql | 25 +++++++++++++ ...nq.CteTests.Test5(ClickHouse.Octonica).sql | 36 +++++-------------- ...s.TestCustomCount(ClickHouse.Octonica).sql | 5 ++- ...ests.DistinctJoin(ClickHouse.Octonica).sql | 16 ++------- ...InnerJoinDistinct(ClickHouse.Octonica).sql | 12 ++----- ...JoinDistinctWhere(ClickHouse.Octonica).sql | 12 ++----- ....LeftJoinDistinct(ClickHouse.Octonica).sql | 12 ++----- ...JoinDistinctWhere(ClickHouse.Octonica).sql | 12 ++----- ...derByDistinctAll1(ClickHouse.Octonica).sql | 24 +++++++++++++ ...derByDistinctAll2(ClickHouse.Octonica).sql | 25 +++++++++++++ ...tConcurrentSelect(ClickHouse.Octonica).sql | 10 ++++++ 19 files changed, 156 insertions(+), 162 deletions(-) create mode 100644 ClickHouse.Octonica.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Octonica.LinqService).sql create mode 100644 ClickHouse.Octonica.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Octonica.LinqService).sql create mode 100644 ClickHouse.Octonica/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Octonica).sql create mode 100644 ClickHouse.Octonica/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Octonica).sql diff --git a/ClickHouse.Octonica.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Octonica.LinqService).sql b/ClickHouse.Octonica.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Octonica.LinqService).sql index ccd5928b2128..f94203c3b73c 100644 --- a/ClickHouse.Octonica.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Octonica.LinqService).sql +++ b/ClickHouse.Octonica.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Octonica.LinqService).sql @@ -4,17 +4,11 @@ WITH CTE_1 AS ( SELECT - t1.ParentID + c_1.ParentID FROM - ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) t1 + Child c_1 + WHERE + c_1.ParentID > 1 ) SELECT COUNT(*) @@ -30,22 +24,8 @@ SELECT COUNT(*) FROM Parent p - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) c_2 ON p.ParentID = c_2.ParentID - INNER JOIN ( - SELECT DISTINCT - c2.ParentID as ParentID, - c2.ChildID as ChildID - FROM - Child c2 - WHERE - c2.ParentID > 1 - ) c2_1 ON p.ParentID = c2_1.ParentID + INNER JOIN Child c_1 ON p.ParentID = c_1.ParentID + INNER JOIN Child c2 ON p.ParentID = c2.ParentID +WHERE + c_1.ParentID > 1 AND c2.ParentID > 1 diff --git a/ClickHouse.Octonica.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Octonica.LinqService).sql b/ClickHouse.Octonica.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Octonica.LinqService).sql index 1a3177d3a53b..19f013a1b342 100644 --- a/ClickHouse.Octonica.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Octonica.LinqService).sql +++ b/ClickHouse.Octonica.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Octonica.LinqService).sql @@ -3,9 +3,8 @@ WITH CTE_1 AS ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID + SELECT + 1 as c1 FROM Child c_1 WHERE diff --git a/ClickHouse.Octonica.LinqService/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Octonica.LinqService).sql b/ClickHouse.Octonica.LinqService/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Octonica.LinqService).sql index 9eb6009ef0f0..d0f3890c6481 100644 --- a/ClickHouse.Octonica.LinqService/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Octonica.LinqService).sql +++ b/ClickHouse.Octonica.LinqService/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Octonica.LinqService).sql @@ -5,18 +5,6 @@ SELECT e.ID, p.SmallIntValue FROM - ( - SELECT DISTINCT - t1.ID as ID, - t1.SmallIntValue as SmallIntValue - FROM - LinqDataTypes t1 - ) e - LEFT JOIN ( - SELECT DISTINCT - t2.ID as ID, - t2.SmallIntValue as SmallIntValue - FROM - LinqDataTypes t2 - ) p ON p.ID = e.ID + LinqDataTypes e + LEFT JOIN LinqDataTypes p ON p.ID = e.ID diff --git a/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Octonica.LinqService).sql b/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Octonica.LinqService).sql index 7acee19eab59..1cb84031c7e3 100644 --- a/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Octonica.LinqService).sql +++ b/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Octonica.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + INNER JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Octonica.LinqService).sql b/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Octonica.LinqService).sql index 6e2e10a6fb85..caa9af9a7d28 100644 --- a/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Octonica.LinqService).sql +++ b/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Octonica.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + INNER JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Octonica.LinqService).sql b/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Octonica.LinqService).sql index 3767b2162e5f..d89e3486089d 100644 --- a/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Octonica.LinqService).sql +++ b/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Octonica.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + LEFT JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Octonica.LinqService).sql b/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Octonica.LinqService).sql index c07913e118ce..e184af84c827 100644 --- a/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Octonica.LinqService).sql +++ b/ClickHouse.Octonica.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Octonica.LinqService).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + LEFT JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/ClickHouse.Octonica.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Octonica.LinqService).sql b/ClickHouse.Octonica.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Octonica.LinqService).sql new file mode 100644 index 000000000000..e0df1b72893e --- /dev/null +++ b/ClickHouse.Octonica.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Octonica.LinqService).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- ClickHouse.Octonica ClickHouse (asynchronously) + +SELECT + r.PersonID, + r.LastName +FROM + Person r +ORDER BY + r.FirstName +LIMIT 1, 2 + +BeforeExecute +-- ClickHouse.Octonica ClickHouse (asynchronously) + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/ClickHouse.Octonica.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Octonica.LinqService).sql b/ClickHouse.Octonica.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Octonica.LinqService).sql new file mode 100644 index 000000000000..07523a39c6a3 --- /dev/null +++ b/ClickHouse.Octonica.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Octonica.LinqService).sql @@ -0,0 +1,25 @@ +BeforeExecute +-- ClickHouse.Octonica ClickHouse (asynchronously) + +SELECT + r.PersonID, + r.LastName, + r.FirstName +FROM + Person r +ORDER BY + r.FirstName +LIMIT 1, 2 + +BeforeExecute +-- ClickHouse.Octonica ClickHouse (asynchronously) + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/ClickHouse.Octonica/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Octonica).sql b/ClickHouse.Octonica/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Octonica).sql index a2c166e71ab7..d101a184f758 100644 --- a/ClickHouse.Octonica/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Octonica).sql +++ b/ClickHouse.Octonica/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(ClickHouse.Octonica).sql @@ -4,17 +4,11 @@ WITH CTE_1 AS ( SELECT - t1.ParentID + c_1.ParentID FROM - ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) t1 + Child c_1 + WHERE + c_1.ParentID > 1 ) SELECT COUNT(*) @@ -30,22 +24,8 @@ SELECT COUNT(*) FROM Parent p - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - WHERE - c_1.ParentID > 1 - ) c_2 ON p.ParentID = c_2.ParentID - INNER JOIN ( - SELECT DISTINCT - c2.ParentID as ParentID, - c2.ChildID as ChildID - FROM - Child c2 - WHERE - c2.ParentID > 1 - ) c2_1 ON p.ParentID = c2_1.ParentID + INNER JOIN Child c_1 ON p.ParentID = c_1.ParentID + INNER JOIN Child c2 ON p.ParentID = c2.ParentID +WHERE + c_1.ParentID > 1 AND c2.ParentID > 1 diff --git a/ClickHouse.Octonica/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Octonica).sql b/ClickHouse.Octonica/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Octonica).sql index d43989fe8b5f..e6585ead85da 100644 --- a/ClickHouse.Octonica/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Octonica).sql +++ b/ClickHouse.Octonica/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(ClickHouse.Octonica).sql @@ -3,9 +3,8 @@ WITH CTE_1 AS ( - SELECT DISTINCT - c_1.ParentID, - c_1.ChildID + SELECT + 1 as c1 FROM Child c_1 WHERE diff --git a/ClickHouse.Octonica/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Octonica).sql b/ClickHouse.Octonica/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Octonica).sql index d7e9d73e19fa..969824b016cc 100644 --- a/ClickHouse.Octonica/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Octonica).sql +++ b/ClickHouse.Octonica/Tests/Linq/DistinctTests/Tests.Linq.DistinctTests.DistinctJoin(ClickHouse.Octonica).sql @@ -5,18 +5,6 @@ SELECT e.ID, p.SmallIntValue FROM - ( - SELECT DISTINCT - t1.ID as ID, - t1.SmallIntValue as SmallIntValue - FROM - LinqDataTypes t1 - ) e - LEFT JOIN ( - SELECT DISTINCT - t2.ID as ID, - t2.SmallIntValue as SmallIntValue - FROM - LinqDataTypes t2 - ) p ON p.ID = e.ID + LinqDataTypes e + LEFT JOIN LinqDataTypes p ON p.ID = e.ID diff --git a/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Octonica).sql b/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Octonica).sql index 1e96ab624086..4e047dee3732 100644 --- a/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Octonica).sql +++ b/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(ClickHouse.Octonica).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + INNER JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Octonica).sql b/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Octonica).sql index f95fd1ff16e7..6c0762908ea4 100644 --- a/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Octonica).sql +++ b/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(ClickHouse.Octonica).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - INNER JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + INNER JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Octonica).sql b/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Octonica).sql index 659424de2e17..94dae6c46340 100644 --- a/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Octonica).sql +++ b/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(ClickHouse.Octonica).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON o.ParentID = c_2.ParentID + LEFT JOIN Child c_1 ON o.ParentID = c_1.ParentID diff --git a/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Octonica).sql b/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Octonica).sql index 50cb7e228bba..201bdf876ee6 100644 --- a/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Octonica).sql +++ b/ClickHouse.Octonica/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(ClickHouse.Octonica).sql @@ -4,15 +4,9 @@ SELECT o.ParentID, o.Value1, - c_2.ParentID, - c_2.ChildID + c_1.ParentID, + c_1.ChildID FROM Parent o - LEFT JOIN ( - SELECT DISTINCT - c_1.ParentID as ParentID, - c_1.ChildID as ChildID - FROM - Child c_1 - ) c_2 ON c_2.ParentID = o.ParentID + LEFT JOIN Child c_1 ON c_1.ParentID = o.ParentID diff --git a/ClickHouse.Octonica/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Octonica).sql b/ClickHouse.Octonica/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Octonica).sql new file mode 100644 index 000000000000..289c79f954b7 --- /dev/null +++ b/ClickHouse.Octonica/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(ClickHouse.Octonica).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- ClickHouse.Octonica ClickHouse + +SELECT + r.PersonID, + r.LastName +FROM + Person r +ORDER BY + r.FirstName +LIMIT 1, 2 + +BeforeExecute +-- ClickHouse.Octonica ClickHouse + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/ClickHouse.Octonica/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Octonica).sql b/ClickHouse.Octonica/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Octonica).sql new file mode 100644 index 000000000000..9a4ed4942ceb --- /dev/null +++ b/ClickHouse.Octonica/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(ClickHouse.Octonica).sql @@ -0,0 +1,25 @@ +BeforeExecute +-- ClickHouse.Octonica ClickHouse + +SELECT + r.PersonID, + r.LastName, + r.FirstName +FROM + Person r +ORDER BY + r.FirstName +LIMIT 1, 2 + +BeforeExecute +-- ClickHouse.Octonica ClickHouse + +SELECT + t1.FirstName, + t1.PersonID, + t1.LastName, + t1.MiddleName, + t1.Gender +FROM + Person t1 + diff --git a/ClickHouse.Octonica/Tests/UserTests/Issue1174Tests/Tests.UserTests.Issue1174Tests.TestConcurrentSelect(ClickHouse.Octonica).sql b/ClickHouse.Octonica/Tests/UserTests/Issue1174Tests/Tests.UserTests.Issue1174Tests.TestConcurrentSelect(ClickHouse.Octonica).sql index 11b11eddecc8..9bc69c787db9 100644 --- a/ClickHouse.Octonica/Tests/UserTests/Issue1174Tests/Tests.UserTests.Issue1174Tests.TestConcurrentSelect(ClickHouse.Octonica).sql +++ b/ClickHouse.Octonica/Tests/UserTests/Issue1174Tests/Tests.UserTests.Issue1174Tests.TestConcurrentSelect(ClickHouse.Octonica).sql @@ -8,3 +8,13 @@ FROM User t1 LIMIT 1 +BeforeExecute +-- ClickHouse.Octonica ClickHouse (asynchronously) + +SELECT + t1.Id, + t1.Name +FROM + User t1 +LIMIT 1 + From 488106b252b0ead59c09b7dc0a8cf7f595a4ad79 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:14:22 +0000 Subject: [PATCH 36/42] [Linux / PostgreSQL 17] baselines --- ...Tests.Test5(PostgreSQL.17.LinqService).sql | 36 +++++-------------- ...CustomCount(PostgreSQL.17.LinqService).sql | 8 ++--- ...oinDistinct(PostgreSQL.17.LinqService).sql | 14 ++------ ...stinctWhere(PostgreSQL.17.LinqService).sql | 14 ++------ ...oinDistinct(PostgreSQL.17.LinqService).sql | 14 ++------ ...stinctWhere(PostgreSQL.17.LinqService).sql | 14 ++------ ...istinctAll1(PostgreSQL.17.LinqService).sql | 28 +++++++++++++++ ...istinctAll2(PostgreSQL.17.LinqService).sql | 29 +++++++++++++++ ...sts.Linq.CteTests.Test5(PostgreSQL.17).sql | 36 +++++-------------- ...teTests.TestCustomCount(PostgreSQL.17).sql | 8 ++--- ...Tests.InnerJoinDistinct(PostgreSQL.17).sql | 14 ++------ ....InnerJoinDistinctWhere(PostgreSQL.17).sql | 14 ++------ ...dTests.LeftJoinDistinct(PostgreSQL.17).sql | 14 ++------ ...s.LeftJoinDistinctWhere(PostgreSQL.17).sql | 14 ++------ ...sts.OrderByDistinctAll1(PostgreSQL.17).sql | 28 +++++++++++++++ ...sts.OrderByDistinctAll2(PostgreSQL.17).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 PostgreSQL.17.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.17.LinqService).sql create mode 100644 PostgreSQL.17.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.17.LinqService).sql create mode 100644 PostgreSQL.17/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.17).sql create mode 100644 PostgreSQL.17/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.17).sql diff --git a/PostgreSQL.17.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.17.LinqService).sql b/PostgreSQL.17.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.17.LinqService).sql index f027ef70f00f..81006189d2ce 100644 --- a/PostgreSQL.17.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.17.LinqService).sql +++ b/PostgreSQL.17.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.17.LinqService).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/PostgreSQL.17.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.17.LinqService).sql b/PostgreSQL.17.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.17.LinqService).sql index 3782faa41dbe..f8783ff3ba73 100644 --- a/PostgreSQL.17.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.17.LinqService).sql +++ b/PostgreSQL.17.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.17.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- PostgreSQL.17 PostgreSQL.15 PostgreSQL (asynchronously) -WITH "CTE_1" AS +WITH "CTE_1" (c1) +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.17.LinqService).sql b/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.17.LinqService).sql index 21f6cf049a17..5ffac33cbb56 100644 --- a/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.17.LinqService).sql +++ b/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.17.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.17.LinqService).sql b/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.17.LinqService).sql index 7bc01e6b776c..9e58b2a64cb0 100644 --- a/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.17.LinqService).sql +++ b/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.17.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.17.LinqService).sql b/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.17.LinqService).sql index e352c3ba5af9..a6d4404891af 100644 --- a/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.17.LinqService).sql +++ b/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.17.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.17.LinqService).sql b/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.17.LinqService).sql index 4b39afe73850..cf5af4c98301 100644 --- a/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.17.LinqService).sql +++ b/PostgreSQL.17.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.17.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.17.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.17.LinqService).sql b/PostgreSQL.17.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.17.LinqService).sql new file mode 100644 index 000000000000..891031a3928a --- /dev/null +++ b/PostgreSQL.17.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.17.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- PostgreSQL.17 PostgreSQL.15 PostgreSQL (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.17 PostgreSQL.15 PostgreSQL (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.17.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.17.LinqService).sql b/PostgreSQL.17.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.17.LinqService).sql new file mode 100644 index 000000000000..315d08634492 --- /dev/null +++ b/PostgreSQL.17.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.17.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- PostgreSQL.17 PostgreSQL.15 PostgreSQL (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.17 PostgreSQL.15 PostgreSQL (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.17/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.17).sql b/PostgreSQL.17/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.17).sql index fb4ccd6829b2..3aa80fdf5098 100644 --- a/PostgreSQL.17/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.17).sql +++ b/PostgreSQL.17/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.17).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/PostgreSQL.17/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.17).sql b/PostgreSQL.17/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.17).sql index b2d25ce8a5be..89ca01f5eddc 100644 --- a/PostgreSQL.17/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.17).sql +++ b/PostgreSQL.17/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.17).sql @@ -1,11 +1,11 @@ BeforeExecute -- PostgreSQL.17 PostgreSQL.15 PostgreSQL -WITH "CTE_1" AS +WITH "CTE_1" (c1) +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.17).sql b/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.17).sql index 59e3e8f5bdab..b9ca4532093d 100644 --- a/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.17).sql +++ b/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.17).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.17).sql b/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.17).sql index 0a0738b6023d..691e794ec77c 100644 --- a/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.17).sql +++ b/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.17).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.17).sql b/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.17).sql index bd6d5ee153b9..50f15082d801 100644 --- a/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.17).sql +++ b/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.17).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.17).sql b/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.17).sql index 0e8982e9f582..37e4fc05ecc5 100644 --- a/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.17).sql +++ b/PostgreSQL.17/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.17).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.17/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.17).sql b/PostgreSQL.17/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.17).sql new file mode 100644 index 000000000000..7a0da55d8b40 --- /dev/null +++ b/PostgreSQL.17/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.17).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- PostgreSQL.17 PostgreSQL.15 PostgreSQL +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.17 PostgreSQL.15 PostgreSQL + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.17/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.17).sql b/PostgreSQL.17/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.17).sql new file mode 100644 index 000000000000..a83c422ea4bc --- /dev/null +++ b/PostgreSQL.17/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.17).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- PostgreSQL.17 PostgreSQL.15 PostgreSQL +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.17 PostgreSQL.15 PostgreSQL + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + From c68819cf5706a1b25406650a8958a44e44415177 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 19:16:01 +0200 Subject: [PATCH 37/42] [Linux / Oracle 19c] baselines --- ...s.Test5(Oracle.19.Managed.LinqService).sql | 36 +++++-------------- ...omCount(Oracle.19.Managed.LinqService).sql | 8 ++--- ...istinct(Oracle.19.Managed.LinqService).sql | 14 ++------ ...ctWhere(Oracle.19.Managed.LinqService).sql | 14 ++------ ...istinct(Oracle.19.Managed.LinqService).sql | 14 ++------ ...ctWhere(Oracle.19.Managed.LinqService).sql | 14 ++------ ...nctAll1(Oracle.19.Managed.LinqService).sql | 28 +++++++++++++++ ...nctAll2(Oracle.19.Managed.LinqService).sql | 29 +++++++++++++++ ...Linq.CteTests.Test5(Oracle.19.Managed).sql | 36 +++++-------------- ...sts.TestCustomCount(Oracle.19.Managed).sql | 8 ++--- ...s.InnerJoinDistinct(Oracle.19.Managed).sql | 14 ++------ ...erJoinDistinctWhere(Oracle.19.Managed).sql | 14 ++------ ...ts.LeftJoinDistinct(Oracle.19.Managed).sql | 14 ++------ ...ftJoinDistinctWhere(Oracle.19.Managed).sql | 14 ++------ ...OrderByDistinctAll1(Oracle.19.Managed).sql | 28 +++++++++++++++ ...OrderByDistinctAll2(Oracle.19.Managed).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 Oracle.19.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.19.Managed.LinqService).sql create mode 100644 Oracle.19.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.19.Managed.LinqService).sql create mode 100644 Oracle.19.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.19.Managed).sql create mode 100644 Oracle.19.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.19.Managed).sql diff --git a/Oracle.19.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.19.Managed.LinqService).sql b/Oracle.19.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.19.Managed.LinqService).sql index a5f98fd63023..626cf691c1ff 100644 --- a/Oracle.19.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.19.Managed.LinqService).sql +++ b/Oracle.19.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.19.Managed.LinqService).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/Oracle.19.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.19.Managed.LinqService).sql b/Oracle.19.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.19.Managed.LinqService).sql index adfe2ddeb5b4..0888dd427cb2 100644 --- a/Oracle.19.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.19.Managed.LinqService).sql +++ b/Oracle.19.Managed.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.19.Managed.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- Oracle.19.Managed Oracle.Managed Oracle12 (asynchronously) -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.19.Managed.LinqService).sql b/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.19.Managed.LinqService).sql index 78007715c393..6a9ba6098412 100644 --- a/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.19.Managed.LinqService).sql +++ b/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.19.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.19.Managed.LinqService).sql b/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.19.Managed.LinqService).sql index e44b841a5ab8..67e583550959 100644 --- a/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.19.Managed.LinqService).sql +++ b/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.19.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.19.Managed.LinqService).sql b/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.19.Managed.LinqService).sql index 96512b80bb8b..baa884537153 100644 --- a/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.19.Managed.LinqService).sql +++ b/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.19.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.19.Managed.LinqService).sql b/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.19.Managed.LinqService).sql index 14170f0d932c..42114115899d 100644 --- a/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.19.Managed.LinqService).sql +++ b/Oracle.19.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.19.Managed.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.19.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.19.Managed.LinqService).sql b/Oracle.19.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.19.Managed.LinqService).sql new file mode 100644 index 000000000000..d35b380b34b8 --- /dev/null +++ b/Oracle.19.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.19.Managed.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Oracle.19.Managed Oracle.Managed Oracle12 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.19.Managed Oracle.Managed Oracle12 (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.19.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.19.Managed.LinqService).sql b/Oracle.19.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.19.Managed.LinqService).sql new file mode 100644 index 000000000000..39954474011d --- /dev/null +++ b/Oracle.19.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.19.Managed.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Oracle.19.Managed Oracle.Managed Oracle12 (asynchronously) +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.19.Managed Oracle.Managed Oracle12 (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.19.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.19.Managed).sql b/Oracle.19.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.19.Managed).sql index c1e83f781994..2f0b62501e54 100644 --- a/Oracle.19.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.19.Managed).sql +++ b/Oracle.19.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(Oracle.19.Managed).sql @@ -5,17 +5,11 @@ WITH CTE_1 ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/Oracle.19.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.19.Managed).sql b/Oracle.19.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.19.Managed).sql index f782e5fee3f6..f80c79e43449 100644 --- a/Oracle.19.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.19.Managed).sql +++ b/Oracle.19.Managed/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(Oracle.19.Managed).sql @@ -1,11 +1,11 @@ BeforeExecute -- Oracle.19.Managed Oracle.Managed Oracle12 -WITH CTE_1 AS +WITH CTE_1 ("c1") +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.19.Managed).sql b/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.19.Managed).sql index 69c0ed5fc695..56df10be2967 100644 --- a/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.19.Managed).sql +++ b/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Oracle.19.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.19.Managed).sql b/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.19.Managed).sql index 683789229d1a..d3dc8731443c 100644 --- a/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.19.Managed).sql +++ b/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Oracle.19.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - CROSS APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.19.Managed).sql b/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.19.Managed).sql index 014b82c8256b..e57f96afd0f6 100644 --- a/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.19.Managed).sql +++ b/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Oracle.19.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.19.Managed).sql b/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.19.Managed).sql index 8e4eb1e2948e..5c5004f8decd 100644 --- a/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.19.Managed).sql +++ b/Oracle.19.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Oracle.19.Managed).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - OUTER APPLY ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/Oracle.19.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.19.Managed).sql b/Oracle.19.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.19.Managed).sql new file mode 100644 index 000000000000..6e947ac1391f --- /dev/null +++ b/Oracle.19.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Oracle.19.Managed).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- Oracle.19.Managed Oracle.Managed Oracle12 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.19.Managed Oracle.Managed Oracle12 + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/Oracle.19.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.19.Managed).sql b/Oracle.19.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.19.Managed).sql new file mode 100644 index 000000000000..c7cf0532386f --- /dev/null +++ b/Oracle.19.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Oracle.19.Managed).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- Oracle.19.Managed Oracle.Managed Oracle12 +DECLARE @skip Int32 +SET @skip = 1 +DECLARE @take Int32 +SET @take = 2 + +SELECT + r."PersonID" as ID, + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +OFFSET :skip ROWS FETCH NEXT :take ROWS ONLY + +BeforeExecute +-- Oracle.19.Managed Oracle.Managed Oracle12 + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + From 6483e3a6fac4d4a6d63816f295d46533077727cb Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:16:14 +0000 Subject: [PATCH 38/42] [Linux / PostgreSQL 18] baselines --- ...Tests.Test5(PostgreSQL.18.LinqService).sql | 36 +++++-------------- ...CustomCount(PostgreSQL.18.LinqService).sql | 8 ++--- ...oinDistinct(PostgreSQL.18.LinqService).sql | 14 ++------ ...stinctWhere(PostgreSQL.18.LinqService).sql | 14 ++------ ...oinDistinct(PostgreSQL.18.LinqService).sql | 14 ++------ ...stinctWhere(PostgreSQL.18.LinqService).sql | 14 ++------ ...istinctAll1(PostgreSQL.18.LinqService).sql | 28 +++++++++++++++ ...istinctAll2(PostgreSQL.18.LinqService).sql | 29 +++++++++++++++ ...sts.Linq.CteTests.Test5(PostgreSQL.18).sql | 36 +++++-------------- ...teTests.TestCustomCount(PostgreSQL.18).sql | 8 ++--- ...Tests.InnerJoinDistinct(PostgreSQL.18).sql | 14 ++------ ....InnerJoinDistinctWhere(PostgreSQL.18).sql | 14 ++------ ...dTests.LeftJoinDistinct(PostgreSQL.18).sql | 14 ++------ ...s.LeftJoinDistinctWhere(PostgreSQL.18).sql | 14 ++------ ...sts.OrderByDistinctAll1(PostgreSQL.18).sql | 28 +++++++++++++++ ...sts.OrderByDistinctAll2(PostgreSQL.18).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 PostgreSQL.18.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.18.LinqService).sql create mode 100644 PostgreSQL.18.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.18.LinqService).sql create mode 100644 PostgreSQL.18/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.18).sql create mode 100644 PostgreSQL.18/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.18).sql diff --git a/PostgreSQL.18.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.18.LinqService).sql b/PostgreSQL.18.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.18.LinqService).sql index c2fdd95206f7..f3a4d980b758 100644 --- a/PostgreSQL.18.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.18.LinqService).sql +++ b/PostgreSQL.18.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.18.LinqService).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/PostgreSQL.18.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.18.LinqService).sql b/PostgreSQL.18.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.18.LinqService).sql index 501bbb387b97..0a965dc3deff 100644 --- a/PostgreSQL.18.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.18.LinqService).sql +++ b/PostgreSQL.18.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.18.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- PostgreSQL.18 PostgreSQL (asynchronously) -WITH "CTE_1" AS +WITH "CTE_1" (c1) +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.18.LinqService).sql b/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.18.LinqService).sql index edb9ee6f7d41..81bfa3aaaa60 100644 --- a/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.18.LinqService).sql +++ b/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.18.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.18.LinqService).sql b/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.18.LinqService).sql index 8a1c524d2883..cdc728110f52 100644 --- a/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.18.LinqService).sql +++ b/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.18.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.18.LinqService).sql b/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.18.LinqService).sql index 99a3ba66b5b5..21259c1e68e7 100644 --- a/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.18.LinqService).sql +++ b/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.18.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.18.LinqService).sql b/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.18.LinqService).sql index a1022ab45617..cb0ed9586855 100644 --- a/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.18.LinqService).sql +++ b/PostgreSQL.18.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.18.LinqService).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.18.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.18.LinqService).sql b/PostgreSQL.18.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.18.LinqService).sql new file mode 100644 index 000000000000..0616a379a1cf --- /dev/null +++ b/PostgreSQL.18.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.18.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- PostgreSQL.18 PostgreSQL (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.18 PostgreSQL (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.18.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.18.LinqService).sql b/PostgreSQL.18.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.18.LinqService).sql new file mode 100644 index 000000000000..9d768cbac729 --- /dev/null +++ b/PostgreSQL.18.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.18.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- PostgreSQL.18 PostgreSQL (asynchronously) +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.18 PostgreSQL (asynchronously) + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.18/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.18).sql b/PostgreSQL.18/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.18).sql index e5e894c64874..dc6832c4d342 100644 --- a/PostgreSQL.18/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.18).sql +++ b/PostgreSQL.18/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(PostgreSQL.18).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - t1."ParentID" + c_1."ParentID" FROM - ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) t1 + "Child" c_1 + WHERE + c_1."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" p - INNER JOIN ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" > 1 - ) c_2 ON p."ParentID" = c_2."ParentID" - INNER JOIN ( - SELECT DISTINCT - c2."ParentID", - c2."ChildID" - FROM - "Child" c2 - WHERE - c2."ParentID" > 1 - ) c2_1 ON p."ParentID" = c2_1."ParentID" + INNER JOIN "Child" c_1 ON p."ParentID" = c_1."ParentID" + INNER JOIN "Child" c2 ON p."ParentID" = c2."ParentID" +WHERE + c_1."ParentID" > 1 AND c2."ParentID" > 1 diff --git a/PostgreSQL.18/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.18).sql b/PostgreSQL.18/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.18).sql index e9def1bdf5a5..8766e4cc1525 100644 --- a/PostgreSQL.18/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.18).sql +++ b/PostgreSQL.18/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(PostgreSQL.18).sql @@ -1,11 +1,11 @@ BeforeExecute -- PostgreSQL.18 PostgreSQL -WITH "CTE_1" AS +WITH "CTE_1" (c1) +AS ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" + SELECT + 1 FROM "Child" c_1 WHERE diff --git a/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.18).sql b/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.18).sql index ceb358fc330a..fe0c0559be3a 100644 --- a/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.18).sql +++ b/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(PostgreSQL.18).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.18).sql b/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.18).sql index 5c77681c82a0..91c47da13599 100644 --- a/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.18).sql +++ b/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(PostgreSQL.18).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - INNER JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + INNER JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.18).sql b/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.18).sql index 57a1b4057584..26c9a31b7bb1 100644 --- a/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.18).sql +++ b/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(PostgreSQL.18).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - o."ParentID" = c_1."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON o."ParentID" = c_1."ParentID" diff --git a/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.18).sql b/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.18).sql index 5588b4cbdb12..4353ec334b36 100644 --- a/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.18).sql +++ b/PostgreSQL.18/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(PostgreSQL.18).sql @@ -4,17 +4,9 @@ SELECT o."ParentID", o."Value1", - c_2."ParentID", - c_2."ChildID" + c_1."ParentID", + c_1."ChildID" FROM "Parent" o - LEFT JOIN LATERAL ( - SELECT DISTINCT - c_1."ParentID", - c_1."ChildID" - FROM - "Child" c_1 - WHERE - c_1."ParentID" = o."ParentID" - ) c_2 ON 1=1 + LEFT JOIN "Child" c_1 ON c_1."ParentID" = o."ParentID" diff --git a/PostgreSQL.18/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.18).sql b/PostgreSQL.18/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.18).sql new file mode 100644 index 000000000000..14c7b393d1bb --- /dev/null +++ b/PostgreSQL.18/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(PostgreSQL.18).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- PostgreSQL.18 PostgreSQL +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.18 PostgreSQL + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + diff --git a/PostgreSQL.18/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.18).sql b/PostgreSQL.18/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.18).sql new file mode 100644 index 000000000000..d8a294226431 --- /dev/null +++ b/PostgreSQL.18/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(PostgreSQL.18).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- PostgreSQL.18 PostgreSQL +DECLARE @take Integer -- Int32 +SET @take = 2 +DECLARE @skip Integer -- Int32 +SET @skip = 1 + +SELECT + r."PersonID", + r."LastName", + r."FirstName" +FROM + "Person" r +ORDER BY + r."FirstName" +LIMIT :take OFFSET :skip + +BeforeExecute +-- PostgreSQL.18 PostgreSQL + +SELECT + t1."FirstName", + t1."PersonID", + t1."LastName", + t1."MiddleName", + t1."Gender" +FROM + "Person" t1 + From 0fcc08ffde04c49070841581aa1331476546f9dd Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:24:03 +0000 Subject: [PATCH 39/42] [Windows / SQL Server EXTRAS] baselines --- ...Test5(SqlServer.Contained.LinqService).sql | 36 +++++-------------- ...Count(SqlServer.Contained.LinqService).sql | 8 ++--- ...tinct(SqlServer.Contained.LinqService).sql | 14 ++------ ...Where(SqlServer.Contained.LinqService).sql | 14 ++------ ...tinct(SqlServer.Contained.LinqService).sql | 14 ++------ ...Where(SqlServer.Contained.LinqService).sql | 14 ++------ ...tAll1(SqlServer.Contained.LinqService).sql | 28 +++++++++++++++ ...tAll2(SqlServer.Contained.LinqService).sql | 29 +++++++++++++++ ...t5(SqlServer.Contained.MS.LinqService).sql | 36 +++++-------------- ...nt(SqlServer.Contained.MS.LinqService).sql | 8 ++--- ...ct(SqlServer.Contained.MS.LinqService).sql | 14 ++------ ...re(SqlServer.Contained.MS.LinqService).sql | 14 ++------ ...ct(SqlServer.Contained.MS.LinqService).sql | 14 ++------ ...re(SqlServer.Contained.MS.LinqService).sql | 14 ++------ ...l1(SqlServer.Contained.MS.LinqService).sql | 28 +++++++++++++++ ...l2(SqlServer.Contained.MS.LinqService).sql | 29 +++++++++++++++ ...CteTests.Test5(SqlServer.Contained.MS).sql | 36 +++++-------------- ...estCustomCount(SqlServer.Contained.MS).sql | 8 ++--- ...erJoinDistinct(SqlServer.Contained.MS).sql | 14 ++------ ...nDistinctWhere(SqlServer.Contained.MS).sql | 14 ++------ ...ftJoinDistinct(SqlServer.Contained.MS).sql | 14 ++------ ...nDistinctWhere(SqlServer.Contained.MS).sql | 14 ++------ ...ByDistinctAll1(SqlServer.Contained.MS).sql | 28 +++++++++++++++ ...ByDistinctAll2(SqlServer.Contained.MS).sql | 29 +++++++++++++++ ...nq.CteTests.Test5(SqlServer.Contained).sql | 36 +++++-------------- ...s.TestCustomCount(SqlServer.Contained).sql | 8 ++--- ...InnerJoinDistinct(SqlServer.Contained).sql | 14 ++------ ...JoinDistinctWhere(SqlServer.Contained).sql | 14 ++------ ....LeftJoinDistinct(SqlServer.Contained).sql | 14 ++------ ...JoinDistinctWhere(SqlServer.Contained).sql | 14 ++------ ...derByDistinctAll1(SqlServer.Contained).sql | 28 +++++++++++++++ ...derByDistinctAll2(SqlServer.Contained).sql | 29 +++++++++++++++ ...eTests.Test5(SqlServer.SA.LinqService).sql | 36 +++++-------------- ...tCustomCount(SqlServer.SA.LinqService).sql | 8 ++--- ...JoinDistinct(SqlServer.SA.LinqService).sql | 14 ++------ ...istinctWhere(SqlServer.SA.LinqService).sql | 14 ++------ ...JoinDistinct(SqlServer.SA.LinqService).sql | 14 ++------ ...istinctWhere(SqlServer.SA.LinqService).sql | 14 ++------ ...DistinctAll1(SqlServer.SA.LinqService).sql | 28 +++++++++++++++ ...DistinctAll2(SqlServer.SA.LinqService).sql | 29 +++++++++++++++ ...sts.Test5(SqlServer.SA.MS.LinqService).sql | 36 +++++-------------- ...stomCount(SqlServer.SA.MS.LinqService).sql | 8 ++--- ...nDistinct(SqlServer.SA.MS.LinqService).sql | 14 ++------ ...inctWhere(SqlServer.SA.MS.LinqService).sql | 14 ++------ ...nDistinct(SqlServer.SA.MS.LinqService).sql | 14 ++------ ...inctWhere(SqlServer.SA.MS.LinqService).sql | 14 ++------ ...tinctAll1(SqlServer.SA.MS.LinqService).sql | 28 +++++++++++++++ ...tinctAll2(SqlServer.SA.MS.LinqService).sql | 29 +++++++++++++++ ...s.Linq.CteTests.Test5(SqlServer.SA.MS).sql | 36 +++++-------------- ...Tests.TestCustomCount(SqlServer.SA.MS).sql | 8 ++--- ...sts.InnerJoinDistinct(SqlServer.SA.MS).sql | 14 ++------ ...nnerJoinDistinctWhere(SqlServer.SA.MS).sql | 14 ++------ ...ests.LeftJoinDistinct(SqlServer.SA.MS).sql | 14 ++------ ...LeftJoinDistinctWhere(SqlServer.SA.MS).sql | 14 ++------ ...s.OrderByDistinctAll1(SqlServer.SA.MS).sql | 28 +++++++++++++++ ...s.OrderByDistinctAll2(SqlServer.SA.MS).sql | 29 +++++++++++++++ ...ests.Linq.CteTests.Test5(SqlServer.SA).sql | 36 +++++-------------- ...CteTests.TestCustomCount(SqlServer.SA).sql | 8 ++--- ...dTests.InnerJoinDistinct(SqlServer.SA).sql | 14 ++------ ...s.InnerJoinDistinctWhere(SqlServer.SA).sql | 14 ++------ ...edTests.LeftJoinDistinct(SqlServer.SA).sql | 14 ++------ ...ts.LeftJoinDistinctWhere(SqlServer.SA).sql | 14 ++------ ...ests.OrderByDistinctAll1(SqlServer.SA).sql | 28 +++++++++++++++ ...ests.OrderByDistinctAll2(SqlServer.SA).sql | 29 +++++++++++++++ 64 files changed, 648 insertions(+), 608 deletions(-) create mode 100644 SqlServer.Contained.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained.LinqService).sql create mode 100644 SqlServer.Contained.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained.LinqService).sql create mode 100644 SqlServer.Contained.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained.MS.LinqService).sql create mode 100644 SqlServer.Contained.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained.MS.LinqService).sql create mode 100644 SqlServer.Contained.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained.MS).sql create mode 100644 SqlServer.Contained.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained.MS).sql create mode 100644 SqlServer.Contained/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained).sql create mode 100644 SqlServer.Contained/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained).sql create mode 100644 SqlServer.SA.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA.LinqService).sql create mode 100644 SqlServer.SA.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA.LinqService).sql create mode 100644 SqlServer.SA.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA.MS.LinqService).sql create mode 100644 SqlServer.SA.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA.MS.LinqService).sql create mode 100644 SqlServer.SA.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA.MS).sql create mode 100644 SqlServer.SA.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA.MS).sql create mode 100644 SqlServer.SA/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA).sql create mode 100644 SqlServer.SA/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA).sql diff --git a/SqlServer.Contained.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained.LinqService).sql b/SqlServer.Contained.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained.LinqService).sql index 143358dfc0cd..9586d79bccfa 100644 --- a/SqlServer.Contained.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained.LinqService).sql +++ b/SqlServer.Contained.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.Contained.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained.LinqService).sql b/SqlServer.Contained.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained.LinqService).sql index 4537730a795c..72d64f5e88b7 100644 --- a/SqlServer.Contained.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained.LinqService).sql +++ b/SqlServer.Contained.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.Contained SqlServer.2019 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained.LinqService).sql b/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained.LinqService).sql index 775ed6465101..5453ce3203f5 100644 --- a/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained.LinqService).sql +++ b/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained.LinqService).sql b/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained.LinqService).sql index c824d1accdd6..562804803301 100644 --- a/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained.LinqService).sql +++ b/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained.LinqService).sql b/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained.LinqService).sql index f67311d59b15..3911c74c7c11 100644 --- a/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained.LinqService).sql +++ b/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained.LinqService).sql b/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained.LinqService).sql index 23049f53b2fa..140a4ab9043c 100644 --- a/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained.LinqService).sql +++ b/SqlServer.Contained.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.Contained.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained.LinqService).sql b/SqlServer.Contained.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained.LinqService).sql new file mode 100644 index 000000000000..cc346710c4de --- /dev/null +++ b/SqlServer.Contained.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.Contained SqlServer.2019 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.Contained SqlServer.2019 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.Contained.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained.LinqService).sql b/SqlServer.Contained.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained.LinqService).sql new file mode 100644 index 000000000000..898525e57eb0 --- /dev/null +++ b/SqlServer.Contained.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.Contained SqlServer.2019 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.Contained SqlServer.2019 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.Contained.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained.MS.LinqService).sql b/SqlServer.Contained.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained.MS.LinqService).sql index 12c6c2f3862d..167b509924f1 100644 --- a/SqlServer.Contained.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained.MS.LinqService).sql +++ b/SqlServer.Contained.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained.MS.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.Contained.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained.MS.LinqService).sql b/SqlServer.Contained.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained.MS.LinqService).sql index b6165d4a8178..96ee2560156a 100644 --- a/SqlServer.Contained.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained.MS.LinqService).sql +++ b/SqlServer.Contained.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained.MS.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.Contained.MS SqlServer.2019 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained.MS.LinqService).sql b/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained.MS.LinqService).sql index f23966903aaf..49aac4bcfe33 100644 --- a/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained.MS.LinqService).sql +++ b/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained.MS.LinqService).sql b/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained.MS.LinqService).sql index 60fb05bb1588..fcd6c3340b2f 100644 --- a/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained.MS.LinqService).sql +++ b/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained.MS.LinqService).sql b/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained.MS.LinqService).sql index abbd48276260..367fc7e781c2 100644 --- a/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained.MS.LinqService).sql +++ b/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained.MS.LinqService).sql b/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained.MS.LinqService).sql index 183ced96c0f4..494872de5265 100644 --- a/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained.MS.LinqService).sql +++ b/SqlServer.Contained.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.Contained.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained.MS.LinqService).sql b/SqlServer.Contained.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained.MS.LinqService).sql new file mode 100644 index 000000000000..2b1402db59ee --- /dev/null +++ b/SqlServer.Contained.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained.MS.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.Contained.MS SqlServer.2019 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.Contained.MS SqlServer.2019 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.Contained.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained.MS.LinqService).sql b/SqlServer.Contained.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained.MS.LinqService).sql new file mode 100644 index 000000000000..306e29a22e64 --- /dev/null +++ b/SqlServer.Contained.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained.MS.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.Contained.MS SqlServer.2019 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.Contained.MS SqlServer.2019 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.Contained.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained.MS).sql b/SqlServer.Contained.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained.MS).sql index 5494b2207b14..779be22d7fe2 100644 --- a/SqlServer.Contained.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained.MS).sql +++ b/SqlServer.Contained.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained.MS).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.Contained.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained.MS).sql b/SqlServer.Contained.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained.MS).sql index f1d69c7599a9..ff136827071e 100644 --- a/SqlServer.Contained.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained.MS).sql +++ b/SqlServer.Contained.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained.MS).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.Contained.MS SqlServer.2019 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained.MS).sql b/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained.MS).sql index 25d0e7409c78..94487784e1aa 100644 --- a/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained.MS).sql +++ b/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained.MS).sql b/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained.MS).sql index bd0745237a3d..bfb76b0385f5 100644 --- a/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained.MS).sql +++ b/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained.MS).sql b/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained.MS).sql index 8d0f4045e18d..e814404d42e7 100644 --- a/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained.MS).sql +++ b/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained.MS).sql b/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained.MS).sql index e7ef2c7921cb..fd41fe73e1ec 100644 --- a/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained.MS).sql +++ b/SqlServer.Contained.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.Contained.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained.MS).sql b/SqlServer.Contained.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained.MS).sql new file mode 100644 index 000000000000..6b08193c3a35 --- /dev/null +++ b/SqlServer.Contained.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained.MS).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.Contained.MS SqlServer.2019 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.Contained.MS SqlServer.2019 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.Contained.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained.MS).sql b/SqlServer.Contained.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained.MS).sql new file mode 100644 index 000000000000..836c739cbc74 --- /dev/null +++ b/SqlServer.Contained.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained.MS).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.Contained.MS SqlServer.2019 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.Contained.MS SqlServer.2019 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.Contained/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained).sql b/SqlServer.Contained/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained).sql index 953171a74497..064902d012b0 100644 --- a/SqlServer.Contained/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained).sql +++ b/SqlServer.Contained/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.Contained).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.Contained/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained).sql b/SqlServer.Contained/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained).sql index e2dfef815302..ef869e9aeaa6 100644 --- a/SqlServer.Contained/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained).sql +++ b/SqlServer.Contained/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.Contained).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.Contained SqlServer.2019 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained).sql b/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained).sql index 3ff26e80806a..ad7c17076f7d 100644 --- a/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained).sql +++ b/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.Contained).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained).sql b/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained).sql index bfa0be2e9fb0..610c26fb85f1 100644 --- a/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained).sql +++ b/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.Contained).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained).sql b/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained).sql index f121271c6209..7bf4b79b3d0c 100644 --- a/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained).sql +++ b/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.Contained).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained).sql b/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained).sql index 8deb1cc35c5f..a39669380892 100644 --- a/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained).sql +++ b/SqlServer.Contained/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.Contained).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.Contained/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained).sql b/SqlServer.Contained/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained).sql new file mode 100644 index 000000000000..bec61370247e --- /dev/null +++ b/SqlServer.Contained/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.Contained).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.Contained SqlServer.2019 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.Contained SqlServer.2019 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.Contained/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained).sql b/SqlServer.Contained/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained).sql new file mode 100644 index 000000000000..f26dcc9c3cd6 --- /dev/null +++ b/SqlServer.Contained/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.Contained).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.Contained SqlServer.2019 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.Contained SqlServer.2019 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.SA.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA.LinqService).sql b/SqlServer.SA.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA.LinqService).sql index 20b62720461c..db24dbcf546d 100644 --- a/SqlServer.SA.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA.LinqService).sql +++ b/SqlServer.SA.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.SA.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA.LinqService).sql b/SqlServer.SA.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA.LinqService).sql index 334fb85d386f..b9b4b8b6ea36 100644 --- a/SqlServer.SA.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA.LinqService).sql +++ b/SqlServer.SA.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.SA SqlServer.2019 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA.LinqService).sql b/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA.LinqService).sql index 90331fe98a6c..3056442900cc 100644 --- a/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA.LinqService).sql +++ b/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA.LinqService).sql b/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA.LinqService).sql index 91dcb9732af3..146a711dd211 100644 --- a/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA.LinqService).sql +++ b/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA.LinqService).sql b/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA.LinqService).sql index 755eb77f7361..8784b2948535 100644 --- a/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA.LinqService).sql +++ b/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA.LinqService).sql b/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA.LinqService).sql index 434d1ae39749..b20b461233db 100644 --- a/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA.LinqService).sql +++ b/SqlServer.SA.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.SA.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA.LinqService).sql b/SqlServer.SA.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA.LinqService).sql new file mode 100644 index 000000000000..36866e9c5926 --- /dev/null +++ b/SqlServer.SA.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.SA SqlServer.2019 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.SA SqlServer.2019 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.SA.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA.LinqService).sql b/SqlServer.SA.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA.LinqService).sql new file mode 100644 index 000000000000..011373362f53 --- /dev/null +++ b/SqlServer.SA.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.SA SqlServer.2019 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.SA SqlServer.2019 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.SA.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA.MS.LinqService).sql b/SqlServer.SA.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA.MS.LinqService).sql index f0f7d4bde4ec..3ef220e6054c 100644 --- a/SqlServer.SA.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA.MS.LinqService).sql +++ b/SqlServer.SA.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA.MS.LinqService).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.SA.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA.MS.LinqService).sql b/SqlServer.SA.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA.MS.LinqService).sql index e2e386c4c292..64d90bf2600f 100644 --- a/SqlServer.SA.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA.MS.LinqService).sql +++ b/SqlServer.SA.MS.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA.MS.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.SA.MS SqlServer.2019 (asynchronously) -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA.MS.LinqService).sql b/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA.MS.LinqService).sql index 64812bdcaf27..5c1d7f5b3e1f 100644 --- a/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA.MS.LinqService).sql +++ b/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA.MS.LinqService).sql b/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA.MS.LinqService).sql index ca3338d535e0..085ddbea3d71 100644 --- a/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA.MS.LinqService).sql +++ b/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA.MS.LinqService).sql b/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA.MS.LinqService).sql index 726d9197789b..bb2be6e11161 100644 --- a/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA.MS.LinqService).sql +++ b/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA.MS.LinqService).sql b/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA.MS.LinqService).sql index d1c98071d81d..779bd567daaf 100644 --- a/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA.MS.LinqService).sql +++ b/SqlServer.SA.MS.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA.MS.LinqService).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.SA.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA.MS.LinqService).sql b/SqlServer.SA.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA.MS.LinqService).sql new file mode 100644 index 000000000000..0c52176afba6 --- /dev/null +++ b/SqlServer.SA.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA.MS.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.SA.MS SqlServer.2019 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.SA.MS SqlServer.2019 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.SA.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA.MS.LinqService).sql b/SqlServer.SA.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA.MS.LinqService).sql new file mode 100644 index 000000000000..53a939a794ea --- /dev/null +++ b/SqlServer.SA.MS.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA.MS.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.SA.MS SqlServer.2019 (asynchronously) +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.SA.MS SqlServer.2019 (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.SA.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA.MS).sql b/SqlServer.SA.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA.MS).sql index 4f0b8dedfe1f..42cdcb9b71c2 100644 --- a/SqlServer.SA.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA.MS).sql +++ b/SqlServer.SA.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA.MS).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.SA.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA.MS).sql b/SqlServer.SA.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA.MS).sql index b6552b04dc58..f57fa23d44b7 100644 --- a/SqlServer.SA.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA.MS).sql +++ b/SqlServer.SA.MS/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA.MS).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.SA.MS SqlServer.2019 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA.MS).sql b/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA.MS).sql index e02199a49fda..548668bb29e8 100644 --- a/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA.MS).sql +++ b/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA.MS).sql b/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA.MS).sql index 50cae7fa9be5..b0c45bfcdba8 100644 --- a/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA.MS).sql +++ b/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA.MS).sql b/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA.MS).sql index fe3690d89c34..5a6a299fa0d8 100644 --- a/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA.MS).sql +++ b/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA.MS).sql b/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA.MS).sql index c029b7f8deb0..25464d999a85 100644 --- a/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA.MS).sql +++ b/SqlServer.SA.MS/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA.MS).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.SA.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA.MS).sql b/SqlServer.SA.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA.MS).sql new file mode 100644 index 000000000000..2a1c26818374 --- /dev/null +++ b/SqlServer.SA.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA.MS).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.SA.MS SqlServer.2019 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.SA.MS SqlServer.2019 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.SA.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA.MS).sql b/SqlServer.SA.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA.MS).sql new file mode 100644 index 000000000000..eb50c27cd212 --- /dev/null +++ b/SqlServer.SA.MS/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA.MS).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.SA.MS SqlServer.2019 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.SA.MS SqlServer.2019 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.SA/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA).sql b/SqlServer.SA/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA).sql index fa259ddd20b4..0e39e1a71c24 100644 --- a/SqlServer.SA/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA).sql +++ b/SqlServer.SA/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SqlServer.SA).sql @@ -5,17 +5,11 @@ WITH [CTE_1] ([ParentID]) AS ( SELECT - [t1].[ParentID] + [c_1].[ParentID] FROM - ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [t1] + [Child] [c_1] + WHERE + [c_1].[ParentID] > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM [Parent] [p] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] > 1 - ) [c_2] ON [p].[ParentID] = [c_2].[ParentID] - INNER JOIN ( - SELECT DISTINCT - [c2].[ParentID], - [c2].[ChildID] - FROM - [Child] [c2] - WHERE - [c2].[ParentID] > 1 - ) [c2_1] ON [p].[ParentID] = [c2_1].[ParentID] + INNER JOIN [Child] [c_1] ON [p].[ParentID] = [c_1].[ParentID] + INNER JOIN [Child] [c2] ON [p].[ParentID] = [c2].[ParentID] +WHERE + [c_1].[ParentID] > 1 AND [c2].[ParentID] > 1 diff --git a/SqlServer.SA/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA).sql b/SqlServer.SA/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA).sql index a67b3fc79092..1bdec4cd76cb 100644 --- a/SqlServer.SA/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA).sql +++ b/SqlServer.SA/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SqlServer.SA).sql @@ -1,11 +1,11 @@ BeforeExecute -- SqlServer.SA SqlServer.2019 -WITH [CTE_1] AS +WITH [CTE_1] ([c1]) +AS ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] + SELECT + 1 FROM [Child] [c_1] WHERE diff --git a/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA).sql b/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA).sql index e04c339a7168..f76c7ef63654 100644 --- a/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA).sql +++ b/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SqlServer.SA).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA).sql b/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA).sql index d10bb43702b6..230108cdfe85 100644 --- a/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA).sql +++ b/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SqlServer.SA).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - CROSS APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA).sql b/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA).sql index 1cc4de478620..4417623d649d 100644 --- a/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA).sql +++ b/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SqlServer.SA).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [o].[ParentID] = [c_1].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA).sql b/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA).sql index 364456beeab5..14e2c06369c2 100644 --- a/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA).sql +++ b/SqlServer.SA/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SqlServer.SA).sql @@ -4,17 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - OUTER APPLY ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - WHERE - [c_1].[ParentID] = [o].[ParentID] - ) [c_2] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/SqlServer.SA/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA).sql b/SqlServer.SA/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA).sql new file mode 100644 index 000000000000..a55e79e46db7 --- /dev/null +++ b/SqlServer.SA/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SqlServer.SA).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SqlServer.SA SqlServer.2019 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.SA SqlServer.2019 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/SqlServer.SA/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA).sql b/SqlServer.SA/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA).sql new file mode 100644 index 000000000000..252fb2a3efc8 --- /dev/null +++ b/SqlServer.SA/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SqlServer.SA).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SqlServer.SA SqlServer.2019 +DECLARE @skip Int -- Int32 +SET @skip = 1 +DECLARE @take Int -- Int32 +SET @take = 2 + +SELECT + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] +OFFSET @skip ROWS FETCH NEXT @take ROWS ONLY + +BeforeExecute +-- SqlServer.SA SqlServer.2019 + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From caf841a208ba80ddc28c36e985e97dcbcf70c6c5 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:24:28 +0000 Subject: [PATCH 40/42] [Linux / Sybase ASE 16] baselines --- ...inDistinct(Sybase.Managed.LinqService).sql | 12 +++------- ...tinctWhere(Sybase.Managed.LinqService).sql | 12 +++------- ...inDistinct(Sybase.Managed.LinqService).sql | 12 +++------- ...tinctWhere(Sybase.Managed.LinqService).sql | 12 +++------- ...stinctAll1(Sybase.Managed.LinqService).sql | 23 ++++++++++++++++++ ...stinctAll2(Sybase.Managed.LinqService).sql | 24 +++++++++++++++++++ ...ests.InnerJoinDistinct(Sybase.Managed).sql | 12 +++------- ...InnerJoinDistinctWhere(Sybase.Managed).sql | 12 +++------- ...Tests.LeftJoinDistinct(Sybase.Managed).sql | 12 +++------- ....LeftJoinDistinctWhere(Sybase.Managed).sql | 12 +++------- ...ts.OrderByDistinctAll1(Sybase.Managed).sql | 23 ++++++++++++++++++ ...ts.OrderByDistinctAll2(Sybase.Managed).sql | 24 +++++++++++++++++++ 12 files changed, 118 insertions(+), 72 deletions(-) create mode 100644 Sybase.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Sybase.Managed.LinqService).sql create mode 100644 Sybase.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Sybase.Managed.LinqService).sql create mode 100644 Sybase.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Sybase.Managed).sql create mode 100644 Sybase.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Sybase.Managed).sql diff --git a/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Sybase.Managed.LinqService).sql b/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Sybase.Managed.LinqService).sql index 60b0c92d54f6..07fd49e43c51 100644 --- a/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Sybase.Managed.LinqService).sql +++ b/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Sybase.Managed.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Sybase.Managed.LinqService).sql b/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Sybase.Managed.LinqService).sql index ccb0d90afb00..d39f3e5b9abe 100644 --- a/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Sybase.Managed.LinqService).sql +++ b/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Sybase.Managed.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Sybase.Managed.LinqService).sql b/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Sybase.Managed.LinqService).sql index 35def3d15920..f8cc64972b2a 100644 --- a/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Sybase.Managed.LinqService).sql +++ b/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Sybase.Managed.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Sybase.Managed.LinqService).sql b/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Sybase.Managed.LinqService).sql index 24fcf4b4c335..f50031a99028 100644 --- a/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Sybase.Managed.LinqService).sql +++ b/Sybase.Managed.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Sybase.Managed.LinqService).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/Sybase.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Sybase.Managed.LinqService).sql b/Sybase.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Sybase.Managed.LinqService).sql new file mode 100644 index 000000000000..c21c0dc293db --- /dev/null +++ b/Sybase.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Sybase.Managed.LinqService).sql @@ -0,0 +1,23 @@ +BeforeExecute +-- Sybase.Managed Sybase (asynchronously) + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Sybase.Managed Sybase (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Sybase.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Sybase.Managed.LinqService).sql b/Sybase.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Sybase.Managed.LinqService).sql new file mode 100644 index 000000000000..97d15836e3f9 --- /dev/null +++ b/Sybase.Managed.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Sybase.Managed.LinqService).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- Sybase.Managed Sybase (asynchronously) + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Sybase.Managed Sybase (asynchronously) + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Sybase.Managed).sql b/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Sybase.Managed).sql index 72e48501bbe3..0f1cdfd86e39 100644 --- a/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Sybase.Managed).sql +++ b/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(Sybase.Managed).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + INNER JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Sybase.Managed).sql b/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Sybase.Managed).sql index 36d49a2cdb81..80c83970a725 100644 --- a/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Sybase.Managed).sql +++ b/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(Sybase.Managed).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - INNER JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + INNER JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Sybase.Managed).sql b/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Sybase.Managed).sql index 4d4887f8ba2f..3763beb9d62a 100644 --- a/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Sybase.Managed).sql +++ b/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(Sybase.Managed).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [o].[ParentID] = [c_2].[ParentID] + LEFT JOIN [Child] [c_1] ON [o].[ParentID] = [c_1].[ParentID] diff --git a/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Sybase.Managed).sql b/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Sybase.Managed).sql index 37f19d13ce7d..d034f1224a9a 100644 --- a/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Sybase.Managed).sql +++ b/Sybase.Managed/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(Sybase.Managed).sql @@ -4,15 +4,9 @@ SELECT [o].[ParentID], [o].[Value1], - [c_2].[ParentID], - [c_2].[ChildID] + [c_1].[ParentID], + [c_1].[ChildID] FROM [Parent] [o] - LEFT JOIN ( - SELECT DISTINCT - [c_1].[ParentID], - [c_1].[ChildID] - FROM - [Child] [c_1] - ) [c_2] ON [c_2].[ParentID] = [o].[ParentID] + LEFT JOIN [Child] [c_1] ON [c_1].[ParentID] = [o].[ParentID] diff --git a/Sybase.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Sybase.Managed).sql b/Sybase.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Sybase.Managed).sql new file mode 100644 index 000000000000..c0b52f60777e --- /dev/null +++ b/Sybase.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(Sybase.Managed).sql @@ -0,0 +1,23 @@ +BeforeExecute +-- Sybase.Managed Sybase + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Sybase.Managed Sybase + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + diff --git a/Sybase.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Sybase.Managed).sql b/Sybase.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Sybase.Managed).sql new file mode 100644 index 000000000000..5720da26572f --- /dev/null +++ b/Sybase.Managed/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(Sybase.Managed).sql @@ -0,0 +1,24 @@ +BeforeExecute +-- Sybase.Managed Sybase + +SELECT TOP 3 + [r].[PersonID], + [r].[LastName], + [r].[FirstName] +FROM + [Person] [r] +ORDER BY + [r].[FirstName] + +BeforeExecute +-- Sybase.Managed Sybase + +SELECT + [t1].[FirstName], + [t1].[PersonID], + [t1].[LastName], + [t1].[MiddleName], + [t1].[Gender] +FROM + [Person] [t1] + From dfbabd3f1d103e12af5146ecbab7fb5da57426e7 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:41:04 +0000 Subject: [PATCH 41/42] [Linux / SAP HANA 2] baselines --- ...eTests.Test5(SapHana.Odbc.LinqService).sql | 36 +++++-------------- ...tCustomCount(SapHana.Odbc.LinqService).sql | 8 ++--- ...JoinDistinct(SapHana.Odbc.LinqService).sql | 14 ++------ ...istinctWhere(SapHana.Odbc.LinqService).sql | 14 ++------ ...JoinDistinct(SapHana.Odbc.LinqService).sql | 14 ++------ ...istinctWhere(SapHana.Odbc.LinqService).sql | 14 ++------ ...DistinctAll1(SapHana.Odbc.LinqService).sql | 28 +++++++++++++++ ...DistinctAll2(SapHana.Odbc.LinqService).sql | 29 +++++++++++++++ ...ests.Linq.CteTests.Test5(SapHana.Odbc).sql | 36 +++++-------------- ...CteTests.TestCustomCount(SapHana.Odbc).sql | 8 ++--- ...dTests.InnerJoinDistinct(SapHana.Odbc).sql | 14 ++------ ...s.InnerJoinDistinctWhere(SapHana.Odbc).sql | 14 ++------ ...edTests.LeftJoinDistinct(SapHana.Odbc).sql | 14 ++------ ...ts.LeftJoinDistinctWhere(SapHana.Odbc).sql | 14 ++------ ...ests.OrderByDistinctAll1(SapHana.Odbc).sql | 28 +++++++++++++++ ...ests.OrderByDistinctAll2(SapHana.Odbc).sql | 29 +++++++++++++++ 16 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 SapHana.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SapHana.Odbc.LinqService).sql create mode 100644 SapHana.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SapHana.Odbc.LinqService).sql create mode 100644 SapHana.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SapHana.Odbc).sql create mode 100644 SapHana.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SapHana.Odbc).sql diff --git a/SapHana.Odbc.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SapHana.Odbc.LinqService).sql b/SapHana.Odbc.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SapHana.Odbc.LinqService).sql index f675c2a798d4..1ad7bd8f75b9 100644 --- a/SapHana.Odbc.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SapHana.Odbc.LinqService).sql +++ b/SapHana.Odbc.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SapHana.Odbc.LinqService).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - "t1"."ParentID" + "c_1"."ParentID" FROM - ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "t1" + "Child" "c_1" + WHERE + "c_1"."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" "p" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "c_2" ON "p"."ParentID" = "c_2"."ParentID" - INNER JOIN ( - SELECT DISTINCT - "c2"."ParentID", - "c2"."ChildID" - FROM - "Child" "c2" - WHERE - "c2"."ParentID" > 1 - ) "c2_1" ON "p"."ParentID" = "c2_1"."ParentID" + INNER JOIN "Child" "c_1" ON "p"."ParentID" = "c_1"."ParentID" + INNER JOIN "Child" "c2" ON "p"."ParentID" = "c2"."ParentID" +WHERE + "c_1"."ParentID" > 1 AND "c2"."ParentID" > 1 diff --git a/SapHana.Odbc.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SapHana.Odbc.LinqService).sql b/SapHana.Odbc.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SapHana.Odbc.LinqService).sql index 747e2f3773ce..951ca04f3ce5 100644 --- a/SapHana.Odbc.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SapHana.Odbc.LinqService).sql +++ b/SapHana.Odbc.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SapHana.Odbc.LinqService).sql @@ -1,11 +1,11 @@ BeforeExecute -- SapHana.Odbc SapHanaOdbc (asynchronously) -WITH "CTE_1" AS +WITH "CTE_1" ("c1") +AS ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" + SELECT + 1 FROM "Child" "c_1" WHERE diff --git a/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SapHana.Odbc.LinqService).sql b/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SapHana.Odbc.LinqService).sql index 162ea5d80bc4..47d619bd94fc 100644 --- a/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SapHana.Odbc.LinqService).sql +++ b/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SapHana.Odbc.LinqService).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "o"."ParentID" = "c_1"."ParentID" - ) "c_2" ON 1=1 + INNER JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SapHana.Odbc.LinqService).sql b/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SapHana.Odbc.LinqService).sql index 93f23cb33016..806f178edf35 100644 --- a/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SapHana.Odbc.LinqService).sql +++ b/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SapHana.Odbc.LinqService).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" = "o"."ParentID" - ) "c_2" ON 1=1 + INNER JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SapHana.Odbc.LinqService).sql b/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SapHana.Odbc.LinqService).sql index a53261f40649..4b811f37db30 100644 --- a/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SapHana.Odbc.LinqService).sql +++ b/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SapHana.Odbc.LinqService).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "o"."ParentID" = "c_1"."ParentID" - ) "c_2" ON 1=1 + LEFT JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SapHana.Odbc.LinqService).sql b/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SapHana.Odbc.LinqService).sql index 44f1a1cb5eb1..b81aafa2235e 100644 --- a/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SapHana.Odbc.LinqService).sql +++ b/SapHana.Odbc.LinqService/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SapHana.Odbc.LinqService).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" = "o"."ParentID" - ) "c_2" ON 1=1 + LEFT JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/SapHana.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SapHana.Odbc.LinqService).sql b/SapHana.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SapHana.Odbc.LinqService).sql new file mode 100644 index 000000000000..38d3c1c759d0 --- /dev/null +++ b/SapHana.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SapHana.Odbc.LinqService).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SapHana.Odbc SapHanaOdbc (asynchronously) +DECLARE @take Int -- Int32 +SET @take = 2 +DECLARE @skip Int -- Int32 +SET @skip = 1 + +SELECT + "r"."PersonID", + "r"."LastName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +LIMIT ? OFFSET ? + +BeforeExecute +-- SapHana.Odbc SapHanaOdbc (asynchronously) + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/SapHana.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SapHana.Odbc.LinqService).sql b/SapHana.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SapHana.Odbc.LinqService).sql new file mode 100644 index 000000000000..85085a8940dd --- /dev/null +++ b/SapHana.Odbc.LinqService/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SapHana.Odbc.LinqService).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SapHana.Odbc SapHanaOdbc (asynchronously) +DECLARE @take Int -- Int32 +SET @take = 2 +DECLARE @skip Int -- Int32 +SET @skip = 1 + +SELECT + "r"."PersonID", + "r"."LastName", + "r"."FirstName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +LIMIT ? OFFSET ? + +BeforeExecute +-- SapHana.Odbc SapHanaOdbc (asynchronously) + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/SapHana.Odbc/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SapHana.Odbc).sql b/SapHana.Odbc/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SapHana.Odbc).sql index bfa22edd2de7..efee5bd1a08a 100644 --- a/SapHana.Odbc/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SapHana.Odbc).sql +++ b/SapHana.Odbc/Tests/Linq/CteTests/Tests.Linq.CteTests.Test5(SapHana.Odbc).sql @@ -5,17 +5,11 @@ WITH "CTE_1" ("ParentID") AS ( SELECT - "t1"."ParentID" + "c_1"."ParentID" FROM - ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "t1" + "Child" "c_1" + WHERE + "c_1"."ParentID" > 1 ) SELECT COUNT(*) @@ -31,22 +25,8 @@ SELECT COUNT(*) FROM "Parent" "p" - INNER JOIN ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" > 1 - ) "c_2" ON "p"."ParentID" = "c_2"."ParentID" - INNER JOIN ( - SELECT DISTINCT - "c2"."ParentID", - "c2"."ChildID" - FROM - "Child" "c2" - WHERE - "c2"."ParentID" > 1 - ) "c2_1" ON "p"."ParentID" = "c2_1"."ParentID" + INNER JOIN "Child" "c_1" ON "p"."ParentID" = "c_1"."ParentID" + INNER JOIN "Child" "c2" ON "p"."ParentID" = "c2"."ParentID" +WHERE + "c_1"."ParentID" > 1 AND "c2"."ParentID" > 1 diff --git a/SapHana.Odbc/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SapHana.Odbc).sql b/SapHana.Odbc/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SapHana.Odbc).sql index ceb731a6ad32..b5c3b60d5c03 100644 --- a/SapHana.Odbc/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SapHana.Odbc).sql +++ b/SapHana.Odbc/Tests/Linq/CteTests/Tests.Linq.CteTests.TestCustomCount(SapHana.Odbc).sql @@ -1,11 +1,11 @@ BeforeExecute -- SapHana.Odbc SapHanaOdbc -WITH "CTE_1" AS +WITH "CTE_1" ("c1") +AS ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" + SELECT + 1 FROM "Child" "c_1" WHERE diff --git a/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SapHana.Odbc).sql b/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SapHana.Odbc).sql index 7fca34950bf6..4cbf8352ab77 100644 --- a/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SapHana.Odbc).sql +++ b/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinct(SapHana.Odbc).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "o"."ParentID" = "c_1"."ParentID" - ) "c_2" ON 1=1 + INNER JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SapHana.Odbc).sql b/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SapHana.Odbc).sql index b0e02ea57a3b..8ef3c93023de 100644 --- a/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SapHana.Odbc).sql +++ b/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.InnerJoinDistinctWhere(SapHana.Odbc).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - INNER JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" = "o"."ParentID" - ) "c_2" ON 1=1 + INNER JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SapHana.Odbc).sql b/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SapHana.Odbc).sql index 7ea034ddc87f..b8a0d8aa5e76 100644 --- a/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SapHana.Odbc).sql +++ b/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinct(SapHana.Odbc).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "o"."ParentID" = "c_1"."ParentID" - ) "c_2" ON 1=1 + LEFT JOIN "Child" "c_1" ON "o"."ParentID" = "c_1"."ParentID" diff --git a/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SapHana.Odbc).sql b/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SapHana.Odbc).sql index a22a16333d71..50c9cda913b6 100644 --- a/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SapHana.Odbc).sql +++ b/SapHana.Odbc/Tests/Linq/JoinToLimitedTests/Tests.Linq.JoinToLimitedTests.LeftJoinDistinctWhere(SapHana.Odbc).sql @@ -4,17 +4,9 @@ SELECT "o"."ParentID", "o"."Value1", - "c_2"."ParentID", - "c_2"."ChildID" + "c_1"."ParentID", + "c_1"."ChildID" FROM "Parent" "o" - LEFT JOIN LATERAL ( - SELECT DISTINCT - "c_1"."ParentID", - "c_1"."ChildID" - FROM - "Child" "c_1" - WHERE - "c_1"."ParentID" = "o"."ParentID" - ) "c_2" ON 1=1 + LEFT JOIN "Child" "c_1" ON "c_1"."ParentID" = "o"."ParentID" diff --git a/SapHana.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SapHana.Odbc).sql b/SapHana.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SapHana.Odbc).sql new file mode 100644 index 000000000000..4a18856ebc63 --- /dev/null +++ b/SapHana.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll1(SapHana.Odbc).sql @@ -0,0 +1,28 @@ +BeforeExecute +-- SapHana.Odbc SapHanaOdbc +DECLARE @take Int -- Int32 +SET @take = 2 +DECLARE @skip Int -- Int32 +SET @skip = 1 + +SELECT + "r"."PersonID", + "r"."LastName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +LIMIT ? OFFSET ? + +BeforeExecute +-- SapHana.Odbc SapHanaOdbc + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + diff --git a/SapHana.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SapHana.Odbc).sql b/SapHana.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SapHana.Odbc).sql new file mode 100644 index 000000000000..dffccb693d85 --- /dev/null +++ b/SapHana.Odbc/Tests/Linq/OrderByDistinctTests/Tests.Linq.OrderByDistinctTests.OrderByDistinctAll2(SapHana.Odbc).sql @@ -0,0 +1,29 @@ +BeforeExecute +-- SapHana.Odbc SapHanaOdbc +DECLARE @take Int -- Int32 +SET @take = 2 +DECLARE @skip Int -- Int32 +SET @skip = 1 + +SELECT + "r"."PersonID", + "r"."LastName", + "r"."FirstName" +FROM + "Person" "r" +ORDER BY + "r"."FirstName" +LIMIT ? OFFSET ? + +BeforeExecute +-- SapHana.Odbc SapHanaOdbc + +SELECT + "t1"."FirstName", + "t1"."PersonID", + "t1"."LastName", + "t1"."MiddleName", + "t1"."Gender" +FROM + "Person" "t1" + From 3a61320f3c01089976f4236eac8e0a4671b6a368 Mon Sep 17 00:00:00 2001 From: Azure Pipelines Bot Date: Wed, 10 Sep 2025 17:47:26 +0000 Subject: [PATCH 42/42] [Linux / SQL Server 2019] baselines --- ...rmBattleTests.DistinctEntityTest(SqlServer.Northwind.MS).sql | 2 +- ...e.OrmBattleTests.DistinctEntityTest(SqlServer.Northwind).sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SqlServer.Northwind.MS/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(SqlServer.Northwind.MS).sql b/SqlServer.Northwind.MS/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(SqlServer.Northwind.MS).sql index 407ba1330b35..666d528bdbd1 100644 --- a/SqlServer.Northwind.MS/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(SqlServer.Northwind.MS).sql +++ b/SqlServer.Northwind.MS/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(SqlServer.Northwind.MS).sql @@ -1,7 +1,7 @@ BeforeExecute -- SqlServer.Northwind.MS SqlServer.2019 -SELECT DISTINCT +SELECT [t1].[CustomerID], [t1].[CompanyName], [t1].[ContactName], diff --git a/SqlServer.Northwind/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(SqlServer.Northwind).sql b/SqlServer.Northwind/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(SqlServer.Northwind).sql index b6c2ac0713d8..1bc6a8b1c6d1 100644 --- a/SqlServer.Northwind/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(SqlServer.Northwind).sql +++ b/SqlServer.Northwind/Tests/OrmBattle/OrmBattleTests/Tests.OrmBattle.OrmBattleTests.DistinctEntityTest(SqlServer.Northwind).sql @@ -1,7 +1,7 @@ BeforeExecute -- SqlServer.Northwind SqlServer.2019 -SELECT DISTINCT +SELECT [t1].[CustomerID], [t1].[CompanyName], [t1].[ContactName],