Fix for 21041. All concurrency properties can store store-generated v…

…alues. (#21128) Make all concurrency properties capable of storing "store-generated values".
dotnet · Jun 3, 2020 · 3ff4d59 · 3ff4d59
1 parent 923dd6e
commit 3ff4d59
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/EFCore.Relational/Metadata/Conventions/TableSharingConcurrencyTokenConvention.cs b/src/EFCore.Relational/Metadata/Conventions/TableSharingConcurrencyTokenConvention.cs
@@ -107,6 +107,7 @@ public virtual void ProcessModelFinalizing(
                                 !exampleProperty.IsNullable).Builder;
                         concurrencyShadowPropertyBuilder
                             .HasColumnName(concurrencyColumnName)
+                            .HasColumnType(exampleProperty.GetColumnType())
                             ?.IsConcurrencyToken(true)
                             ?.ValueGenerated(exampleProperty.ValueGenerated);
 #pragma warning restore EF1001 // Internal EF Core API usage.
@@ -141,8 +142,7 @@ private void GetMappings(IConventionModel model,
 
                 foreach (var property in entityType.GetDeclaredProperties())
                 {
-                    if (property.IsConcurrencyToken
-                        && (property.ValueGenerated & ValueGenerated.OnUpdate) != 0)
+                    if (property.IsConcurrencyToken)
                     {
                         if (!concurrencyColumnsToProperties.TryGetValue(table, out var columnToProperties))
                         {

diff --git a/src/EFCore.Relational/Update/ModificationCommand.cs b/src/EFCore.Relational/Update/ModificationCommand.cs
@@ -457,8 +457,7 @@ public bool TryPropagate(IProperty property, IUpdateEntry entry)
                         || (entry.EntityState == EntityState.Modified && !entry.IsModified(property))
                         || (entry.EntityState == EntityState.Added && Equals(_originalValue, entry.GetCurrentValue(property)))))
                 {
-                    // Should be `entry.SetStoreGeneratedValue(property, _currentValue);` but see issue #21041
-                    ((InternalEntityEntry)entry)[property] = _currentValue;
+                    entry.SetStoreGeneratedValue(property, _currentValue);
 
                     return false;
                 }

diff --git a/src/EFCore/Metadata/Internal/PropertyExtensions.cs b/src/EFCore/Metadata/Internal/PropertyExtensions.cs
@@ -112,7 +112,8 @@ public static bool RequiresValueGenerator([NotNull] this IProperty property)
         /// </summary>
         public static bool MayBeStoreGenerated([NotNull] this IProperty property)
         {
-            if (property.ValueGenerated != ValueGenerated.Never)
+            if (property.ValueGenerated != ValueGenerated.Never
+                || property.IsConcurrencyToken)
             {
                 return true;
             }

diff --git a/test/EFCore.Relational.Tests/Infrastructure/RelationalModelValidatorTest.cs b/test/EFCore.Relational.Tests/Infrastructure/RelationalModelValidatorTest.cs
@@ -448,7 +448,10 @@ public virtual void Detects_duplicate_column_names_within_hierarchy_with_differe
 
             VerifyError(
                 RelationalStrings.DuplicateColumnNameConcurrencyTokenMismatch(
-                    nameof(Cat), nameof(Cat.Breed), nameof(Dog), nameof(Dog.Breed), nameof(Cat.Breed), nameof(Animal)), modelBuilder.Model);
+                    nameof(Animal), "_TableSharingConcurrencyTokenConvention_Breed",
+                    nameof(Dog), nameof(Dog.Breed),
+                    nameof(Cat.Breed), nameof(Animal)),
+                modelBuilder.Model);
         }
 
         [ConditionalFact]