Merge pull request MikaelEliasson#16 from otf/includefix

Fix for Include to BlogPost table

Author: MikaelEliasson

EntityFramework.Utilities/EntityFramework.Utilities/EFQueryHelpers.cs

@@ -69,7 +69,7 @@ public static EFUQueryable<T> IncludeEFU<T, TChild>(this IQueryable<T> query, Db
                 },
                 Loader = (rootFilters, parents) =>
                 {
-                    var baseType = typeof(T).BaseType ?? typeof(T);
+                    var baseType = typeof(T).BaseType != typeof(object) ? typeof(T).BaseType : typeof(T);
 
                     dynamic dynamicSet = octx.GetType()
                                     .GetMethod("CreateObjectSet", new Type[] { })

EntityFramework.Utilities/Tests/IncludeTest.cs

@@ -7,6 +7,7 @@
 using System.Linq.Expressions;
 using System.Text;
 using Tests.FakeDomain;
+using Tests.FakeDomain.Models;
 
 namespace Tests
 {
@@ -32,6 +33,25 @@ public void SingleInclude_LoadsChildren()
             }
         }
 
+        [TestMethod]
+        public void SingleInclude_LoadsChildren_BlogPost()
+        {
+            SetupSmallTestSet();
+            using (var db = Context.Sql())
+            {
+                var result = db.BlogPosts.IncludeEFU(db, x => x.Comments).ToList();
+                var bp1 = result.First(x => x.Title == "BP1");
+                var bp2 = result.First(x => x.Title == "BP2");
+                var bp3 = result.First(x => x.Title == "BP3");
+
+                Assert.AreEqual(1, bp1.Comments.Count);
+                Assert.AreEqual("C1", bp1.Comments.First().Text);
+                Assert.AreEqual(2, bp2.Comments.Count);
+                Assert.AreEqual("C2", bp2.Comments.First().Text);
+                Assert.AreEqual(3, bp3.Comments.Count);
+            }
+        }
+
         [TestMethod]
         public void SingleInclude_SortedParent_LoadsChildren()
         {
@@ -526,6 +546,30 @@ private static void CreateSmallTestSet(Context db)
                 }
             });
 
+            var blogPost1 = BlogPost.Create("BP1");
+            blogPost1.Comments = new List<Comment>()
+                {
+                    new Comment() { Text = "C1" }
+                };
+            db.BlogPosts.Add(blogPost1);
+
+            var blogPost2 = BlogPost.Create("BP2");
+            blogPost2.Comments = new List<Comment>()
+                {
+                    new Comment() { Text = "C2" },
+                    new Comment() { Text = "C3" }
+                };
+            db.BlogPosts.Add(blogPost2);
+
+            var blogPost3 = BlogPost.Create("BP3");
+            blogPost3.Comments = new List<Comment>()
+                {
+                    new Comment() { Text = "C4" },
+                    new Comment() { Text = "C5" },
+                    new Comment() { Text = "C6" }
+                };
+            db.BlogPosts.Add(blogPost3);
+
             db.SaveChanges();
         }
     }