Fix TPH model discovery problem. Potentially, closes #33, closes #53,…

EntityFramework.Utilities/EntityFramework.Utilities/App.config

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
 
   <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework">
       <parameters>
-        <parameter value="Data Source=.\SQLEXPRESS; Integrated Security=True; MultipleActiveResultSets=True" />
+        <parameter value="Data Source=.\SQLEXPRESS; Integrated Security=True; MultipleActiveResultSets=True"/>
       </parameters>
     </defaultConnectionFactory>
     <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
     </providers>
   </entityFramework>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

EntityFramework.Utilities/EntityFramework.Utilities/EntityFramework.Utilities.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +11,7 @@
     <AssemblyName>EntityFramework.Utilities</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -20,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

EntityFramework.Utilities/EntityFramework.Utilities/MappingHelper.cs

@@ -186,14 +186,19 @@ public EfMapping(DbContext db)
                     return GetClrTypeFromTypeMapping(metadata, objectItemCollection, m.TypeMapping as EntityTypeMapping);
                 };
 
+
                 if (mapping.EntityTypeMappings.Any(m => m.IsHierarchyMapping))
                 {
                     var withConditions = mapping.EntityTypeMappings.Where(m => m.Fragments[0].Conditions.Any()).ToList();
-                    tableMapping.TPHConfiguration = new TPHConfiguration
-                       {
-                           ColumnName = withConditions.First().Fragments[0].Conditions[0].Column.Name,
-                           Mappings = new Dictionary<Type, string>()
-                       };
+
+                    if (withConditions.Count > 0)
+                    {
+                        tableMapping.TPHConfiguration = new TPHConfiguration
+                        {
+                            ColumnName = withConditions.First().Fragments[0].Conditions[0].Column.Name,
+                            Mappings = new Dictionary<Type, string>()
+                        };
+                    }
                     foreach (var item in withConditions)
                     {
                         tableMapping.TPHConfiguration.Mappings.Add(

EntityFramework.Utilities/Tests/EfMappingFactoryTests.cs

@@ -0,0 +1,24 @@
+using EntityFramework.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Tests.FakeDomain;
+
+namespace Tests
+{
+
+    [TestClass]
+    public class EfMappingFactoryTests
+    {
+        [TestMethod]
+
+        public void ShouldGetMappingsForContext()
+        {
+            var ctx = Context.Sql();
+            var m = EfMappingFactory.GetMappingsForContext(ctx);
+            Assert.IsNotNull(m);
+        }
+    }
+}

EntityFramework.Utilities/Tests/FakeDomain/Context.cs

@@ -23,6 +23,7 @@ private Context(string connectionString)
         public DbSet<PhoneNumber> PhoneNumbers { get; set; }
         public DbSet<Email> Emails { get; set; }
         public DbSet<Comment> Comments { get; set; }
+        public DbSet<ApprovedComment> ApprovedComments { get; set; }
         public DbSet<NumericTestObject> NumericTestsObjects { get; set; }
         public DbSet<MultiPKObject> MultiPKObjects { get; set; }
 

EntityFramework.Utilities/Tests/Models/Comment.cs

@@ -1,15 +1,25 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 
 namespace Tests.FakeDomain.Models
 {
+    [Table("Comment")]
     public class Comment
     {
+        [Key]
         public int Id { get; set; }
         public string Text { get; set; }
         public int PostId { get; set; }
         public BlogPost Post { get; set; }
     }
+
+    [Table("ApprovedComment")]
+    public class ApprovedComment:Comment
+    {
+        public DateTime ApprovedOn { get; set; }
+    }
 }

EntityFramework.Utilities/Tests/Tests.csproj

@@ -76,6 +76,7 @@
     <Compile Include="ConnectionStringReader.cs" />
     <Compile Include="ConnectionStrings.cs" />
     <Compile Include="AttachAndModifyTest.cs" />
+    <Compile Include="EfMappingFactoryTests.cs" />
     <Compile Include="Models\MultiPKObject.cs" />
     <Compile Include="Models\NumericTestObject.cs" />
     <Compile Include="UpdateBulkTests.cs" />