Re-enable OUTER JOIN tests as this is supported since FirebirdSQL#1238

niekschoemaker · niekschoemaker · commit 521ce9732d67 · 2025-11-29T18:43:03.000+01:00
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/Associations/Navigations/NavigationsCollectionFbTest.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/Associations/Navigations/NavigationsCollectionFbTest.cs
@@ -17,6 +17,7 @@
 
 using System.Threading.Tasks;
 using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
+using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.TestUtilities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query.Associations.Navigations;
 using Xunit;
@@ -33,11 +34,13 @@ public NavigationsCollectionFbTest(NavigationsFbFixture fixture, ITestOutputHelp
 		Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
 	}
 
-	// Uses OUTER JOIN
-	[NotSupportedByProviderTheory]
+	[Theory]
 	[MemberData(nameof(TrackingData))]
 	public override Task Distinct_projected(QueryTrackingBehavior queryTrackingBehavior)
 	{
+		var fbTestStore = (FbTestStore)Fixture.TestStore;
+		if (fbTestStore.ServerLessThan4())
+			return Task.CompletedTask;
 		return base.Distinct_projected(queryTrackingBehavior);
 	}
 }
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionFbTest.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionFbTest.cs
@@ -17,6 +17,7 @@
 
 using System.Threading.Tasks;
 using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
+using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.TestUtilities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query.Associations.Navigations;
 using Xunit;
@@ -31,20 +32,24 @@ public NavigationsProjectionFbTest(NavigationsFbFixture fixture, ITestOutputHelp
 		Fixture.TestSqlLoggerFactory.Clear();
 		Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
 	}
-
-	// Uses OUTER JOIN
-	[NotSupportedByProviderTheory]
+	
+	[Theory]
 	[MemberData(nameof(TrackingData))]
 	public override Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
 	{
+		var fbTestStore = (FbTestStore)Fixture.TestStore;
+		if (fbTestStore.ServerLessThan4())
+			return Task.CompletedTask;
 		return base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior);
 	}
 
-	// Uses OUTER JOIN
-	[NotSupportedByProviderTheory]
+	[Theory]
 	[MemberData(nameof(TrackingData))]
 	public override Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
 	{
+		var fbTestStore = (FbTestStore)Fixture.TestStore;
+		if (fbTestStore.ServerLessThan4())
+			return Task.CompletedTask;
 		return base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior);
 	}
 }
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionFbTest.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionFbTest.cs
@@ -17,6 +17,7 @@
 
 using System.Threading.Tasks;
 using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
+using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.TestUtilities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations;
 using Xunit;
@@ -32,11 +33,13 @@ public OwnedNavigationsCollectionFbTest(OwnedNavigationsFbFixture fixture, ITest
 		Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
 	}
 
-	// Uses OUTER JOIN
-	[NotSupportedByProviderTheory]
+	[Theory]
 	[MemberData(nameof(TrackingData))]
 	public override Task Distinct_projected(QueryTrackingBehavior queryTrackingBehavior)
 	{
+		var fbTestStore = (FbTestStore)Fixture.TestStore;
+		if (fbTestStore.ServerLessThan4())
+			return Task.CompletedTask;
 		return base.Distinct_projected(queryTrackingBehavior);
 	}
 }
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionFbTest.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionFbTest.cs
@@ -17,6 +17,7 @@
 
 using System.Threading.Tasks;
 using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
+using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.TestUtilities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations;
 using Xunit;
@@ -32,19 +33,23 @@ public OwnedNavigationsProjectionFbTest(OwnedNavigationsFbFixture fixture, ITest
 		Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
 	}
 
-	// Uses OUTER JOIN
-	[NotSupportedOnFirebirdTheory]
+	[Theory]
 	[MemberData(nameof(TrackingData))]
 	public override Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
 	{
+		var fbTestStore = (FbTestStore)Fixture.TestStore;
+		if (fbTestStore.ServerLessThan4())
+			return Task.CompletedTask;
 		return base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior);
 	}
 
-	// Uses OUTER JOIN
-	[NotSupportedByProviderTheory]
+	[Theory]
 	[MemberData(nameof(TrackingData))]
 	public override Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
 	{
+		var fbTestStore = (FbTestStore)Fixture.TestStore;
+		if (fbTestStore.ServerLessThan4())
+			return Task.CompletedTask;
 		return base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior);
 	}
 }
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsFbTest.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsFbTest.cs
@@ -32,7 +32,6 @@ public OwnedNavigationsSetOperationsFbTest(OwnedNavigationsFbFixture fixture, IT
 		Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
 	}
 
-	// Uses OUTER JOIN
 	[NotSupportedByProviderTheory]
 	[MemberData(nameof(TrackingData))]
 	public override Task Over_associate_collection_projected(QueryTrackingBehavior queryTrackingBehavior)
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionFbTest.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionFbTest.cs
@@ -17,6 +17,7 @@
 
 using System.Threading.Tasks;
 using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
+using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.TestUtilities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting;
 using Xunit;
@@ -32,19 +33,23 @@ public OwnedTableSplittingProjectionFbTest(OwnedTableSplittingFbFixture fixture,
 		Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
 	}
 
-	// Uses OUTER JOIN
-	[NotSupportedByProviderTheory]
+	[Theory]
 	[MemberData(nameof(TrackingData))]
 	public override Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
 	{
+		var fbTestStore = (FbTestStore)Fixture.TestStore;
+		if (fbTestStore.ServerLessThan4())
+			return Task.CompletedTask;
 		return base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior);
 	}
 
-	// Uses OUTER JOIN
-	[NotSupportedByProviderTheory]
+	[Theory]
 	[MemberData(nameof(TrackingData))]
 	public override Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
 	{
+		var fbTestStore = (FbTestStore)Fixture.TestStore;
+		if (fbTestStore.ServerLessThan4())
+			return Task.CompletedTask;
 		return base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior);
 	}
 }
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/PrimitiveCollectionsQueryFbTest.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/PrimitiveCollectionsQueryFbTest.cs
@@ -476,7 +476,6 @@ public override Task Project_empty_collection_of_nullables_and_collection_only_c
 		return base.Project_empty_collection_of_nullables_and_collection_only_containing_nulls();
 	}
 
-	// Uses OUTER JOIN
 	[NotSupportedByProviderFact]
 	public override Task Project_inline_collection_with_Union()
 	{

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`using System.Threading.Tasks;`
`19`	`19`	`using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;`
	`20`	`+using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.TestUtilities;`
`20`	`21`	`using Microsoft.EntityFrameworkCore;`
`21`	`22`	`using Microsoft.EntityFrameworkCore.Query.Associations.Navigations;`
`22`	`23`	`using Xunit;`
`@@ -33,11 +34,13 @@ public NavigationsCollectionFbTest(NavigationsFbFixture fixture, ITestOutputHelp`
`33`	`34`	`Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);`
`34`	`35`	`}`
`35`	`36`
`36`		`- // Uses OUTER JOIN`
`37`		`- [NotSupportedByProviderTheory]`
	`37`	`+ [Theory]`
`38`	`38`	`[MemberData(nameof(TrackingData))]`
`39`	`39`	`public override Task Distinct_projected(QueryTrackingBehavior queryTrackingBehavior)`
`40`	`40`	`{`
	`41`	`+ var fbTestStore = (FbTestStore)Fixture.TestStore;`
	`42`	`+ if (fbTestStore.ServerLessThan4())`
	`43`	`+ return Task.CompletedTask;`
`41`	`44`	`return base.Distinct_projected(queryTrackingBehavior);`
`42`	`45`	`}`
`43`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ public OwnedNavigationsSetOperationsFbTest(OwnedNavigationsFbFixture fixture, IT`
`32`	`32`	`Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);`
`33`	`33`	`}`
`34`	`34`
`35`		`- // Uses OUTER JOIN`
`36`	`35`	`[NotSupportedByProviderTheory]`
`37`	`36`	`[MemberData(nameof(TrackingData))]`
`38`	`37`	`public override Task Over_associate_collection_projected(QueryTrackingBehavior queryTrackingBehavior)`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,6 @@ public override Task Project_empty_collection_of_nullables_and_collection_only_c`
`476`	`476`	`return base.Project_empty_collection_of_nullables_and_collection_only_containing_nulls();`
`477`	`477`	`}`
`478`	`478`
`479`		`- // Uses OUTER JOIN`
`480`	`479`	`[NotSupportedByProviderFact]`
`481`	`480`	`public override Task Project_inline_collection_with_Union()`
`482`	`481`	`{`