From 523b1c4ed571233509ed54b8e30b4d6e80f1f699 Mon Sep 17 00:00:00 2001 From: Shady Nagy Date: Tue, 3 Feb 2026 11:59:27 +0400 Subject: [PATCH 1/2] Simplify null check by inlining pattern match --- ...nalSqlTranslatingExpressionVisitor.StructuralEquality.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.StructuralEquality.cs b/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.StructuralEquality.cs index 114755dca56..e203c7cd64f 100644 --- a/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.StructuralEquality.cs +++ b/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.StructuralEquality.cs @@ -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 }) From a257b9e1131b126c1b2228cec9dcce654ab83319 Mon Sep 17 00:00:00 2001 From: Shady Nagy Date: Tue, 3 Feb 2026 12:00:08 +0400 Subject: [PATCH 2/2] Remove IsNullSqlConstantExpression method Removed the IsNullSqlConstantExpression method that checks for null SQL constant expressions. --- .../Query/RelationalSqlTranslatingExpressionVisitor.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs index c68f69f514c..fc31c40a4da 100644 --- a/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs +++ b/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs @@ -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) {