Fixed compilation errors

Author: bgurmendi

src/EntityFramework5.Npgsql/EntityFramework5.Npgsql.csproj

@@ -63,6 +63,8 @@
     <Compile Include="..\EntityFramework6.Npgsql\Properties\AssemblyInfo.cs" />
     <Compile Include="..\EntityFramework6.Npgsql\Spatial\PostgisDataReader.cs" />
     <Compile Include="..\EntityFramework6.Npgsql\Spatial\PostgisServices.cs" />
+    <Compile Include="..\EntityFramework6.Npgsql\SqlGenerators\CaseIsNullToCoalesceReducer.cs" />
+    <Compile Include="..\EntityFramework6.Npgsql\SqlGenerators\DbExpressionDeepEqual.cs" />
     <Compile Include="..\EntityFramework6.Npgsql\SqlGenerators\PendingProjectsNode.cs" />
     <Compile Include="..\EntityFramework6.Npgsql\SqlGenerators\SqlBaseGenerator.cs" />
     <Compile Include="..\EntityFramework6.Npgsql\SqlGenerators\SqlDeleteGenerator.cs" />

src/EntityFramework6.Npgsql/SqlGenerators/CaseIsNullToCoalesceReducer.cs

@@ -1,8 +1,21 @@
 using System.Collections.Generic;
-using System.Data.Entity.Core.Common.CommandTrees;
-using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
 using System.Data.Entity.Core.Metadata.Edm;
 using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
+using System.Diagnostics;
+#if ENTITIES6
+using System.Globalization;
+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 JetBrains.Annotations;
+
 
 namespace Npgsql.SqlGenerators
 {

src/EntityFramework6.Npgsql/SqlGenerators/DbExpressionDeepEqual.cs

@@ -1,4 +1,5 @@
 using System.Data.Entity.Core.Common.CommandTrees;
+using System.Data.Entity.Core.Metadata.Edm;
 using System.Linq;
 
 namespace Npgsql.SqlGenerators
@@ -10,7 +11,7 @@ public static bool DeepEqual(DbExpression e1, DbExpression e2)
             if (e1.Equals(e2)) return true;
             if (e1.GetType() != e2.GetType()) return false;
             if (!e1.ExpressionKind.Equals(e2.ExpressionKind)) return false;
-            if (!e1.ResultType.Equals(e2.ResultType)) return false;
+            if (!DeepEqual(e1.ResultType,e2.ResultType)) return false;
 
             if (e1 is DbFunctionExpression f1 && e2 is DbFunctionExpression f2)
             {
@@ -36,6 +37,12 @@ public static bool DeepEqual(DbExpression e1, DbExpression e2)
             return false;
         }
 
+        static bool DeepEqual(TypeUsage r1, TypeUsage r2)
+        {
+            if (r1.EdmType !=  r2.EdmType) return false;
+            return true;
+        }
+
         private static bool DeepEqual(DbFunctionExpression f1, DbFunctionExpression f2)
         {
             if (!f1.Function.Name.Equals(f2.Function.Name)) return false;