Allow CaseExpression with operand and else clause

dotnet · Jul 24, 2019 · 1d27fd8 · 1d27fd8
1 parent f40ddff
commit 1d27fd8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/EFCore.Relational/Query/SqlExpressionFactory.cs b/src/EFCore.Relational/Query/SqlExpressionFactory.cs
@@ -269,12 +269,14 @@ public virtual SqlUnaryExpression Not(SqlExpression operand)
         public virtual SqlUnaryExpression Negate(SqlExpression operand)
             => MakeUnary(ExpressionType.Negate, operand, operand.Type, operand.TypeMapping);
 
-        public virtual CaseExpression Case(SqlExpression operand, params CaseWhenClause[] whenClauses)
+        public virtual CaseExpression Case(SqlExpression operand, SqlExpression elseResult, params CaseWhenClause[] whenClauses)
         {
             var operandTypeMapping = operand.TypeMapping
                 ?? whenClauses.Select(wc => wc.Test.TypeMapping).FirstOrDefault(t => t != null)
                 ?? _typeMappingSource.FindMapping(operand.Type);
-            var resultTypeMapping = whenClauses.Select(wc => wc.Result.TypeMapping).FirstOrDefault(t => t != null);
+
+            var resultTypeMapping = elseResult?.TypeMapping
+                ?? whenClauses.Select(wc => wc.Result.TypeMapping).FirstOrDefault(t => t != null);
 
             operand = ApplyTypeMapping(operand, operandTypeMapping);
 
@@ -287,9 +289,14 @@ public virtual CaseExpression Case(SqlExpression operand, params CaseWhenClause[
                         ApplyTypeMapping(caseWhenClause.Result, resultTypeMapping)));
             }
 
-            return new CaseExpression(operand, typeMappedWhenClauses);
+            elseResult = ApplyTypeMapping(elseResult, resultTypeMapping);
+
+            return new CaseExpression(operand, typeMappedWhenClauses, elseResult);
         }
 
+        public virtual CaseExpression Case(SqlExpression operand, params CaseWhenClause[] whenClauses)
+            => Case(operand, null, whenClauses);
+
         public virtual CaseExpression Case(IReadOnlyList<CaseWhenClause> whenClauses, SqlExpression elseResult)
         {
             var resultTypeMapping = elseResult?.TypeMapping

diff --git a/src/EFCore.Relational/Query/SqlExpressions/CaseExpression.cs b/src/EFCore.Relational/Query/SqlExpressions/CaseExpression.cs
@@ -26,7 +26,7 @@ public CaseExpression(
         {
         }
 
-        private CaseExpression(
+        public CaseExpression(
             SqlExpression operand,
             IReadOnlyList<CaseWhenClause> whenClauses,
             SqlExpression elseResult)