Generalize simplification as suggested

Author: roji

Diff for: eng/Versions.props

@@ -39,7 +39,7 @@
     <MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildUtilitiesCoreVersion>17.8.3</MicrosoftBuildUtilitiesCoreVersion>
     <!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support and https://github.com/dotnet/efcore/issues/34637 -->
-    <MicrosoftCodeAnalysisVersion>4.8.0</MicrosoftCodeAnalysisVersion>
+    <MicrosoftCodeAnalysisVersion>4.10.0</MicrosoftCodeAnalysisVersion>
     <MicrosoftCodeAnalysisTestingVersion>1.1.2</MicrosoftCodeAnalysisTestingVersion>
     <AzureIdentityVersion>1.13.1</AzureIdentityVersion>
     <AzureResourceManagerCosmosDBVersion>1.3.2</AzureResourceManagerCosmosDBVersion>

Diff for: src/EFCore.Relational/Query/SqlExpressionFactory.cs

@@ -826,8 +826,8 @@ public virtual SqlExpression Case(
         }
 
         // Simplify:
-        // a == null ? null : a -> a
-        // a != null ? a : null -> a
+        // a == b ? b : a -> a
+        // a != b ? a : b -> a
         // And lift:
         // a == b ? null : a -> NULLIF(a, b)
         // a != b ? a : null -> NULLIF(a, b)
@@ -838,28 +838,39 @@ public virtual SqlExpression Case(
                     Test: SqlBinaryExpression { OperatorType: ExpressionType.Equal or ExpressionType.NotEqual } binary,
                     Result: var result
                 }
-            ]
-            && binary.OperatorType switch
-            {
-                ExpressionType.Equal when result is SqlConstantExpression { Value: null } && elseResult is not null => elseResult,
-                ExpressionType.NotEqual when elseResult is null or SqlConstantExpression { Value: null } => result,
-                _ => null
-            } is SqlExpression conditionalResult)
+            ])
         {
             var (left, right) = (binary.Left, binary.Right);
 
-            if (left.Equals(conditionalResult))
+            // Reverse ifEqual/ifNotEqual for ExpressionType.NotEqual for easier reasoning below
+            var (ifEqual, ifNotEqual) = binary.OperatorType is ExpressionType.Equal
+                ? (result, elseResult ?? Constant(null, result.Type, result.TypeMapping))
+                : (elseResult ?? Constant(null, result.Type, result.TypeMapping), result);
+
+            if (left.Equals(ifNotEqual))
             {
-                return right is SqlConstantExpression { Value: null }
-                    ? left
-                    : Function("NULLIF", [left, right], nullable: true, [false, false], left.Type, left.TypeMapping);
+                switch (ifEqual)
+                {
+                    // a == b ? b : a -> a
+                    case SqlConstantExpression { Value: null }:
+                        return Function("NULLIF", [left, right], nullable: true, [false, false], left.Type, left.TypeMapping);
+                    // a == b ? null : a -> NULLIF(a, b)
+                    case var _ when ifEqual.Equals(right):
+                        return left;
+                }
             }
 
-            if (right.Equals(conditionalResult))
+            if (right.Equals(ifNotEqual))
             {
-                return left is SqlConstantExpression { Value: null }
-                    ? right
-                    : Function("NULLIF", [right, left], nullable: true, [false, false], right.Type, right.TypeMapping);
+                switch (ifEqual)
+                {
+                    // b == a ? b : a -> a
+                    case SqlConstantExpression { Value: null }:
+                        return Function("NULLIF", [right, left], nullable: true, [false, false], right.Type, right.TypeMapping);
+                    // b == a ? null : a -> NULLIF(a, b)
+                    case var _ when ifEqual.Equals(left):
+                        return right;
+                }
             }
         }
 

Diff for: test/EFCore.Specification.Tests/Query/Translations/OperatorTranslationsTestBase.cs

@@ -16,15 +16,15 @@ public virtual Task Conditional_simplifiable_equality(bool async)
         => AssertQuery(
             async,
             // ReSharper disable once MergeConditionalExpression
-            cs => cs.Set<NullableBasicTypesEntity>().Where(x => (x.Int == null ? null : x.Int) > 1));
+            cs => cs.Set<NullableBasicTypesEntity>().Where(x => (x.Int == 9 ? 9 : x.Int) > 1));
 
     [ConditionalTheory]
     [MemberData(nameof(IsAsyncData))]
     public virtual Task Conditional_simplifiable_inequality(bool async)
         => AssertQuery(
             async,
             // ReSharper disable once MergeConditionalExpression
-            cs => cs.Set<NullableBasicTypesEntity>().Where(x => (x.Int != null ? x.Int : null) > 1));
+            cs => cs.Set<NullableBasicTypesEntity>().Where(x => (x.Int != 8 ? x.Int : 8) > 1));
 
     // In relational providers, x == a ? null : x ("un-coalescing conditional") is translated to SQL NULLIF