Baselines for https://github.com/linq2db/linq2db/pull/4839

Access.Ace.Odbc.LinqService/Tests/Linq/ExpressionsTests/Tests.Linq.ExpressionsTests.ComparisonTest1(Access.Ace.Odbc.LinqService,1).sql

@@ -12,10 +12,11 @@ SET     @personId = 0
 SELECT
 	COUNT(*) > 0
 FROM
-	[Person] [t1],
+	[Person] [t1]
+WHERE
 	(
 		SELECT
-			COUNT([t2].[PersonID]) as [cond]
+			COUNT([t2].[PersonID])
 		FROM
 			[Patient] [t2]
 		WHERE
@@ -27,22 +28,20 @@ FROM
 				WHERE
 					[t3].[PersonID] = ?
 			)
-	) [t4],
+	) = 0 AND
 	(
 		SELECT
-			COUNT([t5].[PersonID]) as [cond]
+			COUNT([t4].[PersonID])
 		FROM
-			[Patient] [t5]
+			[Patient] [t4]
 		WHERE
-			[t5].[PersonID] = ? AND [t5].[PersonID] NOT IN (
+			[t4].[PersonID] = ? AND [t4].[PersonID] NOT IN (
 				SELECT
-					[t6].[PersonID]
+					[t5].[PersonID]
 				FROM
-					[Patient] [t6]
+					[Patient] [t5]
 				WHERE
-					[t6].[PersonID] = ?
+					[t5].[PersonID] = ?
 			)
-	) [t7]
-WHERE
-	[t4].[cond] = 0 AND [t7].[cond] = 0
+	) = 0
 

Access.Ace.Odbc.LinqService/Tests/Linq/ExpressionsTests/Tests.Linq.ExpressionsTests.ComparisonTest1(Access.Ace.Odbc.LinqService,2).sql

@@ -12,10 +12,11 @@ SET     @personId = 0
 SELECT
 	COUNT(*) > 0
 FROM
-	[Person] [t1],
+	[Person] [t1]
+WHERE
 	(
 		SELECT
-			COUNT([t2].[PersonID]) as [cond]
+			COUNT([t2].[PersonID])
 		FROM
 			[Patient] [t2]
 		WHERE
@@ -27,22 +28,20 @@ FROM
 				WHERE
 					[t3].[PersonID] = ?
 			)
-	) [t4],
+	) = 0 AND
 	(
 		SELECT
-			COUNT([t5].[PersonID]) as [cond]
+			COUNT([t4].[PersonID])
 		FROM
-			[Patient] [t5]
+			[Patient] [t4]
 		WHERE
-			[t5].[PersonID] = ? AND [t5].[PersonID] NOT IN (
+			[t4].[PersonID] = ? AND [t4].[PersonID] NOT IN (
 				SELECT
-					[t6].[PersonID]
+					[t5].[PersonID]
 				FROM
-					[Patient] [t6]
+					[Patient] [t5]
 				WHERE
-					[t6].[PersonID] = ?
+					[t5].[PersonID] = ?
 			)
-	) [t7]
-WHERE
-	[t4].[cond] = 0 AND [t7].[cond] = 0
+	) = 0
 

Access.Ace.Odbc.LinqService/Tests/Linq/WhereTests/Tests.Linq.WhereTests.BooleanSubquery(Access.Ace.Odbc.LinqService).sql

@@ -5,8 +5,14 @@ SELECT
 	[t].[Id],
 	[t].[BoolValue]
 FROM
-	[WhereWithBool] [t],
-	[WhereWithBool] [x]
+	[WhereWithBool] [t]
 WHERE
-	[x].[BoolValue] AND [x].[Id] = 1
+	(
+		SELECT
+			[x].[BoolValue]
+		FROM
+			[WhereWithBool] [x]
+		WHERE
+			[x].[Id] = 1
+	)
 

Access.Ace.Odbc.LinqService/Tests/Linq/WhereTests/Tests.Linq.WhereTests.Issue_SubQueryFilter1(Access.Ace.Odbc.LinqService).sql

@@ -15,29 +15,27 @@ WHERE
 		SELECT
 			*
 		FROM
-			[Person] [e],
-			(
+			[Person] [e]
+		WHERE
+			[e].[FirstName] LIKE ? AND [e].[PersonID] = (
 				SELECT TOP 1
-					[d].[PersonID] as [cond]
+					[d].[PersonID]
 				FROM
 					[Patient] [d]
-			) [t2]
-		WHERE
-			[e].[FirstName] LIKE ? AND [e].[PersonID] = [t2].[cond]
+			)
 	) OR
 	EXISTS(
 		SELECT
 			*
 		FROM
-			[Person] [e_1],
-			(
+			[Person] [e_1]
+		WHERE
+			[e_1].[FirstName] LIKE ? AND [e_1].[PersonID] = (
 				SELECT TOP 1
-					[d_1].[PersonID] as [cond]
+					[d_1].[PersonID]
 				FROM
 					[Patient] [d_1]
-			) [t3]
-		WHERE
-			[e_1].[FirstName] LIKE ? AND [e_1].[PersonID] = [t3].[cond]
+			)
 	)
 ORDER BY
 	[t1].[PersonID]

Access.Ace.Odbc.LinqService/Tests/Linq/WhereTests/Tests.Linq.WhereTests.Issue_SubQueryFilter2(Access.Ace.Odbc.LinqService).sql

@@ -15,31 +15,29 @@ WHERE
 		SELECT
 			*
 		FROM
-			[Person] [e],
-			(
+			[Person] [e]
+		WHERE
+			[e].[PersonID] = [p].[PersonID] AND [e].[FirstName] LIKE ? AND
+			[e].[PersonID] = (
 				SELECT TOP 1
-					[d].[PersonID] as [cond]
+					[d].[PersonID]
 				FROM
 					[Patient] [d]
-			) [t1]
-		WHERE
-			[e].[PersonID] = [p].[PersonID] AND [e].[FirstName] LIKE ? AND
-			[e].[PersonID] = [t1].[cond]
+			)
 	) OR
 	EXISTS(
 		SELECT
 			*
 		FROM
-			[Person] [e_1],
-			(
+			[Person] [e_1]
+		WHERE
+			[e_1].[PersonID] = [p].[PersonID] AND [e_1].[FirstName] LIKE ? AND
+			[e_1].[PersonID] = (
 				SELECT TOP 1
-					[d_1].[PersonID] as [cond]
+					[d_1].[PersonID]
 				FROM
 					[Patient] [d_1]
-			) [t2]
-		WHERE
-			[e_1].[PersonID] = [p].[PersonID] AND [e_1].[FirstName] LIKE ? AND
-			[e_1].[PersonID] = [t2].[cond]
+			)
 	)
 ORDER BY
 	[p].[PersonID]

Access.Ace.Odbc/Tests/Linq/ExpressionsTests/Tests.Linq.ExpressionsTests.ComparisonTest1(Access.Ace.Odbc,1).sql

@@ -12,10 +12,11 @@ SET     @personId = 0
 SELECT
 	COUNT(*) > 0
 FROM
-	[Person] [t1],
+	[Person] [t1]
+WHERE
 	(
 		SELECT
-			COUNT([t2].[PersonID]) as [cond]
+			COUNT([t2].[PersonID])
 		FROM
 			[Patient] [t2]
 		WHERE
@@ -27,22 +28,20 @@ FROM
 				WHERE
 					[t3].[PersonID] = ?
 			)
-	) [t4],
+	) = 0 AND
 	(
 		SELECT
-			COUNT([t5].[PersonID]) as [cond]
+			COUNT([t4].[PersonID])
 		FROM
-			[Patient] [t5]
+			[Patient] [t4]
 		WHERE
-			[t5].[PersonID] = ? AND [t5].[PersonID] NOT IN (
+			[t4].[PersonID] = ? AND [t4].[PersonID] NOT IN (
 				SELECT
-					[t6].[PersonID]
+					[t5].[PersonID]
 				FROM
-					[Patient] [t6]
+					[Patient] [t5]
 				WHERE
-					[t6].[PersonID] = ?
+					[t5].[PersonID] = ?
 			)
-	) [t7]
-WHERE
-	[t4].[cond] = 0 AND [t7].[cond] = 0
+	) = 0
 

Access.Ace.Odbc/Tests/Linq/ExpressionsTests/Tests.Linq.ExpressionsTests.ComparisonTest1(Access.Ace.Odbc,2).sql

@@ -12,10 +12,11 @@ SET     @personId = 0
 SELECT
 	COUNT(*) > 0
 FROM
-	[Person] [t1],
+	[Person] [t1]
+WHERE
 	(
 		SELECT
-			COUNT([t2].[PersonID]) as [cond]
+			COUNT([t2].[PersonID])
 		FROM
 			[Patient] [t2]
 		WHERE
@@ -27,22 +28,20 @@ FROM
 				WHERE
 					[t3].[PersonID] = ?
 			)
-	) [t4],
+	) = 0 AND
 	(
 		SELECT
-			COUNT([t5].[PersonID]) as [cond]
+			COUNT([t4].[PersonID])
 		FROM
-			[Patient] [t5]
+			[Patient] [t4]
 		WHERE
-			[t5].[PersonID] = ? AND [t5].[PersonID] NOT IN (
+			[t4].[PersonID] = ? AND [t4].[PersonID] NOT IN (
 				SELECT
-					[t6].[PersonID]
+					[t5].[PersonID]
 				FROM
-					[Patient] [t6]
+					[Patient] [t5]
 				WHERE
-					[t6].[PersonID] = ?
+					[t5].[PersonID] = ?
 			)
-	) [t7]
-WHERE
-	[t4].[cond] = 0 AND [t7].[cond] = 0
+	) = 0
 

Access.Ace.Odbc/Tests/Linq/SubQueryTests/Tests.Linq.SubQueryTests.Issue383Test2(Access.Ace.Odbc).sql

@@ -7,19 +7,25 @@ SELECT
 	[d].[Distributor_Name],
 	[cp].[Street_Number],
 	[cp].[Street_Name],
-	[c_1].[City_Name],
+	(
+		SELECT
+			[c_1].[City_Name]
+		FROM
+			[Cities] [c_1]
+		WHERE
+			[c_1].[City_Code] = [cp].[City_Code] OR [c_1].[City_Code] IS NULL AND [cp].[City_Code] IS NULL
+	),
 	[cp].[State],
 	[cp].[Zip_Code],
 	[cp].[Zip_Plus_4],
 	[cd].[Effective_Date]
 FROM
-	((((([Contract_Distributor_Agent] [cda]
+	(((([Contract_Distributor_Agent] [cda]
 		INNER JOIN [Agent] [a] ON ([cda].[Agent_Id] = [a].[Agent_Id]))
 		INNER JOIN [Distributor] [d] ON ([cda].[Distributor_Id] = [d].[Distributor_Id]))
 		INNER JOIN [Distributor_Commercial_Propert] [dcp] ON ([d].[Distributor_Id] = [dcp].[Distributor_Id]))
 		INNER JOIN [Commercial_Property] [cp] ON ([dcp].[Commercial_Property_Id] = [cp].[Commercial_Property_Id]))
-		INNER JOIN [Contract_Dates] [cd] ON ([cda].[Contract_Id] = [cd].[Contract_Id]))
-		INNER JOIN [Cities] [c_1] ON ([c_1].[City_Code] = [cp].[City_Code] OR [c_1].[City_Code] IS NULL AND [cp].[City_Code] IS NULL)
+		INNER JOIN [Contract_Dates] [cd] ON ([cda].[Contract_Id] = [cd].[Contract_Id])
 WHERE
 	[cda].[Contract_Id] = 198827882 AND
 	[cda].[Distributor_Type_Code] = 'CC' AND

Access.Ace.Odbc/Tests/Linq/WhereTests/Tests.Linq.WhereTests.BooleanSubquery(Access.Ace.Odbc).sql

@@ -5,8 +5,14 @@ SELECT
 	[t].[Id],
 	[t].[BoolValue]
 FROM
-	[WhereWithBool] [t],
-	[WhereWithBool] [x]
+	[WhereWithBool] [t]
 WHERE
-	[x].[BoolValue] AND [x].[Id] = 1
+	(
+		SELECT
+			[x].[BoolValue]
+		FROM
+			[WhereWithBool] [x]
+		WHERE
+			[x].[Id] = 1
+	)
 

Access.Ace.Odbc/Tests/Linq/WhereTests/Tests.Linq.WhereTests.Issue_SubQueryFilter1(Access.Ace.Odbc).sql

@@ -15,29 +15,27 @@ WHERE
 		SELECT
 			*
 		FROM
-			[Person] [e],
-			(
+			[Person] [e]
+		WHERE
+			[e].[FirstName] LIKE ? AND [e].[PersonID] = (
 				SELECT TOP 1
-					[d].[PersonID] as [cond]
+					[d].[PersonID]
 				FROM
 					[Patient] [d]
-			) [t2]
-		WHERE
-			[e].[FirstName] LIKE ? AND [e].[PersonID] = [t2].[cond]
+			)
 	) OR
 	EXISTS(
 		SELECT
 			*
 		FROM
-			[Person] [e_1],
-			(
+			[Person] [e_1]
+		WHERE
+			[e_1].[FirstName] LIKE ? AND [e_1].[PersonID] = (
 				SELECT TOP 1
-					[d_1].[PersonID] as [cond]
+					[d_1].[PersonID]
 				FROM
 					[Patient] [d_1]
-			) [t3]
-		WHERE
-			[e_1].[FirstName] LIKE ? AND [e_1].[PersonID] = [t3].[cond]
+			)
 	)
 ORDER BY
 	[t1].[PersonID]