Merge pull request MikaelEliasson#11 from dahrnsbrak/patch-1

MappingHelper.cs for Type Hierarchies

Author: MikaelEliasson

EntityFramework.Utilities/EntityFramework.Utilities/EFQueryHelpers.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Data.Entity.Core.Metadata.Edm;
+using System.Data.Entity.Core.Objects;
 using System.Data.Entity.Infrastructure;
 using System.Linq;
 using System.Linq.Expressions;
@@ -45,13 +46,14 @@ public static EFUQueryable<T> IncludeEFU<T, TChild>(this IQueryable<T> query, Db
             var e = new IncludeExecuter<T>
             {
                 ElementType = typeof(TChild),
-                SingleItemLoader = (parent) => {
+                SingleItemLoader = (parent) =>
+                {
                     if (parent == null)
                     {
                         return;
                     }
                     var children = octx.CreateObjectSet<TChild>();
-                    var lambdaExpression = GetRootEntityToChildCollectionSelector<T,TChild>(cSpaceType);
+                    var lambdaExpression = GetRootEntityToChildCollectionSelector<T, TChild>(cSpaceType);
 
                     var q = ApplyChildCollectionModifiers<TChild>(children, childCollectionModifiers);
 
@@ -64,10 +66,18 @@ public static EFUQueryable<T> IncludeEFU<T, TChild>(this IQueryable<T> query, Db
                     q = q.AsNoTracking().Where(where);
 
                     setter((T)parent, q.ToList());
-                }, 
+                },
                 Loader = (rootFilters, parents) =>
                 {
-                    var set = octx.CreateObjectSet<T>();
+                    var baseType = typeof(T).BaseType ?? typeof(T);
+                    
+                    dynamic dynamicSet = octx.GetType()
+                                    .GetMethod("CreateObjectSet", new Type[] { })
+                                    .MakeGenericMethod(baseType)
+                                    .Invoke(octx, new Object[] { });
+
+                    var set = dynamicSet.OfType<T>() as ObjectQuery<T>;
+
                     IQueryable<T> q = set;
                     foreach (var item in rootFilters)
                     {
@@ -77,7 +87,7 @@ public static EFUQueryable<T> IncludeEFU<T, TChild>(this IQueryable<T> query, Db
                         q = q.Provider.CreateQuery<T>(newMethods);
                     }
 
-                    var lambdaExpression = GetRootEntityToChildCollectionSelector<T,TChild>(cSpaceType);
+                    var lambdaExpression = GetRootEntityToChildCollectionSelector<T, TChild>(cSpaceType);
 
                     var childQ = q.SelectMany(lambdaExpression);
                     childQ = ApplyChildCollectionModifiers<TChild>(childQ, childCollectionModifiers);

EntityFramework.Utilities/EntityFramework.Utilities/MappingHelper.cs

@@ -121,7 +121,7 @@ public EfMapping(DbContext db)
                     .Descendants()
                     .Single(e =>
                         e.Name.LocalName == "EntityTypeMapping"
-                        && e.Attribute("TypeName").Value == set.ElementType.FullName)
+                        && (e.Attribute("TypeName").Value == set.ElementType.FullName || e.Attribute("TypeName").Value == string.Format("IsTypeOf({0})", set.ElementType.FullName)))
                     .Descendants()
                     .Where(e => e.Name.LocalName == "MappingFragment");
 

EntityFramework.Utilities/Tests/FakeDomain/Contact.cs

@@ -5,12 +5,9 @@
 
 namespace Tests.FakeDomain
 {
-    public class Contact
+    public class Contact : Person
     {
-        public Guid Id { get; set; }
-        public string FirstName { get; set; }
-        public string LastName { get; set; }
-        public DateTime BirthDate { get; set; }
+        public string Title { get; set; }
         public ICollection<PhoneNumber> PhoneNumbers { get; set; }
         public ICollection<Email> Emails { get; set; }
     }

EntityFramework.Utilities/Tests/FakeDomain/Context.cs

@@ -17,6 +17,7 @@ private Context(string connectionString)
         }
 
         public DbSet<BlogPost> BlogPosts { get; set; }
+        public DbSet<Person> People { get; set; }
         public DbSet<Contact> Contacts { get; set; }
         public DbSet<PhoneNumber> PhoneNumbers { get; set; }
         public DbSet<Email> Emails { get; set; }
@@ -27,6 +28,10 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
             base.OnModelCreating(modelBuilder);
             modelBuilder.ComplexType<AuthorInfo>();
             modelBuilder.ComplexType<Address>();
+
+            //Table per Type Hierarchy setup
+            modelBuilder.Entity<Person>().ToTable("Person");
+            modelBuilder.Entity<Contact>().ToTable("Contact");
         }
 
         public static Context Sql()

EntityFramework.Utilities/Tests/FakeDomain/Person.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Tests.FakeDomain
+{
+    public class Person
+    {
+        public Guid Id { get; set; }
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public DateTime BirthDate { get; set; }
+    }
+}

EntityFramework.Utilities/Tests/IncludeTest.cs

@@ -475,6 +475,7 @@ private static void CreateSmallTestSet(Context db)
             {
                 FirstName = "FN1",
                 LastName = "LN1",
+                Title = "Director",
                 Id = Guid.NewGuid(),
                 BirthDate = DateTime.Today,
                 PhoneNumbers = new List<PhoneNumber>(){
@@ -492,6 +493,7 @@ private static void CreateSmallTestSet(Context db)
             {
                 FirstName = "FN2",
                 LastName = "LN2",
+                Title = "Associate",
                 Id = Guid.NewGuid(),
                 BirthDate = DateTime.Today,
                 PhoneNumbers = new List<PhoneNumber>(){
@@ -514,6 +516,7 @@ private static void CreateSmallTestSet(Context db)
             {
                 FirstName = "FN3",
                 LastName = "LN3",
+                Title = "Vice President",
                 Id = Guid.NewGuid(),
                 BirthDate = DateTime.Today,
                 Emails = new List<Email>()

EntityFramework.Utilities/Tests/InsertTests.cs

@@ -4,12 +4,84 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tests.FakeDomain;
 using Tests.FakeDomain.Models;
+using System;
 
 namespace Tests
 {
     [TestClass]
     public class InsertTests 
     {
+        [TestMethod]
+        public void InsertAll_InsertItems_WithTypeHierarchy()
+        {
+            using (var db = Context.Sql())
+            {
+                if (db.Database.Exists())
+                {
+                    db.Database.Delete();
+                }
+                db.Database.Create();
+
+                List<Contact> people = new List<Contact>();
+                people.Add(new Contact
+                {
+                    FirstName = "FN1",
+                    LastName = "LN1",
+                    Title = "Director",
+                    Id = Guid.NewGuid(),
+                    BirthDate = DateTime.Today,
+                    PhoneNumbers = new List<PhoneNumber>(){
+                       new PhoneNumber{
+                           Id = Guid.NewGuid(),
+                           Number = "10134"
+                       },
+                       new PhoneNumber{
+                           Id = Guid.NewGuid(),
+                           Number = "15678"
+                       },
+                    }
+                });
+                people.Add(new Contact
+                {
+                    FirstName = "FN2",
+                    LastName = "LN2",
+                    Title = "Associate",
+                    Id = Guid.NewGuid(),
+                    BirthDate = DateTime.Today,
+                    PhoneNumbers = new List<PhoneNumber>(){
+                       new PhoneNumber{
+                           Id = Guid.NewGuid(),
+                           Number = "20134"
+                       },
+                       new PhoneNumber{
+                           Id = Guid.NewGuid(),
+                           Number = "25678"
+                       },
+                    },
+                    Emails = new List<Email>()
+                {
+                    new Email{Id = Guid.NewGuid(), Address = "[email protected]" },
+                    new Email{Id = Guid.NewGuid(), Address = "[email protected]" },
+                }
+                });
+                people.Add(new Contact
+                {
+                    FirstName = "FN3",
+                    LastName = "LN3",
+                    Title = "Vice President",
+                    Id = Guid.NewGuid(),
+                    BirthDate = DateTime.Today,
+                    Emails = new List<Email>()
+                {
+                    new Email{Id = Guid.NewGuid(), Address = "[email protected]" },
+                    new Email{Id = Guid.NewGuid(), Address = "[email protected]" },
+                }
+                });
+
+                EFBatchOperation.For(db, db.People).InsertAll(people);
+            }
+        }
+
         [TestMethod]
         public void InsertAll_InsertsItems()
         {

EntityFramework.Utilities/Tests/Tests.csproj

@@ -76,6 +76,7 @@
     <Compile Include="AttachAndModifyTest.cs" />
     <Compile Include="FakeDomain\Contact.cs" />
     <Compile Include="FakeDomain\Email.cs" />
+    <Compile Include="FakeDomain\Person.cs" />
     <Compile Include="FakeDomain\PhoneNumber.cs" />
     <Compile Include="FakeDomain\Queries.cs" />
     <Compile Include="IncludeTest.cs" />