how-to
/
EntityFrameworkCore.Jet
mirror of https://github.com/bubibubi/EntityFrameworkCore.Jet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix generating sets (union, intersect). The code was originally executing and returning before it could handle adding the SQL for the Alias in (including wrapping the section in brackets). This realigns with how the parent VisitSelect works

Browse Source
pull/144/head
Christopher Jolly 2 years ago
parent d78256f53d
commit 2281916b88
7 changed files with 5543 additions and 5629 deletions
Show Stats Download Patch File Download Diff File

20
src/EFCore.Jet/Query/Sql/Internal/JetQuerySqlGenerator.cs
Unescape Escape View File

@ -72,14 +72,6 @@ namespace EntityFrameworkCore.Jet.Query.Sql.Internal
// workaround. // workaround.
// Should be kept in sync with the base class. // Should be kept in sync with the base class.
if (IsNonComposedSetOperation(selectExpression))
{
// Naked set operation
GenerateSetOperation((SetOperationBase)selectExpression.Tables[0]);
return selectExpression;
}
IDisposable? subQueryIndent = null; IDisposable? subQueryIndent = null;
if (selectExpression.Alias != null) if (selectExpression.Alias != null)
@ -88,6 +80,9 @@ namespace EntityFrameworkCore.Jet.Query.Sql.Internal
subQueryIndent = Sql.Indent(); subQueryIndent = Sql.Indent();
} }
if (!TryGenerateWithoutWrappingSelect(selectExpression))
{
Sql.Append("SELECT "); Sql.Append("SELECT ");
if (selectExpression.IsDistinct) if (selectExpression.IsDistinct)
@ -163,6 +158,7 @@ namespace EntityFrameworkCore.Jet.Query.Sql.Internal
Sql.AppendLine(); Sql.AppendLine();
} }
List<ColumnExpression> tempcolexp; List<ColumnExpression> tempcolexp;
if (tableExpression is InnerJoinExpression expression) if (tableExpression is InnerJoinExpression expression)
{ {
@ -187,6 +183,7 @@ namespace EntityFrameworkCore.Jet.Query.Sql.Internal
{ {
colexp.AddRange(tempcolexp); colexp.AddRange(tempcolexp);
} }
/*if (expression.JoinPredicate is SqlBinaryExpression { Left: ColumnExpression left, Right: ColumnExpression right }) /*if (expression.JoinPredicate is SqlBinaryExpression { Left: ColumnExpression left, Right: ColumnExpression right })
{ {
var lt = left.Table == selectExpression.Tables[0]; var lt = left.Table == selectExpression.Tables[0];
@ -244,6 +241,7 @@ namespace EntityFrameworkCore.Jet.Query.Sql.Internal
{ {
Sql.Append($"`{exp.TableAlias}`."); Sql.Append($"`{exp.TableAlias}`.");
} }
Sql.Append($"`{exp.Name}` IS NOT NULL"); Sql.Append($"`{exp.Name}` IS NOT NULL");
if (ct < colexp.Count - 1) if (ct < colexp.Count - 1)
{ {
@ -278,12 +276,16 @@ namespace EntityFrameworkCore.Jet.Query.Sql.Internal
GenerateOrderings(selectExpression); GenerateOrderings(selectExpression);
GenerateLimitOffset(selectExpression); GenerateLimitOffset(selectExpression);
}
if (selectExpression.Alias != null) if (selectExpression.Alias != null)
{ {
subQueryIndent!.Dispose(); subQueryIndent!.Dispose();
Sql.AppendLine() Sql.AppendLine()
.Append(")" + AliasSeparator + _sqlGenerationHelper.DelimitIdentifier(selectExpression.Alias)); .Append(")")
.Append(AliasSeparator)
.Append(_sqlGenerationHelper.DelimitIdentifier(selectExpression.Alias));
} }
return selectExpression; return selectExpression;

14
test/EFCore.Jet.FunctionalTests/Query/SimpleQueryJetTest.cs
Unescape Escape View File

@ -519,15 +519,15 @@ WHERE (`d`.`Id` IS NOT NULL OR `c`.`Id` IS NOT NULL) AND (`a`.`Species` LIKE 'F%
AssertSql( AssertSql(
""" """
SELECT [t].[Id], [t].[Species], [t].[Name], [t].[EdcuationLevel], [t].[FavoriteToy], [t].[Discriminator] SELECT `t`.`Id`, `t`.`Species`, `t`.`Name`, `t`.`EdcuationLevel`, `t`.`FavoriteToy`, `t`.`Discriminator`
FROM ( FROM (
SELECT [c].[Id], [c].[Species], [c].[Name], [c].[EdcuationLevel], NULL AS [FavoriteToy], N'Cat' AS [Discriminator] SELECT `c`.`Id`, `c`.`Species`, `c`.`Name`, `c`.`EdcuationLevel`, NULL AS `FavoriteToy`, 'Cat' AS `Discriminator`
FROM [Cats] AS [c] FROM `Cats` AS `c`
UNION ALL UNION ALL
SELECT [d].[Id], [d].[Species], [d].[Name], NULL AS [EdcuationLevel], [d].[FavoriteToy], N'Dog' AS [Discriminator] SELECT `d`.`Id`, `d`.`Species`, `d`.`Name`, NULL AS `EdcuationLevel`, `d`.`FavoriteToy`, 'Dog' AS `Discriminator`
FROM [Dogs] AS [d] FROM `Dogs` AS `d`
) AS [t] ) AS `t`
WHERE ([t].[Species] IS NOT NULL) AND ([t].[Species] LIKE N'F%') WHERE `t`.`Species` LIKE 'F%'
"""); """);
} }

7361
test/EFCore.Jet.FunctionalTests/Query/TPCGearsOfWarQueryJetTest.cs
View File

File diff suppressed because it is too large Load Diff

132
test/EFCore.Jet.FunctionalTests/Query/TPCManyToManyNoTrackingQueryJetTest.cs
Unescape Escape View File

@ -197,25 +197,25 @@ INNER JOIN (
AssertSql( AssertSql(
""" """
SELECT MIN([t0].[Id]) SELECT MIN(`t0`.`Id`)
FROM [EntityThrees] AS [e] FROM `EntityThrees` AS `e`
INNER JOIN ( INNER JOIN (
SELECT [t].[Id], [e0].[ThreeSkipSharedId] SELECT `t`.`Id`, `e0`.`ThreeSkipSharedId`
FROM [EntityRootEntityThree] AS [e0] FROM `EntityRootEntityThree` AS `e0`
INNER JOIN ( INNER JOIN (
SELECT [r].[Id] SELECT `r`.`Id`
FROM [Roots] AS [r] FROM `Roots` AS `r`
UNION ALL UNION ALL
SELECT [b].[Id] SELECT `b`.`Id`
FROM [Branches] AS [b] FROM `Branches` AS `b`
UNION ALL UNION ALL
SELECT [l].[Id] SELECT `l`.`Id`
FROM [Leaves] AS [l] FROM `Leaves` AS `l`
UNION ALL UNION ALL
SELECT [l0].[Id] SELECT `l0`.`Id`
FROM [Leaf2s] AS [l0] FROM `Leaf2s` AS `l0`
) AS [t] ON [e0].[RootSkipSharedId] = [t].[Id] ) AS `t` ON `e0`.`RootSkipSharedId` = `t`.`Id`
) AS [t0] ON [e].[Id] = [t0].[ThreeSkipSharedId] ) AS `t0` ON `e`.`Id` = `t0`.`ThreeSkipSharedId`
"""); """);
} }
@ -225,25 +225,25 @@ INNER JOIN (
AssertSql( AssertSql(
""" """
SELECT COALESCE(SUM([t0].[Key1]), 0) SELECT IIF(SUM(`t0`.`Key1`) IS NULL, 0, SUM(`t0`.`Key1`))
FROM ( FROM (
SELECT [r].[Id] SELECT `r`.`Id`
FROM [Roots] AS [r] FROM `Roots` AS `r`
UNION ALL UNION ALL
SELECT [b].[Id] SELECT `b`.`Id`
FROM [Branches] AS [b] FROM `Branches` AS `b`
UNION ALL UNION ALL
SELECT [l].[Id] SELECT `l`.`Id`
FROM [Leaves] AS [l] FROM `Leaves` AS `l`
UNION ALL UNION ALL
SELECT [l0].[Id] SELECT `l0`.`Id`
FROM [Leaf2s] AS [l0] FROM `Leaf2s` AS `l0`
) AS [t] ) AS `t`
INNER JOIN ( INNER JOIN (
SELECT [e0].[Key1], [e].[RootSkipSharedId] SELECT `e0`.`Key1`, `e`.`RootSkipSharedId`
FROM [EntityCompositeKeyEntityRoot] AS [e] FROM `EntityCompositeKeyEntityRoot` AS `e`
INNER JOIN [EntityCompositeKeys] AS [e0] ON [e].[CompositeKeySkipSharedKey1] = [e0].[Key1] AND [e].[CompositeKeySkipSharedKey2] = [e0].[Key2] AND [e].[CompositeKeySkipSharedKey3] = [e0].[Key3] INNER JOIN `EntityCompositeKeys` AS `e0` ON `e`.`CompositeKeySkipSharedKey1` = `e0`.`Key1` AND `e`.`CompositeKeySkipSharedKey2` = `e0`.`Key2` AND `e`.`CompositeKeySkipSharedKey3` = `e0`.`Key3`
) AS [t0] ON [t].[Id] = [t0].[RootSkipSharedId] ) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
"""); """);
} }
@ -488,25 +488,25 @@ ORDER BY [e].[Key1], [e0].[Key1], [e].[Key2], [e0].[Key2]
AssertSql( AssertSql(
""" """
SELECT [t0].[Id], [t0].[CollectionInverseId], [t0].[Name], [t0].[ReferenceInverseId] SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
FROM ( FROM (
SELECT [r].[Id] SELECT `r`.`Id`
FROM [Roots] AS [r] FROM `Roots` AS `r`
UNION ALL UNION ALL
SELECT [b].[Id] SELECT `b`.`Id`
FROM [Branches] AS [b] FROM `Branches` AS `b`
UNION ALL UNION ALL
SELECT [l].[Id] SELECT `l`.`Id`
FROM [Leaves] AS [l] FROM `Leaves` AS `l`
UNION ALL UNION ALL
SELECT [l0].[Id] SELECT `l0`.`Id`
FROM [Leaf2s] AS [l0] FROM `Leaf2s` AS `l0`
) AS [t] ) AS `t`
INNER JOIN ( INNER JOIN (
SELECT [e0].[Id], [e0].[CollectionInverseId], [e0].[Name], [e0].[ReferenceInverseId], [e].[RootSkipSharedId] SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `e`.`RootSkipSharedId`
FROM [EntityRootEntityThree] AS [e] FROM `EntityRootEntityThree` AS `e`
INNER JOIN [EntityThrees] AS [e0] ON [e].[ThreeSkipSharedId] = [e0].[Id] INNER JOIN `EntityThrees` AS `e0` ON `e`.`ThreeSkipSharedId` = `e0`.`Id`
) AS [t0] ON [t].[Id] = [t0].[RootSkipSharedId] ) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
"""); """);
} }
@ -2065,14 +2065,14 @@ FROM `Leaves` AS `l`
AssertSql( AssertSql(
""" """
SELECT [t].[Id], [t].[Name], [t].[Number], [t].[IsGreen], [t].[Discriminator] SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`
FROM ( FROM (
SELECT [b].[Id], [b].[Name], [b].[Number], NULL AS [IsGreen], N'EntityBranch' AS [Discriminator] SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
FROM [Branches] AS [b] FROM `Branches` AS `b`
UNION ALL UNION ALL
SELECT [l].[Id], [l].[Name], [l].[Number], [l].[IsGreen], N'EntityLeaf' AS [Discriminator] SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
FROM [Leaves] AS [l] FROM `Leaves` AS `l`
) AS [t] ) AS `t`
WHERE 0 = 1 WHERE 0 = 1
"""); """);
} }
@ -2329,22 +2329,22 @@ ORDER BY [u].[Key1], [u0].[Key1], [u].[Key2], [u0].[Key2]
AssertSql( AssertSql(
""" """
SELECT [t0].[Id], [t0].[CollectionInverseId], [t0].[Name], [t0].[ReferenceInverseId] SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
FROM ( FROM (
SELECT [u1].[Id] SELECT `u1`.`Id`
FROM [UnidirectionalRoots] AS [u1] FROM `UnidirectionalRoots` AS `u1`
UNION ALL UNION ALL
SELECT [u2].[Id] SELECT `u2`.`Id`
FROM [UnidirectionalBranches] AS [u2] FROM `UnidirectionalBranches` AS `u2`
UNION ALL UNION ALL
SELECT [u3].[Id] SELECT `u3`.`Id`
FROM [UnidirectionalLeaves] AS [u3] FROM `UnidirectionalLeaves` AS `u3`
) AS [t] ) AS `t`
INNER JOIN ( INNER JOIN (
SELECT [u0].[Id], [u0].[CollectionInverseId], [u0].[Name], [u0].[ReferenceInverseId], [u].[UnidirectionalEntityRootId] SELECT `u0`.`Id`, `u0`.`CollectionInverseId`, `u0`.`Name`, `u0`.`ReferenceInverseId`, `u`.`UnidirectionalEntityRootId`
FROM [UnidirectionalEntityRootUnidirectionalEntityThree] AS [u] FROM `UnidirectionalEntityRootUnidirectionalEntityThree` AS `u`
INNER JOIN [UnidirectionalEntityThrees] AS [u0] ON [u].[ThreeSkipSharedId] = [u0].[Id] INNER JOIN `UnidirectionalEntityThrees` AS `u0` ON `u`.`ThreeSkipSharedId` = `u0`.`Id`
) AS [t0] ON [t].[Id] = [t0].[UnidirectionalEntityRootId] ) AS `t0` ON `t`.`Id` = `t0`.`UnidirectionalEntityRootId`
"""); """);
} }
@ -2790,14 +2790,14 @@ FROM `UnidirectionalLeaves` AS `u`
AssertSql( AssertSql(
""" """
SELECT [t].[Id], [t].[Name], [t].[Number], [t].[IsGreen], [t].[Discriminator] SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`
FROM ( FROM (
SELECT [u].[Id], [u].[Name], [u].[Number], NULL AS [IsGreen], N'UnidirectionalEntityBranch' AS [Discriminator] SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, NULL AS `IsGreen`, 'UnidirectionalEntityBranch' AS `Discriminator`
FROM [UnidirectionalBranches] AS [u] FROM `UnidirectionalBranches` AS `u`
UNION ALL UNION ALL
SELECT [u0].[Id], [u0].[Name], [u0].[Number], [u0].[IsGreen], N'UnidirectionalEntityLeaf' AS [Discriminator] SELECT `u0`.`Id`, `u0`.`Name`, `u0`.`Number`, `u0`.`IsGreen`, 'UnidirectionalEntityLeaf' AS `Discriminator`
FROM [UnidirectionalLeaves] AS [u0] FROM `UnidirectionalLeaves` AS `u0`
) AS [t] ) AS `t`
WHERE 0 = 1 WHERE 0 = 1
"""); """);
} }

132
test/EFCore.Jet.FunctionalTests/Query/TPCManyToManyQueryJetTest.cs
Unescape Escape View File

@ -197,25 +197,25 @@ INNER JOIN (
AssertSql( AssertSql(
""" """
SELECT MIN([t0].[Id]) SELECT MIN(`t0`.`Id`)
FROM [EntityThrees] AS [e] FROM `EntityThrees` AS `e`
INNER JOIN ( INNER JOIN (
SELECT [t].[Id], [e0].[ThreeSkipSharedId] SELECT `t`.`Id`, `e0`.`ThreeSkipSharedId`
FROM [EntityRootEntityThree] AS [e0] FROM `EntityRootEntityThree` AS `e0`
INNER JOIN ( INNER JOIN (
SELECT [r].[Id] SELECT `r`.`Id`
FROM [Roots] AS [r] FROM `Roots` AS `r`
UNION ALL UNION ALL
SELECT [b].[Id] SELECT `b`.`Id`
FROM [Branches] AS [b] FROM `Branches` AS `b`
UNION ALL UNION ALL
SELECT [l].[Id] SELECT `l`.`Id`
FROM [Leaves] AS [l] FROM `Leaves` AS `l`
UNION ALL UNION ALL
SELECT [l0].[Id] SELECT `l0`.`Id`
FROM [Leaf2s] AS [l0] FROM `Leaf2s` AS `l0`
) AS [t] ON [e0].[RootSkipSharedId] = [t].[Id] ) AS `t` ON `e0`.`RootSkipSharedId` = `t`.`Id`
) AS [t0] ON [e].[Id] = [t0].[ThreeSkipSharedId] ) AS `t0` ON `e`.`Id` = `t0`.`ThreeSkipSharedId`
"""); """);
} }
@ -225,25 +225,25 @@ INNER JOIN (
AssertSql( AssertSql(
""" """
SELECT COALESCE(SUM([t0].[Key1]), 0) SELECT IIF(SUM(`t0`.`Key1`) IS NULL, 0, SUM(`t0`.`Key1`))
FROM ( FROM (
SELECT [r].[Id] SELECT `r`.`Id`
FROM [Roots] AS [r] FROM `Roots` AS `r`
UNION ALL UNION ALL
SELECT [b].[Id] SELECT `b`.`Id`
FROM [Branches] AS [b] FROM `Branches` AS `b`
UNION ALL UNION ALL
SELECT [l].[Id] SELECT `l`.`Id`
FROM [Leaves] AS [l] FROM `Leaves` AS `l`
UNION ALL UNION ALL
SELECT [l0].[Id] SELECT `l0`.`Id`
FROM [Leaf2s] AS [l0] FROM `Leaf2s` AS `l0`
) AS [t] ) AS `t`
INNER JOIN ( INNER JOIN (
SELECT [e0].[Key1], [e].[RootSkipSharedId] SELECT `e0`.`Key1`, `e`.`RootSkipSharedId`
FROM [EntityCompositeKeyEntityRoot] AS [e] FROM `EntityCompositeKeyEntityRoot` AS `e`
INNER JOIN [EntityCompositeKeys] AS [e0] ON [e].[CompositeKeySkipSharedKey1] = [e0].[Key1] AND [e].[CompositeKeySkipSharedKey2] = [e0].[Key2] AND [e].[CompositeKeySkipSharedKey3] = [e0].[Key3] INNER JOIN `EntityCompositeKeys` AS `e0` ON `e`.`CompositeKeySkipSharedKey1` = `e0`.`Key1` AND `e`.`CompositeKeySkipSharedKey2` = `e0`.`Key2` AND `e`.`CompositeKeySkipSharedKey3` = `e0`.`Key3`
) AS [t0] ON [t].[Id] = [t0].[RootSkipSharedId] ) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
"""); """);
} }
@ -488,25 +488,25 @@ ORDER BY [e].[Key1], [e0].[Key1], [e].[Key2], [e0].[Key2]
AssertSql( AssertSql(
""" """
SELECT [t0].[Id], [t0].[CollectionInverseId], [t0].[Name], [t0].[ReferenceInverseId] SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
FROM ( FROM (
SELECT [r].[Id] SELECT `r`.`Id`
FROM [Roots] AS [r] FROM `Roots` AS `r`
UNION ALL UNION ALL
SELECT [b].[Id] SELECT `b`.`Id`
FROM [Branches] AS [b] FROM `Branches` AS `b`
UNION ALL UNION ALL
SELECT [l].[Id] SELECT `l`.`Id`
FROM [Leaves] AS [l] FROM `Leaves` AS `l`
UNION ALL UNION ALL
SELECT [l0].[Id] SELECT `l0`.`Id`
FROM [Leaf2s] AS [l0] FROM `Leaf2s` AS `l0`
) AS [t] ) AS `t`
INNER JOIN ( INNER JOIN (
SELECT [e0].[Id], [e0].[CollectionInverseId], [e0].[Name], [e0].[ReferenceInverseId], [e].[RootSkipSharedId] SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `e`.`RootSkipSharedId`
FROM [EntityRootEntityThree] AS [e] FROM `EntityRootEntityThree` AS `e`
INNER JOIN [EntityThrees] AS [e0] ON [e].[ThreeSkipSharedId] = [e0].[Id] INNER JOIN `EntityThrees` AS `e0` ON `e`.`ThreeSkipSharedId` = `e0`.`Id`
) AS [t0] ON [t].[Id] = [t0].[RootSkipSharedId] ) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
"""); """);
} }
@ -2073,14 +2073,14 @@ FROM `Leaves` AS `l`
AssertSql( AssertSql(
""" """
SELECT [t].[Id], [t].[Name], [t].[Number], [t].[IsGreen], [t].[Discriminator] SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`
FROM ( FROM (
SELECT [b].[Id], [b].[Name], [b].[Number], NULL AS [IsGreen], N'EntityBranch' AS [Discriminator] SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
FROM [Branches] AS [b] FROM `Branches` AS `b`
UNION ALL UNION ALL
SELECT [l].[Id], [l].[Name], [l].[Number], [l].[IsGreen], N'EntityLeaf' AS [Discriminator] SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
FROM [Leaves] AS [l] FROM `Leaves` AS `l`
) AS [t] ) AS `t`
WHERE 0 = 1 WHERE 0 = 1
"""); """);
} }
@ -2330,22 +2330,22 @@ ORDER BY [u].[Key1], [u0].[Key1], [u].[Key2], [u0].[Key2]
AssertSql( AssertSql(
""" """
SELECT [t0].[Id], [t0].[CollectionInverseId], [t0].[Name], [t0].[ReferenceInverseId] SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
FROM ( FROM (
SELECT [u1].[Id] SELECT `u1`.`Id`
FROM [UnidirectionalRoots] AS [u1] FROM `UnidirectionalRoots` AS `u1`
UNION ALL UNION ALL
SELECT [u2].[Id] SELECT `u2`.`Id`
FROM [UnidirectionalBranches] AS [u2] FROM `UnidirectionalBranches` AS `u2`
UNION ALL UNION ALL
SELECT [u3].[Id] SELECT `u3`.`Id`
FROM [UnidirectionalLeaves] AS [u3] FROM `UnidirectionalLeaves` AS `u3`
) AS [t] ) AS `t`
INNER JOIN ( INNER JOIN (
SELECT [u0].[Id], [u0].[CollectionInverseId], [u0].[Name], [u0].[ReferenceInverseId], [u].[UnidirectionalEntityRootId] SELECT `u0`.`Id`, `u0`.`CollectionInverseId`, `u0`.`Name`, `u0`.`ReferenceInverseId`, `u`.`UnidirectionalEntityRootId`
FROM [UnidirectionalEntityRootUnidirectionalEntityThree] AS [u] FROM `UnidirectionalEntityRootUnidirectionalEntityThree` AS `u`
INNER JOIN [UnidirectionalEntityThrees] AS [u0] ON [u].[ThreeSkipSharedId] = [u0].[Id] INNER JOIN `UnidirectionalEntityThrees` AS `u0` ON `u`.`ThreeSkipSharedId` = `u0`.`Id`
) AS [t0] ON [t].[Id] = [t0].[UnidirectionalEntityRootId] ) AS `t0` ON `t`.`Id` = `t0`.`UnidirectionalEntityRootId`
"""); """);
} }
@ -2814,14 +2814,14 @@ FROM `UnidirectionalLeaves` AS `u`
AssertSql( AssertSql(
""" """
SELECT [t].[Id], [t].[Name], [t].[Number], [t].[IsGreen], [t].[Discriminator] SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`
FROM ( FROM (
SELECT [u].[Id], [u].[Name], [u].[Number], NULL AS [IsGreen], N'UnidirectionalEntityBranch' AS [Discriminator] SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, NULL AS `IsGreen`, 'UnidirectionalEntityBranch' AS `Discriminator`
FROM [UnidirectionalBranches] AS [u] FROM `UnidirectionalBranches` AS `u`
UNION ALL UNION ALL
SELECT [u0].[Id], [u0].[Name], [u0].[Number], [u0].[IsGreen], N'UnidirectionalEntityLeaf' AS [Discriminator] SELECT `u0`.`Id`, `u0`.`Name`, `u0`.`Number`, `u0`.`IsGreen`, 'UnidirectionalEntityLeaf' AS `Discriminator`
FROM [UnidirectionalLeaves] AS [u0] FROM `UnidirectionalLeaves` AS `u0`
) AS [t] ) AS `t`
WHERE 0 = 1 WHERE 0 = 1
"""); """);
} }

3209
test/EFCore.Jet.FunctionalTests/Query/TPCRelationshipsQueryJetTest.cs
View File

File diff suppressed because it is too large Load Diff

4
test/EFCore.Jet.FunctionalTests/Query/TPTGearsOfWarQueryJetFixture.cs
Unescape Escape View File

@ -46,13 +46,13 @@ public class TPTGearsOfWarQueryJetFixture : TPTGearsOfWarQueryRelationalFixture
mission.Timeline = mission.Timeline.AddYears(100); mission.Timeline = mission.Timeline.AddYears(100);
} }
*/ */
foreach (var gear in data.Gears) /*foreach (var gear in data.Gears)
{ {
if (gear.LeaderSquadId != 0) continue; if (gear.LeaderSquadId != 0) continue;
gear.LeaderSquadId = 1; gear.LeaderSquadId = 1;
gear.LeaderNickname = "Marcus"; gear.LeaderNickname = "Marcus";
((Officer)gear).Reports.Add(gear); ((Officer)gear).Reports.Add(gear);
} }*/
return data; return data;
} }

Write Preview
Loading…
Cancel
Save