Skip to content

Fix EF DateTime sorting translation #9191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelstaib merged 4 commits into from
Feb 24, 2026
Merged

Fix EF DateTime sorting translation #9191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4e8092
Fix EF DateTime sorting translation
michaelstaib Feb 24, 2026
888783d
fixed tests
michaelstaib Feb 24, 2026
c99fdcb
cleanup
michaelstaib Feb 24, 2026
f3ce718
Merge branch 'main' into mst/issue-8905
michaelstaib Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 51 additions & 5 deletions ...late/Data/src/Data/Sorting/Expressions/Handlers/QueryableAscendingSortOperationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ protected override QueryableSortOperation HandleOperation(
QueryableFieldSelector fieldSelector,
ISortField field,
SortEnumValue? sortEnumValue)
{
return AscendingSortOperation.From(fieldSelector);
}
=> AscendingSortOperation.From(fieldSelector);

public static QueryableAscendingSortOperationHandler Create(SortProviderContext context) => new();

Expand All @@ -28,6 +26,30 @@ private AscendingSortOperation(QueryableFieldSelector fieldSelector)

public override Expression CompileOrderBy(Expression expression)
{
// We try to push the sort through any .Select() projection so the database can sort
// before projecting. If that works, we apply the sort on the source and re-attach the projection.
if (QueryableSortExpressionOptimizer.TryRewriteSelectorToSource(
expression,
ParameterExpression,
Selector,
out var rewrittenSource,
out var rewrittenSelector,
out var projection))
{
var sortedSource = Expression.Call(
rewrittenSource.GetEnumerableKind(),
nameof(Queryable.OrderBy),
[rewrittenSelector.Parameters[0].Type, rewrittenSelector.ReturnType],
rewrittenSource,
rewrittenSelector);

return QueryableSortExpressionOptimizer.ReapplyProjection(
sortedSource,
projection);
}

// If the optimization is not possible, we fall back to a plain OrderBy on
// the expression as-is.
return Expression.Call(
expression.GetEnumerableKind(),
nameof(Queryable.OrderBy),
Expand All @@ -38,6 +60,30 @@ public override Expression CompileOrderBy(Expression expression)

public override Expression CompileThenBy(Expression expression)
{
// We try to push the sort through any .Select() projection so the database can sort
// before projecting. If that works, we apply the sort on the source and re-attach the projection.
if (QueryableSortExpressionOptimizer.TryRewriteSelectorToSource(
expression,
ParameterExpression,
Selector,
out var rewrittenSource,
out var rewrittenSelector,
out var projection))
{
var sortedSource = Expression.Call(
rewrittenSource.GetEnumerableKind(),
nameof(Queryable.ThenBy),
[rewrittenSelector.Parameters[0].Type, rewrittenSelector.ReturnType],
rewrittenSource,
rewrittenSelector);

return QueryableSortExpressionOptimizer.ReapplyProjection(
sortedSource,
projection);
}

// If the optimization is not possible, we fall back to a plain ThenBy on
// the expression as-is.
return Expression.Call(
expression.GetEnumerableKind(),
nameof(Queryable.ThenBy),
Expand All @@ -46,7 +92,7 @@ public override Expression CompileThenBy(Expression expression)
Expression.Lambda(Selector, ParameterExpression));
}

public static AscendingSortOperation From(QueryableFieldSelector selector) =>
new AscendingSortOperation(selector);
public static AscendingSortOperation From(QueryableFieldSelector selector)
=> new AscendingSortOperation(selector);
}
}
56 changes: 51 additions & 5 deletions ...ate/Data/src/Data/Sorting/Expressions/Handlers/QueryableDescendingSortOperationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ protected override QueryableSortOperation HandleOperation(
QueryableFieldSelector fieldSelector,
ISortField field,
SortEnumValue? sortEnumValue)
{
return DescendingSortOperation.From(fieldSelector);
}
=> DescendingSortOperation.From(fieldSelector);

public static QueryableDescendingSortOperationHandler Create(SortProviderContext context) => new();

Expand All @@ -28,6 +26,30 @@ private DescendingSortOperation(QueryableFieldSelector fieldSelector)

public override Expression CompileOrderBy(Expression expression)
{
// We try to push the sort through any .Select() projection so the database can sort
// before projecting. If that works, we apply the sort on the source and re-attach the projection.
if (QueryableSortExpressionOptimizer.TryRewriteSelectorToSource(
expression,
ParameterExpression,
Selector,
out var rewrittenSource,
out var rewrittenSelector,
out var projection))
{
var sortedSource = Expression.Call(
rewrittenSource.GetEnumerableKind(),
nameof(Queryable.OrderByDescending),
[rewrittenSelector.Parameters[0].Type, rewrittenSelector.ReturnType],
rewrittenSource,
rewrittenSelector);

return QueryableSortExpressionOptimizer.ReapplyProjection(
sortedSource,
projection);
}

// If the optimization is not possible, we fall back to a plain OrderByDescending on
// the expression as-is.
return Expression.Call(
expression.GetEnumerableKind(),
nameof(Queryable.OrderByDescending),
Expand All @@ -38,6 +60,30 @@ public override Expression CompileOrderBy(Expression expression)

public override Expression CompileThenBy(Expression expression)
{
// We try to push the sort through any .Select() projection so the database can sort
// before projecting. If that works, we apply the sort on the source and re-attach the projection.
if (QueryableSortExpressionOptimizer.TryRewriteSelectorToSource(
expression,
ParameterExpression,
Selector,
out var rewrittenSource,
out var rewrittenSelector,
out var projection))
{
var sortedSource = Expression.Call(
rewrittenSource.GetEnumerableKind(),
nameof(Queryable.ThenByDescending),
[rewrittenSelector.Parameters[0].Type, rewrittenSelector.ReturnType],
rewrittenSource,
rewrittenSelector);

return QueryableSortExpressionOptimizer.ReapplyProjection(
sortedSource,
projection);
}

// If the optimization is not possible, we fall back to a plain ThenByDescending on
// the expression as-is.
return Expression.Call(
expression.GetEnumerableKind(),
nameof(Queryable.ThenByDescending),
Expand All @@ -46,7 +92,7 @@ public override Expression CompileThenBy(Expression expression)
Expression.Lambda(Selector, ParameterExpression));
}

public static DescendingSortOperation From(QueryableFieldSelector selector) =>
new DescendingSortOperation(selector);
public static DescendingSortOperation From(QueryableFieldSelector selector)
=> new DescendingSortOperation(selector);
}
}
Loading
Loading