[2.1.3] Add quirks for in-memory concurrency patch fix

Issue #12214
dotnet · Jun 28, 2018 · 29b94e2 · 29b94e2
1 parent cb4191d
commit 29b94e2
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 6 deletions.
diff --git a/src/EFCore.InMemory/Storage/Internal/InMemoryTable.cs b/src/EFCore.InMemory/Storage/Internal/InMemoryTable.cs
@@ -89,14 +89,22 @@ private static bool IsConcurrencyConflict(
             object rowValue,
             Dictionary<IProperty, object> concurrencyConflicts)
         {
-            if (property.IsConcurrencyToken
-                && !StructuralComparisons.StructuralEqualityComparer.Equals(
-                    rowValue,
-                    entry.GetOriginalValue(property)))
+            if (property.IsConcurrencyToken)
             {
-                concurrencyConflicts.Add(property, rowValue);
+                var originalValue = entry.GetOriginalValue(property);
 
-                return true;
+                var revertPatchBehavior = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue12214", out var isEnabled)
+                                          && isEnabled;
+
+                if ((revertPatchBehavior
+                    && !Equals(rowValue, originalValue))
+                    || (!revertPatchBehavior
+                        && !StructuralComparisons.StructuralEqualityComparer.Equals(rowValue, originalValue)))
+                {
+                    concurrencyConflicts.Add(property, rowValue);
+
+                    return true;
+                }
             }
 
             return false;

diff --git a/src/EFCore.Specification.Tests/UpdatesTestBase.cs b/src/EFCore.Specification.Tests/UpdatesTestBase.cs
@@ -205,6 +205,80 @@ public virtual void Remove_on_bytes_concurrency_token_original_value_matches_doe
                     Assert.Null(context.ProductWithBytes.Find(productId));
                 });
         }
+
+        [Fact]
+        public virtual void Update_on_bytes_concurrency_token_original_value_matches_throws_with_quirk()
+        {
+            var productId = new Guid("984ade3c-2f7b-4651-a351-642e92ab7146");
+
+            try
+            {
+                AppContext.SetSwitch("Microsoft.EntityFrameworkCore.Issue12214", true);
+
+                ExecuteWithStrategyInTransaction(
+                    context =>
+                    {
+                        var entry = context.ProductWithBytes.Attach(
+                            new ProductWithBytes
+                            {
+                                Id = productId,
+                                Name = "MegaChips",
+                                Bytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 }
+                            });
+
+                        entry.Entity.Name = "GigaChips";
+
+                        Assert.Throws<DbUpdateConcurrencyException>(
+                            () => context.SaveChanges());
+                    },
+                    context =>
+                    {
+                        Assert.Equal("MegaChips", context.ProductWithBytes.Find(productId).Name);
+                    });
+
+            }
+            finally
+            {
+                AppContext.SetSwitch("Microsoft.EntityFrameworkCore.Issue12214", false);
+            }
+        }
+
+        [Fact]
+        public virtual void Remove_on_bytes_concurrency_token_original_value_matches_throws_with_quirk()
+        {
+            var productId = new Guid("984ade3c-2f7b-4651-a351-642e92ab7146");
+
+            try
+            {
+                AppContext.SetSwitch("Microsoft.EntityFrameworkCore.Issue12214", true);
+
+                ExecuteWithStrategyInTransaction(
+                    context =>
+                    {
+                        var entry = context.ProductWithBytes.Attach(
+                            new ProductWithBytes
+                            {
+                                Id = productId,
+                                Name = "MegaChips",
+                                Bytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 }
+                            });
+
+                        entry.State = EntityState.Deleted;
+
+                        Assert.Throws<DbUpdateConcurrencyException>(
+                            () => context.SaveChanges());
+                    },
+                    context =>
+                    {
+                        Assert.Equal("MegaChips", context.ProductWithBytes.Find(productId).Name);
+                    });
+
+            }
+            finally
+            {
+                AppContext.SetSwitch("Microsoft.EntityFrameworkCore.Issue12214", false);
+            }
+        }
 #endif
 
         [Fact]