Merge branch 'release/0.23.0' into develop

hazzik · txavier · commit 0a187f6cf323 · 2017-05-15T16:31:36.000-04:00
diff --git a/src/DelegateDecompiler.EntityFramework.Tests/App.config b/src/DelegateDecompiler.EntityFramework.Tests/App.config
@@ -15,6 +15,6 @@
     </providers>
   </entityFramework>
   <connectionStrings>
-    <add name="DelegateDecompilerEfTestDb" connectionString="Data Source=.\sqlexpress;Initial Catalog=DelegateDecompilerEfTestDb;MultipleActiveResultSets=True;Trusted_Connection=True" providerName="System.Data.SqlClient" />
+    <add name="DelegateDecompilerEfTestDb" connectionString="Data Source=.;Initial Catalog=DelegateDecompilerEfTestDb;MultipleActiveResultSets=True;Trusted_Connection=True" providerName="System.Data.SqlClient" />
   </connectionStrings>
 </configuration>
diff --git a/src/DelegateDecompiler.EntityFramework.Tests/DelegateDecompiler.EntityFramework.Tests.csproj b/src/DelegateDecompiler.EntityFramework.Tests/DelegateDecompiler.EntityFramework.Tests.csproj
@@ -94,6 +94,7 @@
     <Compile Include="TestGroup15Aggregation\Test02Sum.cs" />
     <Compile Include="TestGroup10OrderTake\Test02SkipTake.cs" />
     <Compile Include="TestGroup10OrderTake\Test01OrderBy.cs" />
+    <Compile Include="TestGroup20Relationship\Test01Include.cs" />
     <Compile Include="TestGroup50Types\Test01Strings.cs" />
     <Compile Include="TestGroup50Types\Test05DateTime.cs" />
     <Compile Include="TestGroup99SaveResults\Test99SaveResults.cs" />
@@ -123,6 +124,9 @@
       <Name>DelegateDecompiler</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/DelegateDecompiler.EntityFramework.Tests/GeneratedDocumentation/DetailedListOfSupportedCommands.md b/src/DelegateDecompiler.EntityFramework.Tests/GeneratedDocumentation/DetailedListOfSupportedCommands.md
@@ -1,6 +1,6 @@
 Detail of supported commands
 ============
-## Documentation produced for DelegateDecompiler, version 0.22.0 on Tuesday, 10 January 2017 21:57
+## Documentation produced for DelegateDecompiler, version 0.23.0 on Tuesday, 14 March 2017 10:50
 
 This file documents what linq commands **DelegateDecompiler** supports when
 working with [Entity Framework v6.1](http://msdn.microsoft.com/en-us/data/aa937723) (EF).
diff --git a/src/DelegateDecompiler.EntityFramework.Tests/GeneratedDocumentation/DetailedListOfSupportedCommandsWithSQL.md b/src/DelegateDecompiler.EntityFramework.Tests/GeneratedDocumentation/DetailedListOfSupportedCommandsWithSQL.md
@@ -1,6 +1,6 @@
 Detail With Sql of supported commands
 ============
-## Documentation produced for DelegateDecompiler, version 0.22.0 on Tuesday, 10 January 2017 21:57
+## Documentation produced for DelegateDecompiler, version 0.23.0 on Tuesday, 14 March 2017 10:50
 
 This file documents what linq commands **DelegateDecompiler** supports when
 working with [Entity Framework v6.1](http://msdn.microsoft.com/en-us/data/aa937723) (EF).
diff --git a/src/DelegateDecompiler.EntityFramework.Tests/GeneratedDocumentation/SummaryOfSupportedCommands.md b/src/DelegateDecompiler.EntityFramework.Tests/GeneratedDocumentation/SummaryOfSupportedCommands.md
@@ -1,6 +1,6 @@
 Summary of supported commands
 ============
-## Documentation produced for DelegateDecompiler, version 0.22.0 on Tuesday, 10 January 2017 21:57
+## Documentation produced for DelegateDecompiler, version 0.23.0 on Tuesday, 14 March 2017 10:50
 
 This file documents what linq commands **DelegateDecompiler** supports when
 working with [Entity Framework v6.1](http://msdn.microsoft.com/en-us/data/aa937723) (EF).
diff --git a/src/DelegateDecompiler.EntityFramework.Tests/Properties/AssemblyInfo.cs b/src/DelegateDecompiler.EntityFramework.Tests/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.22.0")]
+[assembly: AssemblyFileVersion("0.23.0")]
diff --git a/src/DelegateDecompiler.EntityFramework.Tests/TestGroup20Relationship/Test01Include.cs b/src/DelegateDecompiler.EntityFramework.Tests/TestGroup20Relationship/Test01Include.cs
@@ -0,0 +1,44 @@
+﻿// Contributed by @JonPSmith (GitHub) www.thereformedprogrammer.com
+
+using System.Linq;
+using DelegateDecompiler.EntityFramework.Tests.Helpers;
+using NUnit.Framework;
+using DelegateDecompiler.EntityFramework.Tests.EfItems;
+using System.Data.Entity;
+using System.Collections.Generic;
+
+namespace DelegateDecompiler.EntityFramework.Tests.TestGroup05BasicFeatures
+{
+    class Test01Include
+    {
+        private ClassEnvironment classEnv;
+
+        [OneTimeSetUp]
+        public void SetUpFixture()
+        {
+            classEnv = new ClassEnvironment();
+        }
+
+        [Computed]
+        private static bool ComputedSample() { return true; }
+
+        [Test]
+        public void TestInclude()
+        {
+            using (var db = new EfTestDbContext())
+            using (var env = new MethodEnvironment(classEnv))
+            {
+                //SETUP
+                var linq = db.EfParents.Where(p => true).Include(p => p.Children).ToList();
+
+                //ATTEMPT
+                env.AboutToUseDelegateDecompiler();
+                var dd = env.Db.EfParents.Where(p => ComputedSample()).Include(p => p.Children).Decompile().ToList();
+
+                //VERIFY
+                env.CompareAndLogList(linq, dd);
+            }
+        }
+
+    }
+}
diff --git a/src/DelegateDecompiler.EntityFramework/DelegateDecompiler.EntityFramework.nuspec b/src/DelegateDecompiler.EntityFramework/DelegateDecompiler.EntityFramework.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>0.22.0</version>
+    <version>0.23.0</version>
     <title>$title$</title>
     <authors>Alexander Zaytsev</authors>
     <owners>$author</owners>
@@ -17,7 +17,7 @@
     <copyright>Copyright (c) Alexander Zaytsev 2014 - 2017</copyright>
     <tags>LINQ computed-properties computedproperties decompiler decompilation computed properties expressions expression-tree IL</tags>
     <dependencies>
-      <dependency id="DelegateDecompiler" version="0.22.0" />
+      <dependency id="DelegateDecompiler" version="0.23.0" />
     </dependencies>
   </metadata>
 </package>
diff --git a/src/DelegateDecompiler.EntityFramework/Properties/AssemblyInfo.cs b/src/DelegateDecompiler.EntityFramework/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.22.0")]
+[assembly: AssemblyFileVersion("0.23.0")]
diff --git a/src/DelegateDecompiler.Tests.VB/DelegateDecompiler.Tests.VB.vbproj b/src/DelegateDecompiler.Tests.VB/DelegateDecompiler.Tests.VB.vbproj
@@ -121,6 +121,9 @@
       <Name>DelegateDecompiler</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/DelegateDecompiler.Tests/Properties/AssemblyInfo.cs b/src/DelegateDecompiler.Tests/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.22.0")]
+[assembly: AssemblyFileVersion("0.23.0")]
diff --git a/src/DelegateDecompiler/DecompileExpressionVisitor.cs b/src/DelegateDecompiler/DecompileExpressionVisitor.cs
@@ -14,6 +14,50 @@ public static Expression Decompile(Expression expression)
             return new DecompileExpressionVisitor().Visit(expression);
         }
 
+        private static readonly object NULL = new object(); // for use as a dictionary key
+        private readonly Dictionary<object, Expression> visitedConstants;
+
+        private bool hasAnyChanges = false;
+        public override Expression Visit(Expression node)
+        {
+            var result = base.Visit(node);
+            if (result != node)
+                hasAnyChanges = true;
+            return result;
+        }
+
+        private DecompileExpressionVisitor(Dictionary<object, Expression> sharedVisitedConstants = null)
+        {
+            this.visitedConstants = sharedVisitedConstants ?? new Dictionary<object, Expression>();
+        }
+
+        protected override Expression VisitConstant(ConstantExpression node)
+        {
+            Expression result;
+            if (visitedConstants.TryGetValue(node.Value ?? NULL, out result))
+            {
+                return result; // avoid infinite recursion
+            }
+
+            if (typeof(IQueryable).IsAssignableFrom(node.Type))
+            {
+                visitedConstants.Add(node.Value ?? NULL, node);
+
+                var value = (IQueryable)node.Value;
+                var childVisitor = new DecompileExpressionVisitor(visitedConstants);
+                result = childVisitor.Visit(value.Expression);
+
+                if (childVisitor.hasAnyChanges)
+                {
+                    result = Expression.Constant(value.Provider.CreateQuery(result), node.Type);
+                    visitedConstants[node.Value ?? NULL] = result;
+                    return result;
+                }
+            }
+
+            return node;
+        }
+        
         protected override Expression VisitMember(MemberExpression node)
         {
             if (ShouldDecompile(node.Member))
diff --git a/src/DelegateDecompiler/DelegateDecompiler.nuspec b/src/DelegateDecompiler/DelegateDecompiler.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>0.22.0</version>
+    <version>0.23.0</version>
     <title>$title$</title>
     <authors>Alexander Zaytsev</authors>
     <owners>$author</owners>
diff --git a/src/DelegateDecompiler/Properties/AssemblyInfo.cs b/src/DelegateDecompiler/Properties/AssemblyInfo.cs
@@ -37,6 +37,6 @@
 // [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.22.0")]
+[assembly: AssemblyFileVersion("0.23.0")]
 [assembly: InternalsVisibleTo("DelegateDecompiler.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c96a47f445d38b9b23cbf52e405743481cb9bd2df4672ad6494abcdeb9daf5588eb6159cc88af5fd5a18cece1f05ecb3ddba4b6329535438f4d173f2b769c4715c136ce65c2f25e7360916737056bca40bee22ab2f178af4c5fdc0e5051a6b2630f31447885eb4f5273271c56bd7b8fb240ab453635a79ec2d8aae4a58a6439f")]
 [assembly: InternalsVisibleTo("DelegateDecompiler.EntityFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c96a47f445d38b9b23cbf52e405743481cb9bd2df4672ad6494abcdeb9daf5588eb6159cc88af5fd5a18cece1f05ecb3ddba4b6329535438f4d173f2b769c4715c136ce65c2f25e7360916737056bca40bee22ab2f178af4c5fdc0e5051a6b2630f31447885eb4f5273271c56bd7b8fb240ab453635a79ec2d8aae4a58a6439f")]
