Add IEnumerable overloads of HasData to OwnedNavigationBuilders

Fixes #19735
dotnet · Feb 2, 2020 · 0151831 · 0151831
1 parent a152828
commit 0151831
Show file tree

Hide file tree

Showing 8 changed files with 116 additions and 8 deletions.
diff --git a/src/EFCore/Metadata/Builders/EntityTypeBuilder.cs b/src/EFCore/Metadata/Builders/EntityTypeBuilder.cs
@@ -861,7 +861,7 @@ public virtual DataBuilder HasData([NotNull] params object[] data)
         ///     Configures this entity to have seed data. It is used to generate data motion migrations.
         /// </summary>
         /// <param name="data">
-        ///     An array of seed data represented by anonymous types.
+        ///     A collection of seed data represented by anonymous types.
         /// </param>
         /// <returns> An object that can be used to configure the model data. </returns>
         public virtual DataBuilder HasData([NotNull] IEnumerable<object> data)

diff --git a/src/EFCore/Metadata/Builders/EntityTypeBuilder`.cs b/src/EFCore/Metadata/Builders/EntityTypeBuilder`.cs
@@ -718,7 +718,7 @@ public virtual DataBuilder<TEntity> HasData([NotNull] params TEntity[] data)
         ///     Configures this entity to have seed data. It is used to generate data motion migrations.
         /// </summary>
         /// <param name="data">
-        ///     An array of seed data of the same type as the entity.
+        ///     A collection of seed data of the same type as the entity.
         /// </param>
         /// <returns> An object that can be used to configure the model data. </returns>
         public virtual DataBuilder<TEntity> HasData([NotNull] IEnumerable<TEntity> data)
@@ -738,7 +738,7 @@ public virtual DataBuilder<TEntity> HasData([NotNull] IEnumerable<TEntity> data)
         ///     Configures this entity to have seed data. It is used to generate data motion migrations.
         /// </summary>
         /// <param name="data">
-        ///     An array of seed data represented by anonymous types.
+        ///     A colection of seed data represented by anonymous types.
         /// </param>
         /// <returns> An object that can be used to configure the model data. </returns>
         public new virtual DataBuilder<TEntity> HasData([NotNull] IEnumerable<object> data)

diff --git a/src/EFCore/Metadata/Builders/OwnedNavigationBuilder.cs b/src/EFCore/Metadata/Builders/OwnedNavigationBuilder.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
@@ -784,5 +785,21 @@ public virtual DataBuilder HasData([NotNull] params object[] data)
 
             return new DataBuilder();
         }
+
+        /// <summary>
+        ///     Configures this entity to have seed data. It is used to generate data motion migrations.
+        /// </summary>
+        /// <param name="data">
+        ///     A collection of seed data represented by anonymous types.
+        /// </param>
+        /// <returns> An object that can be used to configure the model data. </returns>
+        public virtual DataBuilder HasData([NotNull] IEnumerable<object> data)
+        {
+            Check.NotNull(data, nameof(data));
+
+            OwnedEntityType.AddData(data);
+
+            return new DataBuilder();
+        }
     }
 }
diff --git a/src/EFCore/Metadata/Builders/OwnedNavigationBuilder`.cs b/src/EFCore/Metadata/Builders/OwnedNavigationBuilder`.cs
@@ -627,6 +627,22 @@ public virtual DataBuilder<TDependentEntity> HasData([NotNull] params TDependent
             return new DataBuilder<TDependentEntity>();
         }
 
+        /// <summary>
+        ///     Configures this entity to have seed data. It is used to generate data motion migrations.
+        /// </summary>
+        /// <param name="data">
+        ///     A collection of seed data.
+        /// </param>
+        /// <returns> An object that can be used to configure the model data. </returns>
+        public virtual DataBuilder<TDependentEntity> HasData([NotNull] IEnumerable<TDependentEntity> data)
+        {
+            Check.NotNull(data, nameof(data));
+
+            OwnedEntityType.AddData(data);
+
+            return new DataBuilder<TDependentEntity>();
+        }
+
         /// <summary>
         ///     Configures this entity to have seed data. It is used to generate data motion migrations.
         /// </summary>
@@ -640,5 +656,19 @@ public virtual DataBuilder<TDependentEntity> HasData([NotNull] params TDependent
 
             return new DataBuilder<TDependentEntity>();
         }
+
+        /// <summary>
+        ///     Configures this entity to have seed data. It is used to generate data motion migrations.
+        /// </summary>
+        /// <param name="data">
+        ///     A collection of seed data represented by anonymous types.
+        /// </param>
+        /// <returns> An object that can be used to configure the model data. </returns>
+        public new virtual DataBuilder<TDependentEntity> HasData([NotNull] IEnumerable<object> data)
+        {
+            base.HasData(data);
+
+            return new DataBuilder<TDependentEntity>();
+        }
     }
 }
diff --git a/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericTest.cs b/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericTest.cs
@@ -705,6 +705,12 @@ public override DataBuilder<TDependentEntity> HasData(params TDependentEntity[]
             public override DataBuilder<TDependentEntity> HasData(params object[] data)
                 => OwnedNavigationBuilder.HasData(data);
 
+            public override DataBuilder<TDependentEntity> HasData(IEnumerable<TDependentEntity> data)
+                => OwnedNavigationBuilder.HasData(data);
+
+            public override DataBuilder<TDependentEntity> HasData(IEnumerable<object> data)
+                => OwnedNavigationBuilder.HasData(data);
+
             OwnedNavigationBuilder<TEntity, TDependentEntity> IInfrastructure<OwnedNavigationBuilder<TEntity, TDependentEntity>>.
                 Instance
                 => OwnedNavigationBuilder;

diff --git a/test/EFCore.Tests/ModelBuilding/ModelBuilderNonGenericTest.cs b/test/EFCore.Tests/ModelBuilding/ModelBuilderNonGenericTest.cs
@@ -707,6 +707,18 @@ public override DataBuilder<TDependentEntity> HasData(params object[] data)
                 return new DataBuilder<TDependentEntity>();
             }
 
+            public override DataBuilder<TDependentEntity> HasData(IEnumerable<TDependentEntity> data)
+            {
+                OwnedNavigationBuilder.HasData(data);
+                return new DataBuilder<TDependentEntity>();
+            }
+
+            public override DataBuilder<TDependentEntity> HasData(IEnumerable<object> data)
+            {
+                OwnedNavigationBuilder.HasData(data);
+                return new DataBuilder<TDependentEntity>();
+            }
+
             OwnedNavigationBuilder IInfrastructure<OwnedNavigationBuilder>.Instance => OwnedNavigationBuilder;
         }
     }

diff --git a/test/EFCore.Tests/ModelBuilding/ModelBuilderTestBase.cs b/test/EFCore.Tests/ModelBuilding/ModelBuilderTestBase.cs
@@ -515,6 +515,10 @@ public abstract TestOwnedNavigationBuilder<TEntity, TDependentEntity> UsePropert
             public abstract DataBuilder<TDependentEntity> HasData(params TDependentEntity[] data);
 
             public abstract DataBuilder<TDependentEntity> HasData(params object[] data);
+
+            public abstract DataBuilder<TDependentEntity> HasData(IEnumerable<TDependentEntity> data);
+
+            public abstract DataBuilder<TDependentEntity> HasData(IEnumerable<object> data);
         }
     }
 }
diff --git a/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs b/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs
@@ -425,8 +425,23 @@ public virtual void Can_configure_one_to_one_relationship_from_an_owned_type_col
                 Assert.Null(model.FindEntityType(typeof(SpecialOrder)));
             }
 
-            [ConditionalFact]
-            public virtual void Can_configure_owned_type_from_an_owned_type_collection()
+            [Flags]
+            public enum HasDataOverload
+            {
+                Array = 0,
+                Enumerable = 1,
+                Generic = 2,
+                Params = 4
+            }
+
+            [ConditionalTheory]
+            [InlineData(HasDataOverload.Array)]
+            [InlineData(HasDataOverload.Array | HasDataOverload.Params)]
+            [InlineData(HasDataOverload.Array | HasDataOverload.Generic)]
+            [InlineData(HasDataOverload.Array | HasDataOverload.Params | HasDataOverload.Generic)]
+            [InlineData(HasDataOverload.Enumerable)]
+            [InlineData(HasDataOverload.Enumerable | HasDataOverload.Generic)]
+            public virtual void Can_configure_owned_type_from_an_owned_type_collection(HasDataOverload hasDataOverload)
             {
                 var modelBuilder = CreateModelBuilder();
 
@@ -435,9 +450,33 @@ public virtual void Can_configure_owned_type_from_an_owned_type_collection()
                     c => c.Orders, ob =>
                     {
                         ob.HasKey(o => o.OrderId);
-                        ob.OwnsOne(o => o.Details)
-                            .HasData(
-                                new OrderDetails { OrderId = -1 });
+                        var ownedNavigationBuilder = ob.OwnsOne(o => o.Details);
+
+                        switch (hasDataOverload)
+                        {
+                            case HasDataOverload.Array:
+                                ownedNavigationBuilder.HasData(new object[] { new OrderDetails { OrderId = -1 } });
+                                break;
+                            case HasDataOverload.Array | HasDataOverload.Params:
+                                ownedNavigationBuilder.HasData((object)new OrderDetails { OrderId = -1 });
+                                break;
+                            case HasDataOverload.Array | HasDataOverload.Generic:
+                                // ReSharper disable once RedundantExplicitParamsArrayCreation
+                                ownedNavigationBuilder.HasData(new[] { new OrderDetails { OrderId = -1 } });
+                                break;
+                            case HasDataOverload.Array | HasDataOverload.Params | HasDataOverload.Generic:
+                                ownedNavigationBuilder.HasData(new OrderDetails { OrderId = -1 });
+                                break;
+                            case HasDataOverload.Enumerable:
+                                ownedNavigationBuilder.HasData(new List<object> { new OrderDetails { OrderId = -1 } });
+                                break;
+                            case HasDataOverload.Enumerable | HasDataOverload.Generic:
+                                ownedNavigationBuilder.HasData(new List<OrderDetails>() { new OrderDetails { OrderId = -1 } });
+                                break;
+                            default:
+                                Assert.True(false, $"Unexpected HasData overload specification {hasDataOverload}");
+                                break;
+                        }
                     });
 
                 var model = modelBuilder.FinalizeModel();