Query: Cleanup exception message about bulk updates

Resolves #28737
dotnet · Aug 24, 2022 · 257ae5d · 257ae5d
1 parent dd28973
commit 257ae5d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 24 deletions.
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
@@ -379,18 +379,18 @@
  <data name="ErrorMaterializingValueNullReference" xml:space="preserve">
  <value>An error occurred while reading a database value. The expected type was '{expectedType}' but the actual value was null.</value>
  </data>
+ <data name="ExecuteDeleteOnNonEntityType" xml:space="preserve">
+ <value>The operation 'ExecuteDelete' requires an entity type which corresponds to the database table to be modified. The current operation is being applied on a non-entity projection. Remove any projection to non-entity types.</value>
+ </data>
  <data name="ExecuteDeleteOnTableSplitting" xml:space="preserve">
- <value>The operation '{operation}' is being applied on the table '{tableName}' which contains data for multiple entity types. Applying this delete operation will also delete data for other entity type(s), hence it is not supported.</value>
+ <value>The operation 'ExecuteDelete' is being applied on the table '{tableName}' which contains data for multiple entity types. Applying this delete operation will also delete data for other entity type(s), hence it is not supported.</value>
  </data>
  <data name="ExecuteOperationOnEntitySplitting" xml:space="preserve">
  <value>The operation '{operation}' is being applied on entity type '{entityType}', which uses entity splitting. 'ExecuteDelete'/'ExecuteUpdate' operations on entity types using entity splitting is not supported.</value>
  </data>
  <data name="ExecuteOperationOnKeylessEntityTypeWithUnsupportedOperator" xml:space="preserve">
  <value>The operation '{operation}' cannot be performed on keyless entity type '{entityType}', since it contains an operator not natively supported by the database provider.</value>
  </data>
- <data name="ExecuteOperationOnNonEntityType" xml:space="preserve">
- <value>The operation '{operation}' requires an entity type which corresponds to the database table to be modified. The current operation is being applied on a non-entity projection. Remove any projection to non-entity types.</value>
- </data>
  <data name="ExecuteOperationOnTPC" xml:space="preserve">
  <value>The operation '{operation}' is being applied on entity type '{entityType}', which is using the TPC mapping strategy and is not a leaf type. 'ExecuteDelete'/'ExecuteUpdate' operations on entity types participating in TPC hierarchies is only supported for leaf types.</value>
  </data>

diff --git a/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
@@ -1015,7 +1015,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
  {
  if (source.ShaperExpression is not EntityShaperExpression entityShaperExpression)
  {
- AddTranslationErrorDetails(RelationalStrings.ExecuteOperationOnNonEntityType(nameof(RelationalQueryableExtensions.ExecuteDelete)));
+ AddTranslationErrorDetails(RelationalStrings.ExecuteDeleteOnNonEntityType);
  return null;
  }
 
@@ -1053,8 +1053,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
  && tableExpression.Table.EntityTypeMappings.Any(e => e.EntityType.GetRootType() != entityType.GetRootType())))
  {
  AddTranslationErrorDetails(
- RelationalStrings.ExecuteDeleteOnTableSplitting(
- nameof(RelationalQueryableExtensions.ExecuteDelete), tableExpression.Table.SchemaQualifiedName));
+ RelationalStrings.ExecuteDeleteOnTableSplitting(tableExpression.Table.SchemaQualifiedName));
 
  return null;
  }

diff --git a/test/EFCore.Relational.Specification.Tests/BulkUpdates/NorthwindBulkUpdatesTestBase.cs b/test/EFCore.Relational.Specification.Tests/BulkUpdates/NorthwindBulkUpdatesTestBase.cs
@@ -237,7 +237,7 @@ public virtual Task Delete_Except(bool async)
  [MemberData(nameof(IsAsyncData))]
  public virtual Task Delete_non_entity_projection(bool async)
  => AssertTranslationFailed(
- RelationalStrings.ExecuteOperationOnNonEntityType("ExecuteDelete"),
+ RelationalStrings.ExecuteDeleteOnNonEntityType,
  () => AssertDelete(
  async,
  ss => ss.Set<OrderDetail>().Where(od => od.OrderID < 10250).Select(e => e.ProductID),
@@ -247,7 +247,7 @@ public virtual Task Delete_non_entity_projection(bool async)
  [MemberData(nameof(IsAsyncData))]
  public virtual Task Delete_non_entity_projection_2(bool async)
  => AssertTranslationFailed(
- RelationalStrings.ExecuteOperationOnNonEntityType("ExecuteDelete"),
+ RelationalStrings.ExecuteDeleteOnNonEntityType,
  () => AssertDelete(
  async,
  ss => ss.Set<OrderDetail>().Where(od => od.OrderID < 10250)
@@ -258,7 +258,7 @@ public virtual Task Delete_non_entity_projection_2(bool async)
  [MemberData(nameof(IsAsyncData))]
  public virtual Task Delete_non_entity_projection_3(bool async)
  => AssertTranslationFailed(
- RelationalStrings.ExecuteOperationOnNonEntityType("ExecuteDelete"),
+ RelationalStrings.ExecuteDeleteOnNonEntityType,
  () => AssertDelete(
  async,
  ss => ss.Set<OrderDetail>().Where(od => od.OrderID < 10250)

diff --git a/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs b/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs
@@ -631,7 +631,7 @@ await TestHelpers.ExecuteWithStrategyInTransactionAsync(
  UseTransaction,
  async context => Assert.Contains(
  RelationalStrings.NonQueryTranslationFailedWithDetails(
- "", RelationalStrings.ExecuteDeleteOnTableSplitting("ExecuteDelete", "Vehicles"))[21..],
+ "", RelationalStrings.ExecuteDeleteOnTableSplitting("Vehicles"))[21..],
  (await Assert.ThrowsAsync<InvalidOperationException>(() => context.Set<Vehicle>().ExecuteDeleteAsync())).Message));
  }
  else
@@ -641,7 +641,7 @@ await TestHelpers.ExecuteWithStrategyInTransactionAsync(
  UseTransaction,
  context => Assert.Contains(
  RelationalStrings.NonQueryTranslationFailedWithDetails(
- "", RelationalStrings.ExecuteDeleteOnTableSplitting("ExecuteDelete", "Vehicles"))[21..],
+ "", RelationalStrings.ExecuteDeleteOnTableSplitting("Vehicles"))[21..],
  Assert.Throws<InvalidOperationException>(() => context.Set<Vehicle>().ExecuteDelete()).Message));
  }
  }