Fix to #7364 - Query : ToString() method that takes a formatter argum…

…ent should still be translated on the client

Fix is to only translate ToString calls that have no arguments. Ones with the arguments will be evaluated on the client.

src/Microsoft.EntityFrameworkCore.Specification.Tests/QueryTestBase.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -6437,6 +6438,24 @@ public virtual void Select_expression_int_to_string()
                     }));
         }
 
+        [ConditionalFact]
+        public virtual void ToString_with_formatter_is_evaluated_on_the_client()
+        {
+            AssertQuery<Order>(
+                 os => os.Where(o => o.OrderDate != null)
+                    .Select(o => new Order
+                    {
+                        ShipName = o.OrderID.ToString("X")
+                    }));
+
+            AssertQuery<Order>(
+                 os => os.Where(o => o.OrderDate != null)
+                    .Select(o => new Order
+                    {
+                        ShipName = o.OrderID.ToString(new CultureInfo("en-US"))
+                    }));
+        }
+
         [ConditionalFact]
         public virtual void Select_expression_date_add_year()
         {

src/Microsoft.EntityFrameworkCore.SqlServer/Query/ExpressionTranslators/Internal/SqlServerObjectToStringTranslator.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
+using System.Reflection;
 using Microsoft.EntityFrameworkCore.Query.Expressions;
 
 namespace Microsoft.EntityFrameworkCore.Query.ExpressionTranslators.Internal
@@ -48,6 +49,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
             string storeType;
 
             if (methodCallExpression.Method.Name == nameof(ToString)
+                && methodCallExpression.Arguments.Count == 0
                 && methodCallExpression.Object != null
                 && _typeMapping.TryGetValue(
                     methodCallExpression.Object.Type

test/Microsoft.EntityFrameworkCore.SqlServer.FunctionalTests/QuerySqlServerTest.cs

@@ -6355,6 +6355,21 @@ FROM [Orders] AS [o]
                 Sql);
         }
 
+        public override void ToString_with_formatter_is_evaluated_on_the_client()
+        {
+            base.ToString_with_formatter_is_evaluated_on_the_client();
+
+            Assert.Equal(
+                @"SELECT [o].[OrderID]
+FROM [Orders] AS [o]
+WHERE [o].[OrderDate] IS NOT NULL
+
+SELECT [o].[OrderID]
+FROM [Orders] AS [o]
+WHERE [o].[OrderDate] IS NOT NULL",
+                Sql);
+        }
+
         public override void Select_expression_other_to_string()
         {
             base.Select_expression_other_to_string();