From 39633487003879903958dc09be5bb4ec6d6034df Mon Sep 17 00:00:00 2001 From: maumar Date: Wed, 4 Mar 2020 14:23:31 -0800 Subject: [PATCH] Use sql function IsNullable property to determine its nullability, rather than always assume it's nullable --- .../Query/NullabilityBasedSqlProcessingExpressionVisitor.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/EFCore.Relational/Query/NullabilityBasedSqlProcessingExpressionVisitor.cs b/src/EFCore.Relational/Query/NullabilityBasedSqlProcessingExpressionVisitor.cs index 315d4d10042..24eb14231cd 100644 --- a/src/EFCore.Relational/Query/NullabilityBasedSqlProcessingExpressionVisitor.cs +++ b/src/EFCore.Relational/Query/NullabilityBasedSqlProcessingExpressionVisitor.cs @@ -1015,8 +1015,7 @@ protected override Expression VisitSqlFunction(SqlFunctionExpression sqlFunction if (sqlFunctionExpression.IsNiladic) { - // TODO: #18555 - _nullable = true; + _nullable = sqlFunctionExpression.IsNullable; return sqlFunctionExpression.Update(instance, sqlFunctionExpression.Arguments); } @@ -1027,8 +1026,7 @@ protected override Expression VisitSqlFunction(SqlFunctionExpression sqlFunction (arguments[i], _) = VisitInternal(sqlFunctionExpression.Arguments[i]); } - // TODO: #18555 - _nullable = true; + _nullable = sqlFunctionExpression.IsNullable; return sqlFunctionExpression.Update(instance, arguments); }