Print expression when throwing null type mapping in SQL tree

Part of #7201
dotnet · Sep 1, 2020 · 9aaec85 · 9aaec85
1 parent 78cdc71
commit 9aaec85
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs b/src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs
diff --git a/src/EFCore.Cosmos/Properties/CosmosStrings.resx b/src/EFCore.Cosmos/Properties/CosmosStrings.resx
@@ -175,7 +175,7 @@
     <value>There is no string-based representation of this query as it's executed using 'ReadItemQueryAsync({resourceId}, {partitionKey})'.</value>
   </data>
   <data name="NullTypeMappingInSqlTree" xml:space="preserve">
-    <value>Null TypeMapping in Sql Tree.</value>
+    <value>Expression '{sqlExpression}' in SQL tree does not have type mapping assigned.</value>
   </data>
   <data name="OffsetRequiresLimit" xml:space="preserve">
     <value>Offset is not supported without Limit.</value>

diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs
@@ -987,7 +987,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
                 if (extensionExpression is SqlExpression sqlExpression
                     && sqlExpression.TypeMapping == null)
                 {
-                    throw new InvalidOperationException(CosmosStrings.NullTypeMappingInSqlTree);
+                    throw new InvalidOperationException(CosmosStrings.NullTypeMappingInSqlTree(sqlExpression.Print()));
                 }
 
                 return base.VisitExtension(extensionExpression);

diff --git a/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs b/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs
diff --git a/src/EFCore.Relational/Properties/RelationalStrings.resx b/src/EFCore.Relational/Properties/RelationalStrings.resx
@@ -647,7 +647,7 @@
     <value>Nullability information should only be specified for scalar database functions.</value>
   </data>
   <data name="NullTypeMappingInSqlTree" xml:space="preserve">
-    <value>Null TypeMapping in Sql Tree.</value>
+    <value>Expression '{sqlExpression}' in SQL tree does not have type mapping assigned.</value>
   </data>
   <data name="ParameterNotObjectArray" xml:space="preserve">
     <value>Cannot use the value provided for parameter '{parameter}' because it isn't assignable to type object[].</value>

diff --git a/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs
@@ -1579,7 +1579,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
                 {
                     if (sqlExpression.TypeMapping == null)
                     {
-                        throw new InvalidOperationException(RelationalStrings.NullTypeMappingInSqlTree);
+                        throw new InvalidOperationException(RelationalStrings.NullTypeMappingInSqlTree(sqlExpression.Print()));
                     }
                 }