Correct translation failure message (#21408)

dotnet · Aug 21, 2020 · b6877e7 · b6877e7
1 parent dd43bbc
commit b6877e7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs
@@ -505,8 +505,8 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                 else
                 {
                     AddTranslationErrorDetails(CoreStrings.QueryUnableToTranslateMethod(
-                        methodCallExpression.Method.Name,
-                        methodCallExpression.Method.DeclaringType?.DisplayName()));
+                        methodCallExpression.Method.DeclaringType?.DisplayName(),
+                        methodCallExpression.Method.Name));
                 }
             }
 

diff --git a/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs
@@ -849,8 +849,8 @@ static bool IsAggregateResultWithCustomShaper(MethodInfo method)
                 else
                 {
                     AddTranslationErrorDetails(CoreStrings.QueryUnableToTranslateMethod(
-                        methodCallExpression.Method.Name,
-                        methodCallExpression.Method.DeclaringType?.DisplayName()));
+                        methodCallExpression.Method.DeclaringType?.DisplayName(),
+                        methodCallExpression.Method.Name));
                 }
             }
 

diff --git a/test/EFCore.Specification.Tests/Query/NorthwindMiscellaneousQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/NorthwindMiscellaneousQueryTestBase.cs
@@ -5620,11 +5620,11 @@ public virtual Task Client_code_unknown_method(bool async)
                     async,
                     ss => ss.Set<Customer>().Where(c => UnknownMethod(c.ContactName) == "foo")),
                 CoreStrings.QueryUnableToTranslateMethod(
-                    nameof(UnknownMethod),
                     GetType().GetMethod(
                             nameof(UnknownMethod),
                             BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy)
-                        ?.DeclaringType?.DisplayName()));
+                        ?.DeclaringType?.DisplayName(),
+                    nameof(UnknownMethod)));
         }
 
         public static string UnknownMethod(string foo) => foo;