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

Access.Ace.Odbc.LinqService/Tests/Linq/AssociationTests/Tests.Linq.AssociationTests.Issue2933Test(Access.Ace.Odbc.LinqService).sql

@@ -9,7 +9,7 @@ SELECT
 		FROM
 			[Issue2933Pet] [a_PetIds]
 		WHERE
-			[a_Person].[Id] = [a_PetIds].[PersonId]
+			[a_Person].[Id] IS NOT NULL AND [a_Person].[Id] = [a_PetIds].[PersonId]
 	)
 FROM
 	[Issue2933Car] [x]

Access.Ace.Odbc.LinqService/Tests/Linq/AssociationTests/Tests.Linq.AssociationTests.Issue3557Case1(Access.Ace.Odbc.LinqService).sql

@@ -9,7 +9,7 @@ SELECT
 		FROM
 			[SubData2] [a_SubDatas]
 		WHERE
-			[a_SubData].[Id] = [a_SubDatas].[Id]
+			[a_SubData].[Id] IS NOT NULL AND [a_SubData].[Id] = [a_SubDatas].[Id]
 	))
 FROM
 	[Data] [i]

Access.Ace.Odbc.LinqService/Tests/Linq/AssociationTests/Tests.Linq.AssociationTests.Issue3557Case2(Access.Ace.Odbc.LinqService).sql

@@ -9,14 +9,14 @@ SELECT
 		FROM
 			[SubData2] [a_SubDatas]
 		WHERE
-			[a_SubData].[Id] = [a_SubDatas].[Id]
+			[a_SubData].[Id] IS NOT NULL AND [a_SubData].[Id] = [a_SubDatas].[Id]
 	) IS NULL, '', (
 		SELECT TOP 1
 			[a_SubDatas].[Reason]
 		FROM
 			[SubData2] [a_SubDatas]
 		WHERE
-			[a_SubData].[Id] = [a_SubDatas].[Id]
+			[a_SubData].[Id] IS NOT NULL AND [a_SubData].[Id] = [a_SubDatas].[Id]
 	))
 FROM
 	[Data] [i]

Access.Ace.Odbc.LinqService/Tests/Linq/AssociationTests/Tests.Linq.AssociationTests.Issue3557Case3(Access.Ace.Odbc.LinqService).sql

@@ -9,7 +9,7 @@ SELECT
 		FROM
 			[SubData2] [a_SubDatas]
 		WHERE
-			[a_SubData].[Id] = [a_SubDatas].[Id]
+			[a_SubData].[Id] IS NOT NULL AND [a_SubData].[Id] = [a_SubDatas].[Id]
 	)
 FROM
 	[Data] [i]

Access.Ace.Odbc.LinqService/Tests/Linq/AssociationTests/Tests.Linq.AssociationTests.Issue3809Test(Access.Ace.Odbc.LinqService).sql

@@ -19,7 +19,8 @@ FROM
 				FROM
 					[Child] [a_1]
 				WHERE
-					[a_ParentTest].[ParentID] = [a_1].[ParentID] AND [a_1].[ChildID] = 11
+					[a_ParentTest].[ParentID] IS NOT NULL AND [a_ParentTest].[ParentID] = [a_1].[ParentID] AND
+					[a_1].[ChildID] = 11
 			)
 	) [m_1]
 		INNER JOIN [Child] [d] ON ([m_1].[ParentID] = [d].[ParentID])
@@ -42,6 +43,7 @@ WHERE
 		FROM
 			[Child] [a_1]
 		WHERE
-			[a_ParentTest].[ParentID] = [a_1].[ParentID] AND [a_1].[ChildID] = 11
+			[a_ParentTest].[ParentID] IS NOT NULL AND [a_ParentTest].[ParentID] = [a_1].[ParentID] AND
+			[a_1].[ChildID] = 11
 	)
 

Access.Ace.Odbc.LinqService/Tests/Linq/AssociationTests/Tests.Linq.AssociationTests.OptionalAssociationNonNullCorrelation(Access.Ace.Odbc.LinqService).sql

@@ -20,7 +20,8 @@ FROM
 				FROM
 					[Table4] [id]
 				WHERE
-					[a_Table3].[ID] = [id].[ID3] AND [id].[ID] = [r].[ID]
+					[a_Table3].[ID] IS NOT NULL AND ([a_Table3].[ID] = [id].[ID3] OR [a_Table3].[ID] IS NULL AND [id].[ID3] IS NULL) AND
+					[id].[ID] = [r].[ID]
 			)
 	) [m_1]
 		INNER JOIN [Table4] [d] ON ([m_1].[ID] = [d].[ID3] OR [m_1].[ID] IS NULL AND [d].[ID3] IS NULL)
@@ -45,7 +46,8 @@ WHERE
 		FROM
 			[Table4] [id]
 		WHERE
-			[a_Table3].[ID] = [id].[ID3] AND [id].[ID] = [r].[ID]
+			[a_Table3].[ID] IS NOT NULL AND ([a_Table3].[ID] = [id].[ID3] OR [a_Table3].[ID] IS NULL AND [id].[ID3] IS NULL) AND
+			[id].[ID] = [r].[ID]
 	)
 
 BeforeExecute

Access.Ace.Odbc.LinqService/Tests/Linq/AssociationTests/Tests.Linq.AssociationTests.OptionalAssociationNonNullCorrelationWithProjection(Access.Ace.Odbc.LinqService).sql

@@ -16,6 +16,7 @@ WHERE
 		FROM
 			[Table4] [id]
 		WHERE
-			[a_Table3].[ID] = [id].[ID3] AND [id].[ID] = [r].[ID]
+			[a_Table3].[ID] IS NOT NULL AND ([a_Table3].[ID] = [id].[ID3] OR [a_Table3].[ID] IS NULL AND [id].[ID3] IS NULL) AND
+			[id].[ID] = [r].[ID]
 	)
 

Access.Ace.Odbc.LinqService/Tests/Linq/ConvertExpressionTests/Tests.Linq.ConvertExpressionTests.Issue3791Test(Access.Ace.Odbc.LinqService).sql

@@ -7,5 +7,5 @@ SELECT
 	[a_Association].[Id]
 FROM
 	[Issue3791Table] [t1]
-		LEFT JOIN [Issue3791GuidTable] [a_Association] ON ([t1].[OtherId] = IIF([a_Association].[Id] IS NOT NULL, CStr([a_Association].[Id]), NULL))
+		LEFT JOIN [Issue3791GuidTable] [a_Association] ON ([t1].[OtherId] = CStr([a_Association].[Id]))
 

Access.Ace.Odbc.LinqService/Tests/Linq/ConvertExpressionTests/Tests.Linq.ConvertExpressionTests.LetTest11(Access.Ace.Odbc.LinqService).sql

@@ -2,7 +2,7 @@
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
-	IIF([t1].[ParentID_1] IS NULL, 0, [t1].[ParentID_1]),
+	IIF([t1].[cond] IS NULL, 0, [t1].[cond]),
 	(
 		SELECT TOP 1
 			[c_2].[ParentID]
@@ -26,7 +26,6 @@ SELECT
 FROM
 	(
 		SELECT
-			[p].[ParentID],
 			(
 				SELECT TOP 1
 					[c_1].[ParentID]
@@ -36,7 +35,8 @@ FROM
 					[c_1].[ParentID] > 0
 				ORDER BY
 					[c_1].[ParentID]
-			) as [ParentID_1]
+			) as [cond],
+			[p].[ParentID]
 		FROM
 			[Parent] [p]
 	) [t1]

Access.Ace.Odbc.LinqService/Tests/Linq/GroupByTests/Tests.Linq.GroupByTests.Sum3(Access.Ace.Odbc.LinqService).sql

@@ -8,7 +8,7 @@ SELECT
 		FROM
 			[Child] [a_Children]
 		WHERE
-			[g_2].[ParentID] = [a_Children].[ParentID]
+			[g_2].[ParentID] IS NOT NULL AND [g_2].[ParentID] = [a_Children].[ParentID]
 	)
 FROM
 	(

Access.Ace.Odbc.LinqService/Tests/Linq/InheritanceTests/Tests.Linq.InheritanceTests.InheritanceAssociationTest(Access.Ace.Odbc.LinqService).sql

@@ -22,5 +22,5 @@ SELECT
 FROM
 	([LinqDataTypes] [ia]
 		LEFT JOIN [LinqDataTypes] [a_A1] ON ([ia].[GuidValue] = [a_A1].[GuidValue] AND [a_A1].[ID] = 2))
-		LEFT JOIN [LinqDataTypes] [a_A2] ON ([ia].[GuidValue] = [a_A2].[GuidValue] AND ([a_A2].[ID] <> 2 OR [a_A2].[ID] IS NULL))
+		LEFT JOIN [LinqDataTypes] [a_A2] ON ([ia].[GuidValue] = [a_A2].[GuidValue] AND [a_A2].[ID] <> 2)
 

Access.Ace.Odbc.LinqService/Tests/Linq/JoinTests/Tests.Linq.JoinTests.Issue1455Test1(Access.Ace.Odbc.LinqService).sql

@@ -254,8 +254,8 @@ FROM
 					[al_group].[AlertCode],
 					[al_group].[CreationDate]
 			) [al_group_1]
-				LEFT JOIN [Trade] [trade_1] ON ([al_group_1].[AlertKey] = IIF([trade_1].[DealId] IS NOT NULL, CStr([trade_1].[DealId]), NULL)))
-				LEFT JOIN [Nomin] [nomin_1] ON ([al_group_1].[AlertKey] = IIF([nomin_1].[CargoId] IS NOT NULL, CStr([nomin_1].[CargoId]), NULL))
+				LEFT JOIN [Trade] [trade_1] ON ([al_group_1].[AlertKey] = CStr([trade_1].[DealId])))
+				LEFT JOIN [Nomin] [nomin_1] ON ([al_group_1].[AlertKey] = CStr([nomin_1].[CargoId]))
 		WHERE
 			[nomin_1].[DeliveryCounterParty] LIKE ? OR [trade_1].[CounterParty] LIKE ? OR
 			[al_group_1].[AlertCode] LIKE ?

Access.Ace.Odbc.LinqService/Tests/Linq/JoinTests/Tests.Linq.JoinTests.Issue1455Test2(Access.Ace.Odbc.LinqService).sql

@@ -254,8 +254,8 @@ FROM
 					[al_group].[AlertCode],
 					[al_group].[CreationDate]
 			) [al_group_1]
-				LEFT JOIN [Trade] [trade_1] ON ([al_group_1].[AlertKey] = IIF([trade_1].[DealId] IS NOT NULL, CStr([trade_1].[DealId]), NULL)))
-				LEFT JOIN [Nomin] [nomin_1] ON ([al_group_1].[AlertKey] = IIF([nomin_1].[CargoId] IS NOT NULL, CStr([nomin_1].[CargoId]), NULL))
+				LEFT JOIN [Trade] [trade_1] ON ([al_group_1].[AlertKey] = CStr([trade_1].[DealId])))
+				LEFT JOIN [Nomin] [nomin_1] ON ([al_group_1].[AlertKey] = CStr([nomin_1].[CargoId]))
 		WHERE
 			[nomin_1].[DeliveryCounterParty] LIKE ? OR [trade_1].[CounterParty] LIKE ? OR
 			[al_group_1].[AlertCode] LIKE ?

Access.Ace.Odbc.LinqService/Tests/Linq/JoinTests/Tests.Linq.JoinTests.SqlRightJoinWithInnerJoinOnLeftWithConditions(Access.Ace.Odbc.LinqService).sql

@@ -8,13 +8,13 @@ DECLARE @id1 Int -- Int32
 SET     @id1 = 1
 
 SELECT
-	[t1].[ParentID],
+	[t1].[Left_1],
 	[right_2].[Right_1]
 FROM
 	(
 		SELECT
 			[p].[Value1],
-			[p].[ParentID]
+			[p].[ParentID] as [Left_1]
 		FROM
 			[Parent] [p]
 		WHERE
@@ -31,5 +31,5 @@ FROM
 				[right_1].[ParentID] <> ? AND [right2].[ParentID] <> ?
 		) [right_2] ON ([right_2].[c1] = [t1].[Value1] OR [right_2].[c1] IS NULL AND [t1].[Value1] IS NULL)
 ORDER BY
-	[t1].[ParentID]
+	[t1].[Left_1]
 

Access.Ace.Odbc.LinqService/Tests/Linq/JoinTests/Tests.Linq.JoinTests.SqlRightJoinWithInnerJoinOnLeftWithoutConditions(Access.Ace.Odbc.LinqService).sql

@@ -4,13 +4,13 @@ DECLARE @id1 Int -- Int32
 SET     @id1 = 1
 
 SELECT
-	[t1].[ParentID],
+	[t1].[Left_1],
 	[right_2].[Right_1]
 FROM
 	(
 		SELECT
 			[p].[Value1],
-			[p].[ParentID]
+			[p].[ParentID] as [Left_1]
 		FROM
 			[Parent] [p]
 		WHERE
@@ -25,5 +25,5 @@ FROM
 					INNER JOIN [Parent] [right2] ON ([right_1].[Value1] = [right2].[Value1] + 2)
 		) [right_2] ON ([right_2].[c1] = [t1].[Value1] OR [right_2].[c1] IS NULL AND [t1].[Value1] IS NULL)
 ORDER BY
-	[t1].[ParentID]
+	[t1].[Left_1]
 

Access.Ace.Odbc.LinqService/Tests/Linq/JoinTests/Tests.Linq.JoinTests.SqlRightJoinWithInnerJoinOnRightWithConditions(Access.Ace.Odbc.LinqService).sql

@@ -8,12 +8,12 @@ DECLARE @id1 Int -- Int32
 SET     @id1 = 1
 
 SELECT
-	[t1].[ParentID],
+	[t1].[Left_1],
 	[right_2].[Right_1]
 FROM
 	(
 		SELECT
-			[left_1].[ParentID],
+			[left_1].[ParentID] as [Left_1],
 			[left_1].[Value1]
 		FROM
 			[Parent] [left_1]
@@ -31,5 +31,5 @@ FROM
 				[right_1].[ParentID] <> ?
 		) [right_2] ON ([right_2].[c1] = [t1].[Value1] OR [right_2].[c1] IS NULL AND [t1].[Value1] IS NULL)
 ORDER BY
-	[t1].[ParentID]
+	[t1].[Left_1]
 

Access.Ace.Odbc.LinqService/Tests/Linq/SetOperatorComplexTests/Tests.Linq.SetOperatorComplexTests.EagerDifferentDetails(Access.Ace.Odbc.LinqService,Except).sql

@@ -14,7 +14,19 @@ FROM
 				INNER JOIN [BookAuthor] [b] ON ([b].[FkAuthorId] = [t1].[AuthorId]))
 				LEFT JOIN [Book] [a_Book] ON ([b].[FkBookId] = [a_Book].[BookId])
 		WHERE
-			[a_Book].[Discriminator] = 'Roman'
+			[a_Book].[Discriminator] = 'Roman' AND NOT EXISTS(
+				SELECT
+					*
+				FROM
+					([Author] [t2]
+						INNER JOIN [BookAuthor] [b_1] ON ([b_1].[FkAuthorId] = [t2].[AuthorId]))
+						LEFT JOIN [Book] [a_Book_1] ON ([b_1].[FkBookId] = [a_Book_1].[BookId])
+				WHERE
+					[a_Book_1].[Discriminator] = 'Novel' AND
+					([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL) AND
+					([a_Book].[BookName] = [a_Book_1].[BookName] OR [a_Book].[BookName] IS NULL AND [a_Book_1].[BookName] IS NULL) AND
+					[a_Book].[BookId] IS NULL
+			)
 	) [m_1]
 		INNER JOIN [BookAuthor] [d] ON ([d].[FkBookId] = [m_1].[BookId]))
 		LEFT JOIN [Author] [a_Author] ON ([d].[FkAuthorId] = [a_Author].[AuthorId])
@@ -30,7 +42,19 @@ FROM
 		INNER JOIN [BookAuthor] [b] ON ([b].[FkAuthorId] = [t1].[AuthorId]))
 		LEFT JOIN [Book] [a_Book] ON ([b].[FkBookId] = [a_Book].[BookId])
 WHERE
-	[a_Book].[Discriminator] = 'Roman'
+	[a_Book].[Discriminator] = 'Roman' AND NOT EXISTS(
+		SELECT
+			*
+		FROM
+			([Author] [t2]
+				INNER JOIN [BookAuthor] [b_1] ON ([b_1].[FkAuthorId] = [t2].[AuthorId]))
+				LEFT JOIN [Book] [a_Book_1] ON ([b_1].[FkBookId] = [a_Book_1].[BookId])
+		WHERE
+			[a_Book_1].[Discriminator] = 'Novel' AND
+			([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL) AND
+			([a_Book].[BookName] = [a_Book_1].[BookName] OR [a_Book].[BookName] IS NULL AND [a_Book_1].[BookName] IS NULL) AND
+			[a_Book].[BookId] IS NULL
+	)
 
 BeforeExecute
 -- Access.Ace.Odbc AccessODBC

Access.Ace.Odbc.LinqService/Tests/Linq/SetOperatorComplexTests/Tests.Linq.SetOperatorComplexTests.EagerDifferentDetails(Access.Ace.Odbc.LinqService,ExceptAll).sql

@@ -14,7 +14,19 @@ FROM
 				INNER JOIN [BookAuthor] [b] ON ([b].[FkAuthorId] = [t1].[AuthorId]))
 				LEFT JOIN [Book] [a_Book] ON ([b].[FkBookId] = [a_Book].[BookId])
 		WHERE
-			[a_Book].[Discriminator] = 'Roman'
+			[a_Book].[Discriminator] = 'Roman' AND NOT EXISTS(
+				SELECT
+					*
+				FROM
+					([Author] [t2]
+						INNER JOIN [BookAuthor] [b_1] ON ([b_1].[FkAuthorId] = [t2].[AuthorId]))
+						LEFT JOIN [Book] [a_Book_1] ON ([b_1].[FkBookId] = [a_Book_1].[BookId])
+				WHERE
+					[a_Book_1].[Discriminator] = 'Novel' AND
+					([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL) AND
+					([a_Book].[BookName] = [a_Book_1].[BookName] OR [a_Book].[BookName] IS NULL AND [a_Book_1].[BookName] IS NULL) AND
+					[a_Book].[BookId] IS NULL
+			)
 	) [m_1]
 		INNER JOIN [BookAuthor] [d] ON ([d].[FkBookId] = [m_1].[BookId]))
 		LEFT JOIN [Author] [a_Author] ON ([d].[FkAuthorId] = [a_Author].[AuthorId])
@@ -30,7 +42,19 @@ FROM
 		INNER JOIN [BookAuthor] [b] ON ([b].[FkAuthorId] = [t1].[AuthorId]))
 		LEFT JOIN [Book] [a_Book] ON ([b].[FkBookId] = [a_Book].[BookId])
 WHERE
-	[a_Book].[Discriminator] = 'Roman'
+	[a_Book].[Discriminator] = 'Roman' AND NOT EXISTS(
+		SELECT
+			*
+		FROM
+			([Author] [t2]
+				INNER JOIN [BookAuthor] [b_1] ON ([b_1].[FkAuthorId] = [t2].[AuthorId]))
+				LEFT JOIN [Book] [a_Book_1] ON ([b_1].[FkBookId] = [a_Book_1].[BookId])
+		WHERE
+			[a_Book_1].[Discriminator] = 'Novel' AND
+			([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL) AND
+			([a_Book].[BookName] = [a_Book_1].[BookName] OR [a_Book].[BookName] IS NULL AND [a_Book_1].[BookName] IS NULL) AND
+			[a_Book].[BookId] IS NULL
+	)
 
 BeforeExecute
 -- Access.Ace.Odbc AccessODBC

Access.Ace.Odbc.LinqService/Tests/Linq/SetOperatorComplexTests/Tests.Linq.SetOperatorComplexTests.EagerSameDetails(Access.Ace.Odbc.LinqService,Except).sql

@@ -23,9 +23,9 @@ FROM
 						LEFT JOIN [Book] [a_Book_1] ON ([b_1].[FkBookId] = [a_Book_1].[BookId])
 				WHERE
 					[a_Book_1].[Discriminator] = 'Novel' AND
-					[a_Book].[BookId] = [a_Book_1].[BookId] AND
+					([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL) AND
 					([a_Book].[BookName] = [a_Book_1].[BookName] OR [a_Book].[BookName] IS NULL AND [a_Book_1].[BookName] IS NULL) AND
-					[a_Book].[BookId] = [a_Book_1].[BookId]
+					([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL)
 			)
 	) [m_1]
 		INNER JOIN [BookAuthor] [d] ON ([d].[FkBookId] = [m_1].[BookId]))
@@ -51,9 +51,9 @@ WHERE
 				LEFT JOIN [Book] [a_Book_1] ON ([b_1].[FkBookId] = [a_Book_1].[BookId])
 		WHERE
 			[a_Book_1].[Discriminator] = 'Novel' AND
-			[a_Book].[BookId] = [a_Book_1].[BookId] AND
+			([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL) AND
 			([a_Book].[BookName] = [a_Book_1].[BookName] OR [a_Book].[BookName] IS NULL AND [a_Book_1].[BookName] IS NULL) AND
-			[a_Book].[BookId] = [a_Book_1].[BookId]
+			([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL)
 	)
 
 BeforeExecute

Access.Ace.Odbc.LinqService/Tests/Linq/SetOperatorComplexTests/Tests.Linq.SetOperatorComplexTests.EagerSameDetails(Access.Ace.Odbc.LinqService,ExceptAll).sql

@@ -23,9 +23,9 @@ FROM
 						LEFT JOIN [Book] [a_Book_1] ON ([b_1].[FkBookId] = [a_Book_1].[BookId])
 				WHERE
 					[a_Book_1].[Discriminator] = 'Novel' AND
-					[a_Book].[BookId] = [a_Book_1].[BookId] AND
+					([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL) AND
 					([a_Book].[BookName] = [a_Book_1].[BookName] OR [a_Book].[BookName] IS NULL AND [a_Book_1].[BookName] IS NULL) AND
-					[a_Book].[BookId] = [a_Book_1].[BookId]
+					([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL)
 			)
 	) [m_1]
 		INNER JOIN [BookAuthor] [d] ON ([d].[FkBookId] = [m_1].[BookId]))
@@ -51,9 +51,9 @@ WHERE
 				LEFT JOIN [Book] [a_Book_1] ON ([b_1].[FkBookId] = [a_Book_1].[BookId])
 		WHERE
 			[a_Book_1].[Discriminator] = 'Novel' AND
-			[a_Book].[BookId] = [a_Book_1].[BookId] AND
+			([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL) AND
 			([a_Book].[BookName] = [a_Book_1].[BookName] OR [a_Book].[BookName] IS NULL AND [a_Book_1].[BookName] IS NULL) AND
-			[a_Book].[BookId] = [a_Book_1].[BookId]
+			([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL)
 	)
 
 BeforeExecute

Access.Ace.Odbc.LinqService/Tests/Linq/SetOperatorComplexTests/Tests.Linq.SetOperatorComplexTests.EagerSameDetails(Access.Ace.Odbc.LinqService,Intersect).sql

@@ -23,9 +23,9 @@ FROM
 						LEFT JOIN [Book] [a_Book_1] ON ([b_1].[FkBookId] = [a_Book_1].[BookId])
 				WHERE
 					[a_Book_1].[Discriminator] = 'Novel' AND
-					[a_Book].[BookId] = [a_Book_1].[BookId] AND
+					([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL) AND
 					([a_Book].[BookName] = [a_Book_1].[BookName] OR [a_Book].[BookName] IS NULL AND [a_Book_1].[BookName] IS NULL) AND
-					[a_Book].[BookId] = [a_Book_1].[BookId]
+					([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL)
 			)
 	) [m_1]
 		INNER JOIN [BookAuthor] [d] ON ([d].[FkBookId] = [m_1].[BookId]))
@@ -51,9 +51,9 @@ WHERE
 				LEFT JOIN [Book] [a_Book_1] ON ([b_1].[FkBookId] = [a_Book_1].[BookId])
 		WHERE
 			[a_Book_1].[Discriminator] = 'Novel' AND
-			[a_Book].[BookId] = [a_Book_1].[BookId] AND
+			([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL) AND
 			([a_Book].[BookName] = [a_Book_1].[BookName] OR [a_Book].[BookName] IS NULL AND [a_Book_1].[BookName] IS NULL) AND
-			[a_Book].[BookId] = [a_Book_1].[BookId]
+			([a_Book].[BookId] = [a_Book_1].[BookId] OR [a_Book].[BookId] IS NULL AND [a_Book_1].[BookId] IS NULL)
 	)
 
 BeforeExecute