From 80ae790a647deb47f3b3785aa396dbdd7adba09e Mon Sep 17 00:00:00 2001 From: Christopher Jolly Date: Sat, 27 Jul 2024 03:12:44 +0800 Subject: [PATCH] Fix tests for Nullable ToString efcore #34014 and #33940 --- .../Internal/JetObjectToStringTranslator.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetObjectToStringTranslator.cs b/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetObjectToStringTranslator.cs index 539301d..afc08d8 100644 --- a/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetObjectToStringTranslator.cs +++ b/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetObjectToStringTranslator.cs @@ -64,7 +64,7 @@ namespace EntityFrameworkCore.Jet.Query.ExpressionTranslators.Internal if (instance.Type == typeof(bool)) { - if (instance is ColumnExpression columnExpression && columnExpression.IsNullable) + if (instance is not ColumnExpression { IsNullable: false }) { return _sqlExpressionFactory.Case( new[] @@ -76,7 +76,7 @@ namespace EntityFrameworkCore.Jet.Query.ExpressionTranslators.Internal _sqlExpressionFactory.Equal(instance, _sqlExpressionFactory.Constant(true)), _sqlExpressionFactory.Constant(true.ToString())) }, - _sqlExpressionFactory.Constant(null, typeof(string))); + _sqlExpressionFactory.Constant(string.Empty)); } return _sqlExpressionFactory.Case( @@ -90,7 +90,7 @@ namespace EntityFrameworkCore.Jet.Query.ExpressionTranslators.Internal } return TypeMapping.TryGetValue(instance.Type, out var storeType) - ? _sqlExpressionFactory.Convert(instance, typeof(string)) + ? _sqlExpressionFactory.Coalesce(_sqlExpressionFactory.Convert(instance, typeof(string)), _sqlExpressionFactory.Constant(string.Empty)) : null; } }