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

DISTINCT AND TOP can't be in the same stateement with Jet. Push DISTINCT into a subquery

Browse Source
7.0-servicing
Christopher Jolly 2 years ago
parent f1878a8950
commit 92ea73548d
3 changed files with 146 additions and 108 deletions
Show Stats Download Patch File Download Diff File

7
src/EFCore.Jet/Query/Internal/JetQueryableMethodTranslatingExpressionVisitor.cs
Unescape Escape View File

@ -147,6 +147,13 @@ public class JetQueryableMethodTranslatingExpressionVisitor : RelationalQueryabl
}*/
}
//With Jet DISTINCT and TOP can't be used together in the same statement
//Make the DISTINCT into a subquery
if (selectExpression.IsDistinct)
{
selectExpression.PushdownIntoSubquery();
}
return base.TranslateTake(source, count);
}

33
test/EFCore.Jet.FunctionalTests/Query/NorthwindMiscellaneousQueryJetTest.cs
Unescape Escape View File

@ -2092,13 +2092,16 @@ ORDER BY `t`.`OrderID`");
await base.Distinct_Take_Count(isAsync);
AssertSql(
$@"{AssertSqlHelper.Declaration("@__p_0='5'")}
"""
SELECT COUNT(*)
FROM (
SELECT DISTINCT TOP {AssertSqlHelper.Parameter("@__p_0")} `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
SELECT TOP 5 `t`.`OrderID`
FROM (
SELECT DISTINCT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
FROM `Orders` AS `o`
) AS `t`");
) AS `t`
) AS `t0`
""");
}
public override async Task OrderBy_shadow(bool isAsync)
@ -3293,17 +3296,21 @@ FROM (
await base.OrderBy_coalesce_skip_take_distinct_take(isAsync);
AssertSql(
$@"{AssertSqlHelper.Declaration("@__p_0='5'")}
{AssertSqlHelper.Declaration("@__p_1='15'")}
SELECT DISTINCT TOP {AssertSqlHelper.Parameter("@__p_0")} `t`.`ProductID`, `t`.`Discontinued`, `t`.`ProductName`, `t`.`SupplierID`, `t`.`UnitPrice`, `t`.`UnitsInStock`
"""
SELECT TOP 5 `t1`.`ProductID`, `t1`.`Discontinued`, `t1`.`ProductName`, `t1`.`SupplierID`, `t1`.`UnitPrice`, `t1`.`UnitsInStock`
FROM (
SELECT DISTINCT `t0`.`ProductID`, `t0`.`Discontinued`, `t0`.`ProductName`, `t0`.`SupplierID`, `t0`.`UnitPrice`, `t0`.`UnitsInStock`
FROM (
SELECT `p`.`ProductID`, `p`.`Discontinued`, `p`.`ProductName`, `p`.`SupplierID`, `p`.`UnitPrice`, `p`.`UnitsInStock`, IIF(`p`.`UnitPrice` IS NULL, NULL, `p`.`UnitPrice`) AS `c`
SELECT TOP 15 `t`.`ProductID`, `t`.`Discontinued`, `t`.`ProductName`, `t`.`SupplierID`, `t`.`UnitPrice`, `t`.`UnitsInStock`
FROM (
SELECT TOP 20 `p`.`ProductID`, `p`.`Discontinued`, `p`.`ProductName`, `p`.`SupplierID`, `p`.`UnitPrice`, `p`.`UnitsInStock`, IIF(`p`.`UnitPrice` IS NULL, 0.0, `p`.`UnitPrice`) AS `c`
FROM `Products` AS `p`
ORDER BY IIF(`p`.`UnitPrice` IS NULL, NULL, `p`.`UnitPrice`)
SKIP {AssertSqlHelper.Parameter("@__p_0")} FETCH NEXT {AssertSqlHelper.Parameter("@__p_1")} ROWS ONLY
) AS `t`");
ORDER BY IIF(`p`.`UnitPrice` IS NULL, 0.0, `p`.`UnitPrice`)
) AS `t`
ORDER BY `t`.`c` DESC
) AS `t0`
) AS `t1`
""");
}
public override async Task OrderBy_skip_take_distinct_orderby_take(bool isAsync)

138
test/EFCore.Jet.FunctionalTests/Query/QueryLoggingJetTest.cs
Unescape Escape View File

@ -30,24 +30,39 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
[ConditionalFact]
public virtual void Queryable_simple()
{
using (var context = CreateContext())
{
using var context = CreateContext();
var customers
= context.Set<Customer>()
.ToList();
Assert.NotNull(customers);
Assert.StartsWith(
"queryContext => new QueryingEnumerable<Customer>(",
"Compiling query expression: ",
Fixture.TestSqlLoggerFactory.Log[0].Message);
Assert.StartsWith(
"Generated query execution expression: " + Environment.NewLine + "'queryContext => new SingleQueryingEnumerable<Customer>(",
Fixture.TestSqlLoggerFactory.Log[1].Message);
}
[ConditionalFact]
public virtual void Queryable_simple_split()
{
using var context = CreateContext();
var customers
= context.Set<Customer>().AsSplitQuery()
.ToList();
Assert.NotNull(customers);
Assert.StartsWith(
"Generated query execution expression: " + Environment.NewLine + "'queryContext => new SplitQueryingEnumerable<Customer>(",
Fixture.TestSqlLoggerFactory.Log[1].Message);
}
[ConditionalFact]
public virtual void Queryable_with_parameter_outputs_parameter_value_logging_warning()
{
using (var context = CreateContext())
{
using var context = CreateContext();
context.GetInfrastructure().GetRequiredService<IDiagnosticsLogger<DbLoggerCategory.Query>>()
.Options.IsSensitiveDataLoggingWarned = false;
// ReSharper disable once ConvertToConstant.Local
@ -63,80 +78,89 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
CoreResources.LogSensitiveDataLoggingEnabled(new TestLogger<JetLoggingDefinitions>()).GenerateMessage(),
Fixture.TestSqlLoggerFactory.Log.Select(l => l.Message));
}
}
[ConditionalFact(Skip = "Issue#17498")]
public virtual void Query_with_ignored_include_should_log_warning()
{
using (var context = CreateContext())
[ConditionalFact]
public virtual void Include_navigation()
{
using var context = CreateContext();
var customers
= context.Customers
= context.Set<Customer>()
.Where(c => c.CustomerID == "ALFKI")
.Include(c => c.Orders)
.Select(c => c.CustomerID)
.ToList();
Assert.NotNull(customers);
Assert.Contains(
#pragma warning disable CS0612 // Type or member is obsolete
CoreResources.LogNavigationBaseIncludeIgnored(new TestLogger<JetLoggingDefinitions>()).GenerateMessage("`c`.Orders"),
Fixture.TestSqlLoggerFactory.Log.Select(l => l.Message));
#pragma warning restore CS0612 // Type or member is obsolete
}
Assert.Equal(
"Including navigation: 'Customer.Orders'.",
Fixture.TestSqlLoggerFactory.Log[1].Message);
}
[ConditionalFact(Skip = "Issue#17498")]
public virtual void Include_navigation()
{
using (var context = CreateContext())
[ConditionalFact]
public virtual void Skip_without_order_by()
{
var customers
= context.Set<Customer>()
.Include(c => c.Orders)
.ToList();
using var context = CreateContext();
var customers = context.Set<Customer>().Skip(85).ToList();
Assert.NotNull(customers);
Assert.Equal(
"Compiling query model: " + _eol + "'(from Customer c in DbSet<Customer>" + _eol + @"select `c`).Include(""Orders"")'"
,
Fixture.TestSqlLoggerFactory.Log[0].Message);
Assert.Equal(
"Including navigation: '`c`.Orders'"
,
CoreResources.LogRowLimitingOperationWithoutOrderBy(new TestLogger<JetLoggingDefinitions>()).GenerateMessage(),
Fixture.TestSqlLoggerFactory.Log[1].Message);
Assert.StartsWith(
"Optimized query model: "
+ _eol
+ "'from Customer c in DbSet<Customer>"
+ _eol
+ @"order by EF.Property(?`c`?, ""CustomerID"") asc"
+ _eol
+ "select Customer _Include("
,
Fixture.TestSqlLoggerFactory.Log[2].Message);
}
[ConditionalFact]
public virtual void Take_without_order_by()
{
using var context = CreateContext();
var customers = context.Set<Customer>().Take(5).ToList();
Assert.NotNull(customers);
Assert.Equal(
CoreResources.LogRowLimitingOperationWithoutOrderBy(new TestLogger<JetLoggingDefinitions>()).GenerateMessage(),
Fixture.TestSqlLoggerFactory.Log[1].Message);
}
[ConditionalFact(Skip = "Issue #16752")]
public virtual void GroupBy_Include_collection_ignored()
[ConditionalFact]
public virtual void FirstOrDefault_without_filter_order_by()
{
using (var context = CreateContext())
using var context = CreateContext();
var customer = context.Set<Customer>().FirstOrDefault();
Assert.NotNull(customer);
Assert.Equal(
CoreResources.LogFirstWithoutOrderByAndFilter(new TestLogger<JetLoggingDefinitions>()).GenerateMessage(),
Fixture.TestSqlLoggerFactory.Log[1].Message);
}
[ConditionalFact]
public virtual void Distinct_used_after_order_by()
{
var orders = context.Orders
.GroupBy(o => o.OrderID)
.Select(g => g.OrderBy(o => o.OrderID).FirstOrDefault())
.Include(o => o.OrderDetails)
.ToList();
using var context = CreateContext();
var customers = context.Set<Customer>().OrderBy(x => x.Address).Distinct().Take(5).ToList();
Assert.NotNull(orders);
Assert.Contains(
#pragma warning disable CS0612 // Type or member is obsolete
CoreResources.LogNavigationBaseIncludeIgnored(new TestLogger<JetLoggingDefinitions>()).GenerateMessage(
#pragma warning restore CS0612 // Type or member is obsolete
"{from Order o in `g` orderby `o`.OrderID asc select `o` => FirstOrDefault()}.OrderDetails"),
Fixture.TestSqlLoggerFactory.Log.Select(l => l.Message));
Assert.NotEmpty(customers);
Assert.Equal(
CoreResources.LogDistinctAfterOrderByWithoutRowLimitingOperatorWarning(new TestLogger<JetLoggingDefinitions>())
.GenerateMessage(),
Fixture.TestSqlLoggerFactory.Log[1].Message);
}
[ConditionalFact]
public virtual void Include_collection_does_not_generate_warning()
{
using var context = CreateContext();
var customer = context.Set<Customer>().Include(e => e.Orders).AsSplitQuery().Single(e => e.CustomerID == "ALFKI");
Assert.NotNull(customer);
Assert.Equal(6, customer.Orders.Count);
Assert.DoesNotContain(
CoreResources.LogRowLimitingOperationWithoutOrderBy(new TestLogger<JetLoggingDefinitions>()).GenerateMessage(),
Fixture.TestSqlLoggerFactory.Log.Select(e => e.Message));
}
[ConditionalFact]

Write Preview
Loading…
Cancel
Save