Skip to content

Commit 5d2d0b7

Browse files
ChrisJollyAUChrisJollyAU
committed
update to preview6
1 parent fc8873f commit 5d2d0b7

16 files changed

+232
-863
lines changed

‎Dependencies.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
3-
<DotNetVersion>[10.0.0-preview.5.25277.114,10.0.999]</DotNetVersion>
4-
<EFCoreVersion>[10.0.0-preview.5.25277.114,10.0.999]</EFCoreVersion>
5-
<MSLibVersion>[10.0.0-preview.5.25277.114,10.0.999]</MSLibVersion>
3+
<DotNetVersion>[10.0.0-preview.6.25358.103,10.0.999]</DotNetVersion>
4+
<EFCoreVersion>[10.0.0-preview.6.25358.103,10.0.999]</EFCoreVersion>
5+
<MSLibVersion>[10.0.0-preview.6.25358.103,10.0.999]</MSLibVersion>
66
</PropertyGroup>
77

88
<ItemGroup>
@@ -37,7 +37,7 @@
3737
<!-- EFCore.Jet.FunctionalTests -->
3838
<PackageReference Update="xunit.core" Version="2.9.3"/>
3939
<PackageReference Update="xunit.assert" Version="2.9.3" />
40-
<PackageReference Update="xunit.runner.visualstudio" Version="3.1.1" />
40+
<PackageReference Update="xunit.runner.visualstudio" Version="3.1.2" />
4141
<PackageReference Update="xunit.runner.console" Version="2.9.3" />
4242
<PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MSLibVersion)" />
4343
<PackageReference Update="NetTopologySuite" Version="2.5.0" />

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.5.25277.114",
3+
"version": "10.0.100-preview.6.25358.103",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature"
66
}

‎test/EFCore.Jet.FunctionalTests/Query/GearsOfWarQueryJetTest.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7324,6 +7324,19 @@ ORDER BY `g`.`Nickname`
73247324
""");
73257325
}
73267326

7327+
public override async Task Enum_array_contains(bool async)
7328+
{
7329+
await base.Enum_array_contains(async);
7330+
7331+
AssertSql(
7332+
"""
7333+
SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
7334+
FROM `Weapons` AS `w`
7335+
LEFT JOIN `Weapons` AS `w0` ON `w`.`SynergyWithId` = `w0`.`Id`
7336+
WHERE `w0`.`Id` IS NOT NULL AND (`w0`.`AmmunitionType` IS NULL OR `w0`.`AmmunitionType` = 1)
7337+
""");
7338+
}
7339+
73277340
public override async Task Coalesce_with_non_root_evaluatable_Convert(bool async)
73287341
{
73297342
await base.Coalesce_with_non_root_evaluatable_Convert(async);

‎test/EFCore.Jet.FunctionalTests/Query/NorthwindAggregateOperatorsQueryJetTest.ResultOperators.cs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ public override async Task LastOrDefault_when_no_order_by(bool async)
4444
AssertSql();
4545
}
4646

47+
public override async Task Contains_with_local_tuple_array_closure(bool async)
48+
=> await AssertTranslationFailed(() => base.Contains_with_local_tuple_array_closure(async));
49+
4750
public override async Task Array_cast_to_IEnumerable_Contains_with_constant(bool async)
4851
{
4952
await base.Array_cast_to_IEnumerable_Contains_with_constant(async);
@@ -1639,6 +1642,24 @@ public override async Task Contains_with_local_uint_array_closure(bool isAsync)
16391642
""");
16401643
}
16411644

1645+
public override async Task Contains_with_local_nullable_uint_array_closure(bool async)
1646+
{
1647+
await base.Contains_with_local_nullable_uint_array_closure(async);
1648+
1649+
AssertSql(
1650+
"""
1651+
SELECT `e`.`EmployeeID`, `e`.`City`, `e`.`Country`, `e`.`FirstName`, `e`.`ReportsTo`, `e`.`Title`
1652+
FROM `Employees` AS `e`
1653+
WHERE `e`.`EmployeeID` IN (0, 1)
1654+
""",
1655+
//
1656+
"""
1657+
SELECT `e`.`EmployeeID`, `e`.`City`, `e`.`Country`, `e`.`FirstName`, `e`.`ReportsTo`, `e`.`Title`
1658+
FROM `Employees` AS `e`
1659+
WHERE `e`.`EmployeeID` = 0
1660+
""");
1661+
}
1662+
16421663
public override async Task Contains_with_local_array_inline(bool isAsync)
16431664
{
16441665
await base.Contains_with_local_array_inline(isAsync);
@@ -2061,6 +2082,13 @@ SELECT IIF(@p IN (
20612082
""");
20622083
}
20632084

2085+
public override async Task Contains_with_local_anonymous_type_array_closure(bool async)
2086+
{
2087+
await AssertTranslationFailed(() => base.Contains_with_local_anonymous_type_array_closure(async));
2088+
2089+
AssertSql();
2090+
}
2091+
20642092
public override async Task OfType_Select(bool async)
20652093
{
20662094
await base.OfType_Select(async);

‎test/EFCore.Jet.FunctionalTests/Query/NorthwindSetOperationsQueryJetTest.cs‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,28 @@ WHERE CHARINDEX('Thomas', `c1`.`ContactName`) > 0
211211
""");
212212
}
213213

214-
[ConditionalTheory]
214+
public override async Task Union_inside_Concat(bool async)
215+
{
216+
await base.Union_inside_Concat(async);
217+
218+
AssertSql(
219+
"""
220+
SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
221+
FROM `Customers` AS `c`
222+
WHERE `c`.`City` = 'Berlin'
223+
UNION ALL
224+
(
225+
SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
226+
FROM `Customers` AS `c0`
227+
WHERE `c0`.`City` = 'London'
228+
UNION
229+
SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`
230+
FROM `Customers` AS `c1`
231+
WHERE `c1`.`City` = 'Berlin'
232+
)
233+
""");
234+
}
235+
215236
public override async Task Union_Take_Union_Take(bool isAsync)
216237
{
217238
await base.Union_Take_Union_Take(isAsync);
@@ -1252,6 +1273,27 @@ FROM [Customers] AS [c1]
12521273
""");
12531274
}
12541275

1276+
public override async Task Except_nested2(bool async)
1277+
{
1278+
await base.Except_nested2(async);
1279+
1280+
AssertSql(
1281+
"""
1282+
SELECT [c].[CustomerID], [c].[Address], [c].[City], [c].[CompanyName], [c].[ContactName], [c].[ContactTitle], [c].[Country], [c].[Fax], [c].[Phone], [c].[PostalCode], [c].[Region]
1283+
FROM [Customers] AS [c]
1284+
EXCEPT
1285+
(
1286+
SELECT [c0].[CustomerID], [c0].[Address], [c0].[City], [c0].[CompanyName], [c0].[ContactName], [c0].[ContactTitle], [c0].[Country], [c0].[Fax], [c0].[Phone], [c0].[PostalCode], [c0].[Region]
1287+
FROM [Customers] AS [c0]
1288+
WHERE [c0].[City] = N'Seattle'
1289+
EXCEPT
1290+
SELECT [c1].[CustomerID], [c1].[Address], [c1].[City], [c1].[CompanyName], [c1].[ContactName], [c1].[ContactTitle], [c1].[Country], [c1].[Fax], [c1].[Phone], [c1].[PostalCode], [c1].[Region]
1291+
FROM [Customers] AS [c1]
1292+
WHERE [c1].[City] = N'Seattle'
1293+
)
1294+
""");
1295+
}
1296+
12551297
public override async Task Intersect_non_entity(bool async)
12561298
{
12571299
await base.Intersect_non_entity(async);

‎test/EFCore.Jet.FunctionalTests/Query/NorthwindWhereQueryJetTest.cs‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1900,6 +1900,25 @@ SELECT COUNT(*)
19001900
""");
19011901
}
19021902

1903+
public override async Task Where_collection_navigation_ToArray_Contains(bool async)
1904+
{
1905+
await base.Where_collection_navigation_ToArray_Contains(async);
1906+
1907+
AssertSql(
1908+
"""
1909+
@entity_equality_order_OrderID='10248' (Nullable = true)
1910+
1911+
SELECT `c`.`CustomerID`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
1912+
FROM `Customers` AS `c`
1913+
LEFT JOIN `Orders` AS `o0` ON `c`.`CustomerID` = `o0`.`CustomerID`
1914+
WHERE EXISTS (
1915+
SELECT 1
1916+
FROM `Orders` AS `o`
1917+
WHERE `c`.`CustomerID` = `o`.`CustomerID` AND `o`.`OrderID` = @entity_equality_order_OrderID)
1918+
ORDER BY `c`.`CustomerID`, `o0`.`OrderID`
1919+
""");
1920+
}
1921+
19031922
public override async Task Where_collection_navigation_AsEnumerable_Count(bool async)
19041923
{
19051924
await base.Where_collection_navigation_AsEnumerable_Count(async);
@@ -1982,6 +2001,18 @@ public override async Task Where_list_object_contains_over_value_type(bool async
19822001
""");
19832002
}
19842003

2004+
public override async Task Where_array_of_object_contains_over_value_type(bool async)
2005+
{
2006+
await base.Where_array_of_object_contains_over_value_type(async);
2007+
2008+
AssertSql(
2009+
"""
2010+
SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
2011+
FROM `Orders` AS `o`
2012+
WHERE `o`.`OrderID` IN (10248, 10249)
2013+
""");
2014+
}
2015+
19852016
public override async Task Multiple_OrElse_on_same_column_converted_to_in_with_overlap(bool async)
19862017
{
19872018
await base.Multiple_OrElse_on_same_column_converted_to_in_with_overlap(async);

‎test/EFCore.Jet.FunctionalTests/Query/PrimitiveCollectionsQueryJetTest.cs‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,30 @@ public override async Task Inline_collection_of_ints_Contains(bool async)
4242
""");
4343
}
4444

45+
public override async Task Inline_collection_of_nullable_ints_Contains(bool async)
46+
{
47+
await base.Inline_collection_of_nullable_ints_Contains(async);
48+
49+
AssertSql(
50+
"""
51+
SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`NullableWrappedId`, `p`.`NullableWrappedIdWithNullableComparer`, `p`.`String`, `p`.`Strings`, `p`.`WrappedId`
52+
FROM `PrimitiveCollectionsEntity` AS `p`
53+
WHERE `p`.`NullableInt` IN (10, 999)
54+
""");
55+
}
56+
57+
public override async Task Inline_collection_of_nullable_ints_Contains_null(bool async)
58+
{
59+
await base.Inline_collection_of_nullable_ints_Contains_null(async);
60+
61+
AssertSql(
62+
"""
63+
SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`NullableWrappedId`, `p`.`NullableWrappedIdWithNullableComparer`, `p`.`String`, `p`.`Strings`, `p`.`WrappedId`
64+
FROM `PrimitiveCollectionsEntity` AS `p`
65+
WHERE `p`.`NullableInt` IS NULL OR `p`.`NullableInt` = 999
66+
""");
67+
}
68+
4569
public override async Task Inline_collection_Count_with_zero_values(bool async)
4670
{
4771
await base.Inline_collection_Count_with_zero_values(async);
@@ -557,6 +581,42 @@ public override async Task Parameter_collection_of_ints_Contains_nullable_int(bo
557581
""");
558582
}
559583

584+
public override async Task Parameter_collection_of_nullable_ints_Contains_int(bool async)
585+
{
586+
await base.Parameter_collection_of_nullable_ints_Contains_int(async);
587+
588+
AssertSql(
589+
"""
590+
SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`NullableWrappedId`, `p`.`NullableWrappedIdWithNullableComparer`, `p`.`String`, `p`.`Strings`, `p`.`WrappedId`
591+
FROM `PrimitiveCollectionsEntity` AS `p`
592+
WHERE `p`.`Int` IN (10, 999)
593+
""",
594+
//
595+
"""
596+
SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`NullableWrappedId`, `p`.`NullableWrappedIdWithNullableComparer`, `p`.`String`, `p`.`Strings`, `p`.`WrappedId`
597+
FROM `PrimitiveCollectionsEntity` AS `p`
598+
WHERE `p`.`Int` NOT IN (10, 999)
599+
""");
600+
}
601+
602+
public override async Task Parameter_collection_of_nullable_ints_Contains_nullable_int(bool async)
603+
{
604+
await base.Parameter_collection_of_nullable_ints_Contains_nullable_int(async);
605+
606+
AssertSql(
607+
"""
608+
SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`NullableWrappedId`, `p`.`NullableWrappedIdWithNullableComparer`, `p`.`String`, `p`.`Strings`, `p`.`WrappedId`
609+
FROM `PrimitiveCollectionsEntity` AS `p`
610+
WHERE `p`.`NullableInt` IS NULL OR `p`.`NullableInt` = 999
611+
""",
612+
//
613+
"""
614+
SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`NullableWrappedId`, `p`.`NullableWrappedIdWithNullableComparer`, `p`.`String`, `p`.`Strings`, `p`.`WrappedId`
615+
FROM `PrimitiveCollectionsEntity` AS `p`
616+
WHERE `p`.`NullableInt` IS NOT NULL AND `p`.`NullableInt` <> 999
617+
""");
618+
}
619+
560620
public override async Task Parameter_collection_of_strings_Contains_string(bool async)
561621
{
562622
await base.Parameter_collection_of_strings_Contains_string(async);
@@ -653,6 +713,18 @@ public override async Task Parameter_collection_of_bools_Contains(bool async)
653713
""");
654714
}
655715

716+
public override async Task Parameter_collection_of_enums_Contains(bool async)
717+
{
718+
await base.Parameter_collection_of_enums_Contains(async);
719+
720+
AssertSql(
721+
"""
722+
SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`NullableWrappedId`, `p`.`NullableWrappedIdWithNullableComparer`, `p`.`String`, `p`.`Strings`, `p`.`WrappedId`
723+
FROM `PrimitiveCollectionsEntity` AS `p`
724+
WHERE `p`.`Enum` IN (0, 3)
725+
""");
726+
}
727+
656728
public override async Task Parameter_collection_null_Contains(bool async)
657729
{
658730
await base.Parameter_collection_null_Contains(async);
@@ -724,6 +796,12 @@ SELECT 1000 AS `Value`
724796
public override Task Column_collection_of_ints_Contains(bool async)
725797
=> AssertTranslationFailedWithDetails(() => base.Column_collection_of_ints_Contains(async), JetStrings.QueryingIntoJsonCollectionsNotSupported());
726798

799+
public override Task Column_collection_of_nullable_ints_Contains(bool async)
800+
=> AssertTranslationFailedWithDetails(() => base.Column_collection_of_nullable_ints_Contains(async), JetStrings.QueryingIntoJsonCollectionsNotSupported());
801+
802+
public override Task Column_collection_of_nullable_ints_Contains_null(bool async)
803+
=> AssertTranslationFailedWithDetails(() => base.Column_collection_of_nullable_ints_Contains_null(async), JetStrings.QueryingIntoJsonCollectionsNotSupported());
804+
727805
public override Task Column_collection_of_strings_contains_null(bool async)
728806
=> AssertTranslationFailed(() => base.Column_collection_of_strings_contains_null(async));
729807

‎test/EFCore.Jet.FunctionalTests/Query/Relationships/OwnedRelationshipsJetFixture.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
3838
{
3939
entity.SetTableName("Root_OptionalReferenceTrunk_OptionalReferenceBranch_CollB7BC1840");
4040
}
41-
41+
if (entity.GetTableName() == "RelationshipsBranchEntityRelationshipsTrunkEntityRelationshipsR~")
42+
{
43+
entity.SetTableName("RelBranchEntityRelationshipsTrunkEntityRelationshipsR");
44+
}
4245
}
4346
}
4447
}

‎test/EFCore.Jet.FunctionalTests/Query/Relationships/Projection/OwnedNoTrackingProjectionJetTest.cs‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,6 @@ public OwnedNoTrackingProjectionJetTest(OwnedRelationshipsJetFixture fixture, IT
2222
public override async Task Select_trunk_collection(bool async)
2323
{
2424
await base.Select_trunk_collection(async);
25-
26-
AssertSql(
27-
"""
28-
SELECT `r`.`Id`, `s0`.`RelationshipsRootEntityId`, `s0`.`Id1`, `s0`.`Name`, `s0`.`RelationshipsTrunkEntityRelationshipsRootEntityId`, `s0`.`RelationshipsTrunkEntityId1`, `s0`.`Id10`, `s0`.`Name0`, `s0`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelationshipsR~`, `s0`.`RelationshipsBranchEntityRelationshipsTrunkEntityId1`, `s0`.`RelationshipsBranchEntityId1`, `s0`.`Id100`, `s0`.`Name00`, `s0`.`OptionalReferenceLeaf_Name`, `s0`.`RequiredReferenceLeaf_Name`, `s0`.`OptionalReferenceBranch_Name`, `s0`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelatio3F20AD83`, `s0`.`RelationshipsBranchEntityRelationshipsTrunkEntityId10`, `s0`.`Id11`, `s0`.`Name1`, `s0`.`OptionalReferenceBranch_OptionalReferenceLeaf_Name`, `s0`.`OptionalReferenceBranch_RequiredReferenceLeaf_Name`, `s0`.`RequiredReferenceBranch_Name`, `s0`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelatioB0EAE515`, `s0`.`RelationshipsBranchEntityRelationshipsTrunkEntityId11`, `s0`.`Id12`, `s0`.`Name2`, `s0`.`RequiredReferenceBranch_OptionalReferenceLeaf_Name`, `s0`.`RequiredReferenceBranch_RequiredReferenceLeaf_Name`
29-
FROM `RootEntities` AS `r`
30-
LEFT JOIN (
31-
SELECT `r0`.`RelationshipsRootEntityId`, `r0`.`Id1`, `r0`.`Name`, `s`.`RelationshipsTrunkEntityRelationshipsRootEntityId`, `s`.`RelationshipsTrunkEntityId1`, `s`.`Id1` AS `Id10`, `s`.`Name` AS `Name0`, `s`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelationshipsR~`, `s`.`RelationshipsBranchEntityRelationshipsTrunkEntityId1`, `s`.`RelationshipsBranchEntityId1`, `s`.`Id10` AS `Id100`, `s`.`Name0` AS `Name00`, `s`.`OptionalReferenceLeaf_Name`, `s`.`RequiredReferenceLeaf_Name`, `r0`.`OptionalReferenceBranch_Name`, `r3`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelationshipsR~` AS `RelationshipsBranchEntityRelationshipsTrunkEntityRelatio3F20AD83`, `r3`.`RelationshipsBranchEntityRelationshipsTrunkEntityId1` AS `RelationshipsBranchEntityRelationshipsTrunkEntityId10`, `r3`.`Id1` AS `Id11`, `r3`.`Name` AS `Name1`, `r0`.`OptionalReferenceBranch_OptionalReferenceLeaf_Name`, `r0`.`OptionalReferenceBranch_RequiredReferenceLeaf_Name`, `r0`.`RequiredReferenceBranch_Name`, `r4`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelationshipsR~` AS `RelationshipsBranchEntityRelationshipsTrunkEntityRelatioB0EAE515`, `r4`.`RelationshipsBranchEntityRelationshipsTrunkEntityId1` AS `RelationshipsBranchEntityRelationshipsTrunkEntityId11`, `r4`.`Id1` AS `Id12`, `r4`.`Name` AS `Name2`, `r0`.`RequiredReferenceBranch_OptionalReferenceLeaf_Name`, `r0`.`RequiredReferenceBranch_RequiredReferenceLeaf_Name`
32-
FROM ((`Root_CollectionTrunk` AS `r0`
33-
LEFT JOIN (
34-
SELECT `r1`.`RelationshipsTrunkEntityRelationshipsRootEntityId`, `r1`.`RelationshipsTrunkEntityId1`, `r1`.`Id1`, `r1`.`Name`, `r2`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelationshipsR~`, `r2`.`RelationshipsBranchEntityRelationshipsTrunkEntityId1`, `r2`.`RelationshipsBranchEntityId1`, `r2`.`Id1` AS `Id10`, `r2`.`Name` AS `Name0`, `r1`.`OptionalReferenceLeaf_Name`, `r1`.`RequiredReferenceLeaf_Name`
35-
FROM `Root_CollectionTrunk_CollectionBranch` AS `r1`
36-
LEFT JOIN `Root_CollectionTrunk_CollectionBranch_CollectionLeaf` AS `r2` ON `r1`.`RelationshipsTrunkEntityRelationshipsRootEntityId` = `r2`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelationshipsR~` AND `r1`.`RelationshipsTrunkEntityId1` = `r2`.`RelationshipsBranchEntityRelationshipsTrunkEntityId1` AND `r1`.`Id1` = `r2`.`RelationshipsBranchEntityId1`
37-
) AS `s` ON `r0`.`RelationshipsRootEntityId` = `s`.`RelationshipsTrunkEntityRelationshipsRootEntityId` AND `r0`.`Id1` = `s`.`RelationshipsTrunkEntityId1`)
38-
LEFT JOIN `Root_CollectionTrunk_OptionalReferenceBranch_CollectionLeaf` AS `r3` ON IIF(`r0`.`OptionalReferenceBranch_Name` IS NOT NULL, `r0`.`RelationshipsRootEntityId`, NULL) = `r3`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelationshipsR~` AND IIF(`r0`.`OptionalReferenceBranch_Name` IS NOT NULL, `r0`.`Id1`, NULL) = `r3`.`RelationshipsBranchEntityRelationshipsTrunkEntityId1`)
39-
LEFT JOIN `Root_CollectionTrunk_RequiredReferenceBranch_CollectionLeaf` AS `r4` ON `r0`.`RelationshipsRootEntityId` = `r4`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelationshipsR~` AND `r0`.`Id1` = `r4`.`RelationshipsBranchEntityRelationshipsTrunkEntityId1`
40-
) AS `s0` ON `r`.`Id` = `s0`.`RelationshipsRootEntityId`
41-
ORDER BY `r`.`Id`, `s0`.`RelationshipsRootEntityId`, `s0`.`Id1`, `s0`.`RelationshipsTrunkEntityRelationshipsRootEntityId`, `s0`.`RelationshipsTrunkEntityId1`, `s0`.`Id10`, `s0`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelationshipsR~`, `s0`.`RelationshipsBranchEntityRelationshipsTrunkEntityId1`, `s0`.`RelationshipsBranchEntityId1`, `s0`.`Id100`, `s0`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelatio3F20AD83`, `s0`.`RelationshipsBranchEntityRelationshipsTrunkEntityId10`, `s0`.`Id11`, `s0`.`RelationshipsBranchEntityRelationshipsTrunkEntityRelatioB0EAE515`, `s0`.`RelationshipsBranchEntityRelationshipsTrunkEntityId11`
42-
""");
4325
}
4426

4527
public override async Task Select_branch_required_collection(bool async)

0 commit comments

Comments
 (0)