Fix issue where property with value generated on add is reseeded in e…

…very migration Fixes dotnet#21661
ChristopherHaws · Jul 18, 2020 · 9e4769f · 9e4769f
1 parent 1aac0ae
commit 9e4769f
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs b/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs
@@ -1914,7 +1914,7 @@ protected virtual Dictionary<IEntityType, List<ITable>> DiffData(
 
                         foreach (var targetProperty in entry.EntityType.GetProperties())
                         {
-                            if (targetProperty.ValueGenerated != ValueGenerated.Never)
+                            if (!(targetProperty.ValueGenerated == ValueGenerated.Never || targetProperty.ValueGenerated == ValueGenerated.OnAdd))
                             {
                                 continue;
                             }

diff --git a/test/EFCore.SqlServer.Tests/Migrations/SqlServerModelDifferTest.cs b/test/EFCore.SqlServer.Tests/Migrations/SqlServerModelDifferTest.cs
@@ -726,6 +726,43 @@ public void SeedData_all_operations()
                     }));
         }
 
+        [ConditionalFact]
+        public void Dont_reseed_value_with_value_generated_on_add_property()
+        {
+            Execute(
+                source => source
+                    .Entity(
+                        "EntityWithValueGeneratedOnAddProperty",
+                        x =>
+                        {
+                            x.Property<int>("Id");
+                            x.Property<string>("ValueGeneratedOnAddProperty")
+                                .ValueGeneratedOnAdd();
+                            x.HasData(
+                                new
+                                {
+                                    Id = 1,
+                                    ValueGeneratedOnAddProperty = "Value"
+                                });
+                        }),
+                target => target
+                    .Entity(
+                        "EntityWithValueGeneratedOnAddProperty",
+                        x =>
+                        {
+                            x.Property<int>("Id");
+                            x.Property<string>("ValueGeneratedOnAddProperty")
+                                .ValueGeneratedOnAdd();
+                            x.HasData(
+                                new
+                                {
+                                    Id = 1,
+                                    ValueGeneratedOnAddProperty = "Value"
+                                });
+                        }),
+                operations => Assert.Equal(0, operations.Count));
+        }
+
         [ConditionalFact]
         public void Dont_rebuild_index_with_equal_include()
         {