Skip to content

Simpler null constant checks in relational translator #37617

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
roji merged 3 commits into from
Feb 3, 2026
Merged

Simpler null constant checks in relational translator #37617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
523b1c4
Simplify null check by inlining pattern match
ShadyNagy Feb 3, 2026
a257b9e
Remove IsNullSqlConstantExpression method
ShadyNagy Feb 3, 2026
07cc942
Merge pull request #2 from ShadyNagy/patch-3
ShadyNagy Feb 3, 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
6 changes: 3 additions & 3 deletions src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.StructuralEquality.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ bool TryRewriteEntityEquality([NotNullWhen(true)] out SqlExpression? result)
var leftReference = left as StructuralTypeReferenceExpression;
var rightReference = right as StructuralTypeReferenceExpression;

if (IsNullSqlConstantExpression(left)
|| IsNullSqlConstantExpression(right))
if (left is SqlConstantExpression { Value: null }
|| right is SqlConstantExpression { Value: null })
{
var nonNullEntityReference = (IsNullSqlConstantExpression(left) ? rightReference : leftReference)!;
var nonNullEntityReference = (left is SqlConstantExpression { Value: null } ? rightReference : leftReference)!;
var nullComparedEntityType = (IEntityType)nonNullEntityReference.StructuralType;

if (nonNullEntityReference is { Parameter.ValueBufferExpression: JsonQueryExpression jsonQueryExpression })
Expand Down
3 changes: 0 additions & 3 deletions src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1715,9 +1715,6 @@ private static bool CanEvaluate(Expression expression)
_ => false
};

private static bool IsNullSqlConstantExpression(Expression expression)
=> expression is SqlConstantExpression { Value: null };

[DebuggerStepThrough]
private static bool TranslationFailed(Expression? original, Expression? translation, out SqlExpression? castTranslation)
{
Expand Down
Loading