Add test and small adjustments

dotnet · Apr 18, 2020 · 23be175 · 23be175
1 parent 1bc7387
commit 23be175
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 6 deletions.
diff --git a/src/EFCore.SqlServer/Scaffolding/Internal/SqlServerDatabaseModelFactory.cs b/src/EFCore.SqlServer/Scaffolding/Internal/SqlServerDatabaseModelFactory.cs
@@ -967,7 +967,7 @@ FROM [sys].[indexes] i
                                 IsUnique: ddr.GetValueOrDefault<bool>("is_unique"),
                                 HasFilter: ddr.GetValueOrDefault<bool>("has_filter"),
                                 FilterDefinition: ddr.GetValueOrDefault<string>("filter_definition"),
-                                FillFactor: ddr.GetValueOrDefault<int>("fill_factor")))
+                                FillFactor: ddr.GetValueOrDefault<byte>("fill_factor")))
                     .ToArray();
 
                 foreach (var indexGroup in indexGroups)

diff --git a/test/EFCore.SqlServer.Tests/Metadata/SqlServerBuilderExtensionsTest.cs b/test/EFCore.SqlServer.Tests/Metadata/SqlServerBuilderExtensionsTest.cs
@@ -234,8 +234,8 @@ public void Can_set_index_online_non_generic()
             var modelBuilder = CreateConventionModelBuilder();
 
             modelBuilder
-                .Entity<Customer>()
-                .HasIndex(e => e.Name)
+                .Entity(typeof(Customer))
+                .HasIndex("Name")
                 .IsCreatedOnline();
 
             var index = modelBuilder.Model.FindEntityType(typeof(Customer)).GetIndexes().Single();
@@ -770,10 +770,8 @@ public void Can_set_index_with_fillfactor_non_generic()
         }
 
         [ConditionalTheory]
-        [InlineData(-1)]
+        [InlineData(0)]
         [InlineData(101)]
-        [InlineData(int.MinValue)]
-        [InlineData(int.MaxValue)]
         public void Can_set_index_with_fillfactor_argument_out_of_range_exception(int fillFactor)
         {
             var modelBuilder = CreateConventionModelBuilder();

diff --git a/test/EFCore.SqlServer.Tests/Migrations/SqlServerModelDifferTest.cs b/test/EFCore.SqlServer.Tests/Migrations/SqlServerModelDifferTest.cs
@@ -1003,5 +1003,56 @@ public void Rebuild_index_when_changing_fillfactor_option()
                     Assert.Empty(operation2.GetAnnotations());
                 });
         }
+
+        [ConditionalFact]
+        public void Rebuild_index_with_different_fillfactor_option()
+        {
+            Execute(
+                source => source
+                    .Entity(
+                        "Address",
+                        x =>
+                        {
+                            x.Property<int>("Id");
+                            x.Property<string>("Zip");
+                            x.Property<string>("City");
+                            x.Property<string>("Street");
+                            x.HasIndex("Zip")
+                                .HasFillFactor(50);
+                        }),
+                target => target
+                    .Entity(
+                        "Address",
+                        x =>
+                        {
+                            x.Property<int>("Id");
+                            x.Property<string>("Zip");
+                            x.Property<string>("City");
+                            x.Property<string>("Street");
+                            x.HasIndex("Zip")
+                                .HasFillFactor(90);
+                        }),
+                operations =>
+                {
+                    Assert.Equal(2, operations.Count);
+
+                    var operation1 = Assert.IsType<DropIndexOperation>(operations[0]);
+                    Assert.Equal("Address", operation1.Table);
+                    Assert.Equal("IX_Address_Zip", operation1.Name);
+
+                    Assert.Empty(operation1.GetAnnotations());
+
+                    var operation2 = Assert.IsType<CreateIndexOperation>(operations[1]);
+                    Assert.Equal("Address", operation1.Table);
+                    Assert.Equal("IX_Address_Zip", operation1.Name);
+
+                    var annotation = operation2.GetAnnotation(SqlServerAnnotationNames.FillFactor);
+                    Assert.NotNull(annotation); 
+
+                    var annotationValue = Assert.IsType<int>(annotation.Value); 
+                    
+                    Assert.Equal(90, annotationValue);
+                });
+        }
     }
 }