Convert Int32 identity seed value

Fixes #25589
dotnet · Sep 3, 2021 · 4e68ad1 · 4e68ad1
1 parent f8e94f2
commit 4e68ad1
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 deletions.
diff --git a/src/EFCore.Design/Migrations/Internal/SnapshotModelProcessor.cs b/src/EFCore.Design/Migrations/Internal/SnapshotModelProcessor.cs
@@ -82,6 +82,14 @@ public SnapshotModelProcessor(
             return _modelRuntimeInitializer.Initialize((IModel)model, designTime: true, validationLogger: null);
         }
 
+        private void ProcessCollection(IEnumerable<IReadOnlyProperty> metadata, string version)
+        {
+            foreach (var element in metadata)
+            {
+                ProcessElement(element, version);
+            }
+        }
+
         private void ProcessCollection(IEnumerable<IReadOnlyAnnotatable> metadata, string version)
         {
             foreach (var element in metadata)
@@ -90,6 +98,23 @@ private void ProcessCollection(IEnumerable<IReadOnlyAnnotatable> metadata, strin
             }
         }
 
+        private void ProcessElement(IReadOnlyModel model, string version)
+        {
+            ProcessElement((IReadOnlyAnnotatable)model, version);
+
+            if ((version.StartsWith("3.", StringComparison.Ordinal)
+                || version.StartsWith("5.", StringComparison.Ordinal))
+                    && model is IMutableModel mutableModel)
+            {
+                var seed = model["SqlServer:IdentitySeed"];
+                if (seed != null
+                    && seed is int intSeed)
+                {
+                    mutableModel["SqlServer:IdentitySeed"] = (long)intSeed;
+                }
+            }
+        }
+
         private void ProcessElement(IReadOnlyEntityType entityType, string version)
         {
             ProcessElement((IReadOnlyAnnotatable)entityType, version);
@@ -103,6 +128,23 @@ private void ProcessElement(IReadOnlyEntityType entityType, string version)
             }
         }
 
+        private void ProcessElement(IReadOnlyProperty property, string version)
+        {
+            ProcessElement((IReadOnlyAnnotatable)property, version);
+
+            if ((version.StartsWith("3.", StringComparison.Ordinal)
+                || version.StartsWith("5.", StringComparison.Ordinal))
+                    && property is IMutableProperty mutableProperty)
+            {
+                var seed = property["SqlServer:IdentitySeed"];
+                if (seed != null
+                    && seed is int intSeed)
+                {
+                    mutableProperty["SqlServer:IdentitySeed"] = (long)intSeed;
+                }
+            }
+        }
+
         private void ProcessElement(IReadOnlyAnnotatable? metadata, string version)
         {
             if (version.StartsWith("1.", StringComparison.Ordinal)

diff --git a/test/EFCore.Design.Tests/Migrations/Design/SnapshotModelProcessorTest.cs b/test/EFCore.Design.Tests/Migrations/Design/SnapshotModelProcessorTest.cs
@@ -1084,15 +1084,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 modelBuilder
                     .HasAnnotation("ProductVersion", "3.0.0")
                     .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                    .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                    .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn)
+                    .HasAnnotation("SqlServer:IdentitySeed", 1);
 
                 modelBuilder.Entity(
                     "Ownership.OwningType1", b =>
                     {
                         b.Property<int>("Id")
                             .ValueGeneratedOnAdd()
                             .HasColumnType("int")
-                            .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                            .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn)
+                            .HasAnnotation("SqlServer:IdentitySeed", 1);
 
                         b.HasKey("Id");