Add support EF Code First for EntityTableDataLoader

Add support EF Code First for EntityTableDataLoader

Main/Build/Build.cmd

@@ -23,4 +23,6 @@ if not exist %msbuild% (
 )
 
 set EnableNugetPackageRestore=true
-%msbuild% Build.targets /v:minimal /maxcpucount /nodeReuse:false %*
+%msbuild% Build.targets /v:minimal /maxcpucount /nodeReuse:false %*
+
+timeout /t 2

Main/Build/Effort.EF6.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
     <metadata>
         <id>Effort.EF6</id>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
         <title />
         <authors>ZZZ Projects, tamasflamich</authors>
         <owners>ZZZ Projects</owners>

Main/Build/Effort.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
     <metadata>
         <id>Effort</id>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
         <title />
         <authors>ZZZ Projects, tamasflamich</authors>
         <owners>ZZZ Projects</owners>

Main/Source/Effort.Lab.EF6/Effort.Lab.EF6.csproj

@@ -38,12 +38,12 @@
       <HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="NMemory, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6a46696d54971e6d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Build\Packages\Library\.NET 4.5\Entity Framework 6\NMemory.dll</HintPath>
+      <HintPath>..\packages\NMemory.1.1.2\lib\net45\NMemory.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

Main/Source/Effort.Lab.EF6/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.1.2" targetFramework="net45" />
+  <package id="NMemory" version="1.1.2" targetFramework="net45" />
 </packages>

Main/Source/Effort/DataLoaders/EntityTableDataLoaderFactory.cs

@@ -22,14 +22,13 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------
 
+
 namespace Effort.DataLoaders
 {
     using System;
-    using System.Data.Common;
-    using System.Data.Entity;
 #if !EFOLD
     using System.Data.Entity.Core.EntityClient;
-    using System.Data.Entity.Core.Objects;
+    using Effort.Internal;
     using System.Reflection;
 #else
     using System.Data.EntityClient;
@@ -44,19 +43,7 @@ public class EntityTableDataLoaderFactory : ITableDataLoaderFactory
         private Func<EntityConnection> connectionFactory;
         private EntityConnection connection;
 
-        private EntityConnection GetEntityConnection(Database data)
-        {
-            object internalContext = data.GetType().GetField("_internalContext", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(data);
-
-
-            MethodInfo getObjectContext = internalContext.GetType().GetMethod("GetObjectContextWithoutDatabaseInitialization", BindingFlags.Public | BindingFlags.Instance);
-
-            var objectContext = (ObjectContext)getObjectContext.Invoke(internalContext, null);
-
-            DbConnection entityConnection = objectContext.Connection;
-
-            return (EntityConnection)entityConnection;
-        }
+
 
         /// <summary>
         ///     Initializes a new instance of the <see cref="EntityTableDataLoaderFactory" /> 
@@ -67,18 +54,22 @@ private EntityConnection GetEntityConnection(Database data)
         /// </param>
         public EntityTableDataLoaderFactory(Func<EntityConnection> connectionFactory)
         {
-            var entityConnectionString_Fields = connectionFactory.Target.GetType().GetField("entityConnectionString", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public);
+#if !EFOLD
+            var entityConnectionString_Fields = connectionFactory.Target.GetType().GetField("entityConnectionString", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static);
 
             var entityConnectionString = entityConnectionString_Fields.GetValue(connectionFactory.Target);
 
             if (entityConnectionString.Equals(""))
             {
-                this.connectionFactory = () => GetEntityConnection(EntityFrameworkEffortManager.CreateFactoryContext(null).Database);
+                this.connectionFactory = () => EntityFrameworkEffortManager.CreateFactoryContext(null).Database.GetEntityConnection();
             }
             else
             {
                 this.connectionFactory = connectionFactory;
             }
+#else
+            this.connectionFactory = connectionFactory;
+#endif
         }
 
         /// <summary>

Main/Source/Effort/Effort.csproj

@@ -259,6 +259,7 @@
     <Compile Include="Internal\Common\ReflectionHelper.cs" />
     <Compile Include="Internal\Common\TypeHelper.cs" />
     <Compile Include="EntityConnectionFactory.cs" />
+    <Compile Include="Internal\Extensions\Database.GetEntityConnection.cs" />
     <Compile Include="Internal\StorageSchema\CommonPropertyElementModifier.cs" />
     <Compile Include="Internal\StorageSchema\ModificationFunctionMappingModifier.cs" />
     <Compile Include="Internal\StorageSchema\ReturnTypeAttributeSelector.cs" />
@@ -360,4 +361,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

Main/Source/Effort/EntityFrameworkEffortManager.cs

@@ -1,4 +1,5 @@
- using System;
+#if !EFOLD
+using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
@@ -32,9 +33,8 @@ internal static DbContext CreateFactoryContext(DbContext context)
                 } 
             } 
 
-            throw new Exception(
-                "A working context must be provided using EntityFrameworkEffortManager.ContextFactory." +
-                " This setting is required for some features like IncludeGraph. Read more: http://entityframework-extensions.net/context-factory");
+            throw new Exception("The specified code require a ContextFactory to work. Example: EntityFrmeworkEffortManager.ContextFactory = (currentContext) => new EntitiesContext()");
         }
     }
 }
+#endif

Main/Source/Effort/Internal/Extensions/Database.GetEntityConnection.cs

@@ -0,0 +1,27 @@
+#if !EFOLD
+
+using System.Data.Entity;
+using System.Data.Entity.Core.EntityClient;
+using System.Data.Entity.Core.Objects;
+using System.Reflection;
+
+namespace Effort.Internal
+{
+    internal static class InternalExtensions
+    {
+        internal static EntityConnection GetEntityConnection(this Database database)
+        {
+            var internalContext = database.GetType().GetField("_internalContext", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(database);
+
+            var getObjectContext = internalContext.GetType().GetMethod("GetObjectContextWithoutDatabaseInitialization", BindingFlags.Public | BindingFlags.Instance);
+
+            var objectContext = (ObjectContext) getObjectContext.Invoke(internalContext, null);
+
+            var entityConnection = objectContext.Connection;
+
+            return (EntityConnection) entityConnection;
+        }
+    }
+}
+
+#endif

Main/Source/Effort/Properties/AssemblyVersion.cs

@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.3.2")]
-[assembly: AssemblyInformationalVersion("1.3.2")]
+[assembly: AssemblyFileVersion("1.3.3")]
+[assembly: AssemblyInformationalVersion("1.3.3")]