Created a new project for Entity Framework 6 which uses the new names…

…paces
npgsql · Jun 15, 2013 · 63af645 · 63af645
1 parent e6f6cf7
commit 63af645
Show file tree

Hide file tree

Showing 15 changed files with 3,212 additions and 0 deletions.
diff --git a/lib/EntityFramework.dll b/lib/EntityFramework.dll
diff --git a/src/Npgsql/NpgsqlFactory.cs b/src/Npgsql/NpgsqlFactory.cs
@@ -24,6 +24,9 @@
 
 using System;
 using System.Data.Common;
+#if ENTITIES6
+using System.Data.Entity.Core.Common;
+#endif
 
 namespace Npgsql
 {

diff --git a/src/Npgsql/NpgsqlProviderManifest.cs b/src/Npgsql/NpgsqlProviderManifest.cs
@@ -3,7 +3,12 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Data.Common;
+#if ENTITIES6
+using System.Data.Entity.Core.Common;
+using System.Data.Entity.Core.Metadata.Edm;
+#else
 using System.Data.Metadata.Edm;
+#endif
 using System.Xml;
 using System.Data;
 

diff --git a/src/Npgsql/NpgsqlServices.cs b/src/Npgsql/NpgsqlServices.cs
@@ -3,8 +3,14 @@
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Xml;
+#if ENTITIES6
+using System.Data.Entity.Core.Common;
+using System.Data.Entity.Core.Common.CommandTrees;
+using System.Data.Entity.Core.Metadata.Edm;
+#else
 using System.Data.Common.CommandTrees;
 using System.Data.Metadata.Edm;
+#endif
 using Npgsql.SqlGenerators;
 
 namespace Npgsql

diff --git a/src/Npgsql/SqlGenerators/SqlBaseGenerator.cs b/src/Npgsql/SqlGenerators/SqlBaseGenerator.cs
@@ -2,8 +2,13 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
+#if ENTITIES6
+using System.Data.Entity.Core.Common.CommandTrees;
+using System.Data.Entity.Core.Metadata.Edm;
+#else
 using System.Data.Common.CommandTrees;
 using System.Data.Metadata.Edm;
+#endif
 using System.Linq;
 
 namespace Npgsql.SqlGenerators
@@ -1320,6 +1325,18 @@ private void SubstituteFilterNames(string joinPartVariableName, string variableN
         //    _projectVarName = _projectScopeStack.Pop();
         //    _filterVarName = _filterScopeStack.Pop();
         //}
+
+#if ENTITIES6
+        public override VisitedExpression Visit(DbInExpression expression)
+        {
+            throw new NotImplementedException("New in Entity Framework 6");
+        }
+
+        public override VisitedExpression Visit(DbPropertyExpression expression)
+        {
+            throw new NotImplementedException("New in Entity Framework 6");
+        }
+#endif
     }
 }
 #endif
diff --git a/src/Npgsql/SqlGenerators/SqlDeleteGenerator.cs b/src/Npgsql/SqlGenerators/SqlDeleteGenerator.cs
@@ -2,7 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
+#if ENTITIES6
+using System.Data.Entity.Core.Common.CommandTrees;
+#else
 using System.Data.Common.CommandTrees;
+#endif
 
 namespace Npgsql.SqlGenerators
 {

diff --git a/src/Npgsql/SqlGenerators/SqlInsertGenerator.cs b/src/Npgsql/SqlGenerators/SqlInsertGenerator.cs
@@ -2,7 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
+#if ENTITIES6
+using System.Data.Entity.Core.Common.CommandTrees;
+#else
 using System.Data.Common.CommandTrees;
+#endif
 
 namespace Npgsql.SqlGenerators
 {
@@ -36,7 +40,11 @@ public override VisitedExpression Visit(DbPropertyExpression expression)
                     DbScanExpression scan = _commandTree.Target.Expression as DbScanExpression;
                     if (scan != null)
                     {
+#if ENTITIES6
+                        System.Data.Entity.Core.Metadata.Edm.MetadataProperty metadata;
+#else
                         System.Data.Metadata.Edm.MetadataProperty metadata;
+#endif
                         string overrideSchema = "http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator:Schema";
                         if (scan.Target.MetadataProperties.TryGetValue(overrideSchema, false, out metadata) && metadata.Value != null)
                         {

diff --git a/src/Npgsql/SqlGenerators/SqlSelectGenerator.cs b/src/Npgsql/SqlGenerators/SqlSelectGenerator.cs
@@ -2,7 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
+#if ENTITIES6
+using System.Data.Entity.Core.Common.CommandTrees;
+#else
 using System.Data.Common.CommandTrees;
+#endif
 
 namespace Npgsql.SqlGenerators
 {

diff --git a/src/Npgsql/SqlGenerators/SqlUpdateGenerator.cs b/src/Npgsql/SqlGenerators/SqlUpdateGenerator.cs
@@ -2,7 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
+#if ENTITIES6
+using System.Data.Entity.Core.Common.CommandTrees;
+#else
 using System.Data.Common.CommandTrees;
+#endif
 
 namespace Npgsql.SqlGenerators
 {

diff --git a/src/Npgsql/SqlGenerators/VisitedExpression.cs b/src/Npgsql/SqlGenerators/VisitedExpression.cs
@@ -3,8 +3,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+#if ENTITIES6
+using System.Data.Entity.Core.Common.CommandTrees;
+using System.Data.Entity.Core.Metadata.Edm;
+#else
 using System.Data.Metadata.Edm;
 using System.Data.Common.CommandTrees;
+#endif
 using NpgsqlTypes;
 using System.Data;