Merge pull request #642 from fredericDelaporte/NH-4030

fredericDelaporte · web-flow · commit 1aae49075db4 · 2017-06-20T21:47:41.000+02:00
NH-4030 - Refactoring future extension methods.
diff --git a/src/NHibernate.Test/Futures/FallbackFixture.cs b/src/NHibernate.Test/Futures/FallbackFixture.cs
@@ -2,21 +2,17 @@
 using NHibernate.Cfg;
 using NHibernate.Connection;
 using NHibernate.Criterion;
-using NHibernate.Dialect;
 using NHibernate.Driver;
 using NHibernate.Linq;
 using NUnit.Framework;
 
-using Environment=NHibernate.Cfg.Environment;
+using Environment = NHibernate.Cfg.Environment;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
 	public class TestDriverThatDoesntSupportQueryBatching : SqlClientDriver
 	{
-		public override bool SupportsMultipleQueries
-		{
-			get { return false; }
-		}
+		public override bool SupportsMultipleQueries => false;
 	}
 
 	/// <summary>
@@ -31,17 +27,22 @@ public class FallbackFixture : FutureFixture
 	{
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
-			var cp = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties);
-			return !cp.Driver.SupportsMultipleQueries;
+			using (var cp = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties))
+			{
+				return !cp.Driver.SupportsMultipleQueries;
+			}
 		}
 
 		protected override void Configure(Configuration configuration)
 		{
 			base.Configure(configuration);
-			if (Dialect is MsSql2000Dialect)
+			using (var cp = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties))
 			{
-				configuration.Properties[Environment.ConnectionDriver] =
-					typeof (TestDriverThatDoesntSupportQueryBatching).AssemblyQualifiedName;
+				if (cp.Driver is SqlClientDriver)
+				{
+					configuration.Properties[Environment.ConnectionDriver] =
+						typeof(TestDriverThatDoesntSupportQueryBatching).AssemblyQualifiedName;
+				}
 			}
 		}
 
@@ -155,6 +156,21 @@ public void FutureValueOfLinqCanGetSingleEntityWhenQueryBatchingIsNotSupported()
 			}
 		}
 
+		[Test]
+		public void FutureValueWithSelectorOfLinqCanGetSingleEntityWhenQueryBatchingIsNotSupported()
+		{
+			var personId = CreatePerson();
+
+			using (var session = OpenSession())
+			{
+				var futurePerson = session
+					.Query<Person>()
+					.Where(x => x.Id == personId)
+					.ToFutureValue(q => q.FirstOrDefault());
+				Assert.IsNotNull(futurePerson.Value);
+			}
+		}
+
 		private int CreatePerson()
 		{
 			using (var session = Sfi.OpenSession())
diff --git a/src/NHibernate.Test/Futures/FutureCriteriaFixture.cs b/src/NHibernate.Test/Futures/FutureCriteriaFixture.cs
@@ -1,9 +1,8 @@
 using System.Linq;
 using NHibernate.Criterion;
-using NHibernate.Impl;
 using NUnit.Framework;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
     [TestFixture]
     public class FutureCriteriaFixture : FutureFixture
diff --git a/src/NHibernate.Test/Futures/FutureFixture.cs b/src/NHibernate.Test/Futures/FutureFixture.cs
@@ -1,16 +1,14 @@
 using System.Collections;
-using NHibernate.Driver;
-using NHibernate.Impl;
 
 using NUnit.Framework;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
 	public abstract class FutureFixture : TestCase
 	{
 		protected override IList Mappings
 		{
-			get { return new[] { "NHSpecificTest.Futures.Mappings.hbm.xml" }; }
+			get { return new[] { "Futures.Mappings.hbm.xml" }; }
 		}
 
 		protected override string MappingsAssembly
diff --git a/src/NHibernate.Test/Futures/FutureQueryFixture.cs b/src/NHibernate.Test/Futures/FutureQueryFixture.cs
@@ -1,12 +1,9 @@
 ﻿using System.Linq;
 using NHibernate.Driver;
-using NHibernate.Impl;
 using NUnit.Framework;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
-	using System.Collections;
-
 	[TestFixture]
 	public class FutureQueryFixture : FutureFixture
 	{
diff --git a/src/NHibernate.Test/Futures/FutureQueryOverFixture.cs b/src/NHibernate.Test/Futures/FutureQueryOverFixture.cs
@@ -1,9 +1,7 @@
 using System.Linq;
-using NHibernate.Criterion;
-using NHibernate.Impl;
 using NUnit.Framework;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
 	[TestFixture]
 	public class FutureQueryOverFixture : FutureFixture
diff --git a/src/NHibernate.Test/Futures/LinqFutureFixture.cs b/src/NHibernate.Test/Futures/LinqFutureFixture.cs
@@ -3,7 +3,7 @@
 using NUnit.Framework;
 using System.Linq;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
 	[TestFixture]
 	public class LinqFutureFixture : FutureFixture
diff --git a/src/NHibernate.Test/Futures/LinqToFutureValueFixture.cs b/src/NHibernate.Test/Futures/LinqToFutureValueFixture.cs
@@ -2,7 +2,7 @@
 using NHibernate.Linq;
 using NUnit.Framework;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
 	public class LinqToFutureValueFixture : FutureFixture
 	{
diff --git a/src/NHibernate.Test/Futures/Mappings.hbm.xml b/src/NHibernate.Test/Futures/Mappings.hbm.xml
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
-				   namespace="NHibernate.Test.NHSpecificTest.Futures"
+				   namespace="NHibernate.Test.Futures"
 				   assembly="NHibernate.Test">
 
 	<class name="Person">
diff --git a/src/NHibernate.Test/Futures/Person.cs b/src/NHibernate.Test/Futures/Person.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
 	public class Person
 	{
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -393,6 +393,14 @@
     <Compile Include="FilterTest\Product.cs" />
     <Compile Include="FilterTest\Salesperson.cs" />
     <Compile Include="FilterTest\TestClass.cs" />
+    <Compile Include="Futures\FallbackFixture.cs" />
+    <Compile Include="Futures\FutureCriteriaFixture.cs" />
+    <Compile Include="Futures\FutureFixture.cs" />
+    <Compile Include="Futures\FutureQueryFixture.cs" />
+    <Compile Include="Futures\FutureQueryOverFixture.cs" />
+    <Compile Include="Futures\LinqFutureFixture.cs" />
+    <Compile Include="Futures\LinqToFutureValueFixture.cs" />
+    <Compile Include="Futures\Person.cs" />
     <Compile Include="Generatedkeys\ByTrigger\GeneratedIdentityFixture.cs" />
     <Compile Include="Generatedkeys\ByTrigger\MyEntity.cs" />
     <Compile Include="Generatedkeys\Identity\IdentityGeneratedKeysTest.cs" />
@@ -1002,7 +1010,6 @@
     <Compile Include="NHSpecificTest\NH646\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3234\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3234\Domain.cs" />
-    <Compile Include="NHSpecificTest\Futures\LinqToFutureValueFixture.cs" />
     <Compile Include="NHSpecificTest\NH2955\Employee.cs" />
     <Compile Include="NHSpecificTest\NH2955\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3175\Fixture.cs" />
@@ -1073,7 +1080,6 @@
     <Compile Include="NHSpecificTest\EntityNameAndCompositeId\Fixture.cs" />
     <Compile Include="NHSpecificTest\EntityNameAndInheritance\Fixture.cs" />
     <Compile Include="NHSpecificTest\EntityNameWithFullName\Fixture.cs" />
-    <Compile Include="NHSpecificTest\Futures\LinqFutureFixture.cs" />
     <Compile Include="NHSpecificTest\NH0000\Entity.cs" />
     <Compile Include="NHSpecificTest\NH0000\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH0000\FixtureByCode.cs" />
@@ -1530,7 +1536,6 @@
     <Compile Include="NHSpecificTest\ElementsEnums\IntEnumsBagPartialNameFixture.cs" />
     <Compile Include="NHSpecificTest\ElementsEnums\IntEnumsBagFixture.cs" />
     <Compile Include="NHSpecificTest\ElementsEnums\Something.cs" />
-    <Compile Include="NHSpecificTest\Futures\FutureQueryOverFixture.cs" />
     <Compile Include="NHSpecificTest\ManyToOneFilters20Behaviour\Fixture.cs" />
     <Compile Include="NHSpecificTest\ManyToOneFilters20Behaviour\Model.cs" />
     <Compile Include="NHSpecificTest\NH1255\Domain.cs" />
@@ -1596,8 +1601,6 @@
     <Compile Include="NHSpecificTest\Dates\TimeFixture.cs" />
     <Compile Include="NHSpecificTest\DtcFailures\DtcFailuresFixture.cs" />
     <Compile Include="NHSpecificTest\DtcFailures\Person.cs" />
-    <Compile Include="NHSpecificTest\Futures\FallbackFixture.cs" />
-    <Compile Include="NHSpecificTest\Futures\FutureFixture.cs" />
     <Compile Include="NHSpecificTest\Logs\LogsFixture.cs" />
     <Compile Include="NHSpecificTest\Logs\Person.cs" />
     <Compile Include="NHSpecificTest\NH1391\Animal.cs" />
@@ -1939,9 +1942,6 @@
     <Compile Include="NHSpecificTest\FileStreamSql2008\VendorCatalog.cs" />
     <Compile Include="NHSpecificTest\FileStreamSql2008\Fixture.cs" />
     <Compile Include="NHSpecificTest\FileStreamSql2008\Convert.cs" />
-    <Compile Include="NHSpecificTest\Futures\FutureQueryFixture.cs" />
-    <Compile Include="NHSpecificTest\Futures\FutureCriteriaFixture.cs" />
-    <Compile Include="NHSpecificTest\Futures\Person.cs" />
     <Compile Include="NHSpecificTest\Dates\AllDates.cs" />
     <Compile Include="NHSpecificTest\Dates\DateTimeOffsetFixture.cs" />
     <Compile Include="NHSpecificTest\NH1274ExportExclude\Home.cs" />
@@ -3282,6 +3282,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Futures\Mappings.hbm.xml" />
     <EmbeddedResource Include="SessionBuilder\Mappings.hbm.xml" />
     <EmbeddedResource Include="IdTest\IdentityClass.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1904\StructMappings.hbm.xml" />
@@ -3787,7 +3788,6 @@
     <EmbeddedResource Include="NHSpecificTest\NH1654\Mappings.hbm.xml" />
     <EmbeddedResource Include="Pagination\DataPoint.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\Dates\Mappings\DateTime2.hbm.xml" />
-    <EmbeddedResource Include="NHSpecificTest\Futures\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1643\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1640\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1584\Mappings.hbm.xml" />
diff --git a/src/NHibernate/Impl/AbstractQueryImpl.cs b/src/NHibernate/Impl/AbstractQueryImpl.cs
@@ -886,7 +886,7 @@ public IEnumerable<T> Future<T>()
 		{
 			if (!session.Factory.ConnectionProvider.Driver.SupportsMultipleQueries)
 			{
-				return List<T>();
+				return new DelayedEnumerator<T>(List<T>);
 			}
 
 			session.FutureQueryBatch.Add<T>(this);
diff --git a/src/NHibernate/Linq/DefaultQueryProvider.cs b/src/NHibernate/Linq/DefaultQueryProvider.cs
@@ -13,7 +13,8 @@ namespace NHibernate.Linq
 {
 	public interface INhQueryProvider : IQueryProvider
 	{
-		object ExecuteFuture(Expression expression);
+		IEnumerable<TResult> ExecuteFuture<TResult>(Expression expression);
+		IFutureValue<TResult> ExecuteFutureValue<TResult>(Expression expression);
 		void SetResultTransformerAndAdditionalCriteria(IQuery query, NhLinqExpression nhExpression, IDictionary<string, Tuple<object, IType>> parameters);
 	}
 
@@ -59,12 +60,32 @@ public virtual IQueryable<T> CreateQuery<T>(Expression expression)
 			return new NhQueryable<T>(this, expression);
 		}
 
-		public virtual object ExecuteFuture(Expression expression)
+		public virtual IEnumerable<TResult> ExecuteFuture<TResult>(Expression expression)
 		{
-			IQuery query;
-			NhLinqExpression nhQuery;
-			NhLinqExpression nhLinqExpression = PrepareQuery(expression, out query, out nhQuery);
-			return ExecuteFutureQuery(nhLinqExpression, query, nhQuery);
+			PrepareQuery(expression, out var query, out var nhQuery);
+
+			var result = query.Future<TResult>();
+			SetupFutureResult(nhQuery, (IDelayedValue)result);
+
+			return result;
+		}
+
+		public virtual IFutureValue<TResult> ExecuteFutureValue<TResult>(Expression expression)
+		{
+			PrepareQuery(expression, out var query, out var nhQuery);
+
+			var result = query.FutureValue<TResult>();
+			SetupFutureResult(nhQuery, (IDelayedValue)result);
+
+			return result;
+		}
+
+		private static void SetupFutureResult(NhLinqExpression nhQuery, IDelayedValue result)
+		{
+			if (nhQuery.ExpressionToHqlTranslationResults.PostExecuteTransformer == null)
+				return;
+
+			result.ExecuteOnEval = nhQuery.ExpressionToHqlTranslationResults.PostExecuteTransformer;
 		}
 
 		protected virtual NhLinqExpression PrepareQuery(Expression expression, out IQuery query, out NhLinqExpression nhQuery)
@@ -80,24 +101,6 @@ protected virtual NhLinqExpression PrepareQuery(Expression expression, out IQuer
 			return nhLinqExpression;
 		}
 
-		private static readonly MethodInfo Future = ReflectHelper.GetMethodDefinition<IQuery>(q => q.Future<object>());
-		private static readonly MethodInfo FutureValue = ReflectHelper.GetMethodDefinition<IQuery>(q => q.FutureValue<object>());
-
-		protected virtual object ExecuteFutureQuery(NhLinqExpression nhLinqExpression, IQuery query, NhLinqExpression nhQuery)
-		{
-			var method = (nhLinqExpression.ReturnType == NhLinqExpressionReturnType.Sequence ? Future : FutureValue)
-				.MakeGenericMethod(nhQuery.Type);
-
-			object result = method.Invoke(query, new object[0]);
-
-			if (nhQuery.ExpressionToHqlTranslationResults.PostExecuteTransformer != null)
-			{
-				((IDelayedValue) result).ExecuteOnEval = nhQuery.ExpressionToHqlTranslationResults.PostExecuteTransformer;
-			}
-
-			return result;
-		}
-
 		protected virtual object ExecuteQuery(NhLinqExpression nhLinqExpression, IQuery query, NhLinqExpression nhQuery)
 		{
 			IList results = query.List();
diff --git a/src/NHibernate/Linq/LinqExtensionMethods.cs b/src/NHibernate/Linq/LinqExtensionMethods.cs

Original file line number	Diff line number	Diff line change
`@@ -2,21 +2,17 @@`
`2`	`2`	`using NHibernate.Cfg;`
`3`	`3`	`using NHibernate.Connection;`
`4`	`4`	`using NHibernate.Criterion;`
`5`		`-using NHibernate.Dialect;`
`6`	`5`	`using NHibernate.Driver;`
`7`	`6`	`using NHibernate.Linq;`
`8`	`7`	`using NUnit.Framework;`
`9`	`8`
`10`		`-using Environment=NHibernate.Cfg.Environment;`
	`9`	`+using Environment = NHibernate.Cfg.Environment;`
`11`	`10`
`12`		`-namespace NHibernate.Test.NHSpecificTest.Futures`
	`11`	`+namespace NHibernate.Test.Futures`
`13`	`12`	`{`
`14`	`13`	`public class TestDriverThatDoesntSupportQueryBatching : SqlClientDriver`
`15`	`14`	`{`
`16`		`- public override bool SupportsMultipleQueries`
`17`		`- {`
`18`		`- get { return false; }`
`19`		`- }`
	`15`	`+ public override bool SupportsMultipleQueries => false;`
`20`	`16`	`}`
`21`	`17`
`22`	`18`	`/// <summary>`
`@@ -31,17 +27,22 @@ public class FallbackFixture : FutureFixture`
`31`	`27`	`{`
`32`	`28`	`protected override bool AppliesTo(Dialect.Dialect dialect)`
`33`	`29`	`{`
`34`		`- var cp = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties);`
`35`		`- return !cp.Driver.SupportsMultipleQueries;`
	`30`	`+ using (var cp = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties))`
	`31`	`+ {`
	`32`	`+ return !cp.Driver.SupportsMultipleQueries;`
	`33`	`+ }`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`protected override void Configure(Configuration configuration)`
`39`	`37`	`{`
`40`	`38`	`base.Configure(configuration);`
`41`		`- if (Dialect is MsSql2000Dialect)`
	`39`	`+ using (var cp = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties))`
`42`	`40`	`{`
`43`		`- configuration.Properties[Environment.ConnectionDriver] =`
`44`		`- typeof (TestDriverThatDoesntSupportQueryBatching).AssemblyQualifiedName;`
	`41`	`+ if (cp.Driver is SqlClientDriver)`
	`42`	`+ {`
	`43`	`+ configuration.Properties[Environment.ConnectionDriver] =`
	`44`	`+ typeof(TestDriverThatDoesntSupportQueryBatching).AssemblyQualifiedName;`
	`45`	`+ }`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`
`@@ -155,6 +156,21 @@ public void FutureValueOfLinqCanGetSingleEntityWhenQueryBatchingIsNotSupported()`
`155`	`156`	`}`
`156`	`157`	`}`
`157`	`158`
	`159`	`+ [Test]`
	`160`	`+ public void FutureValueWithSelectorOfLinqCanGetSingleEntityWhenQueryBatchingIsNotSupported()`
	`161`	`+ {`
	`162`	`+ var personId = CreatePerson();`
	`163`	`+`
	`164`	`+ using (var session = OpenSession())`
	`165`	`+ {`
	`166`	`+ var futurePerson = session`
	`167`	`+ .Query<Person>()`
	`168`	`+ .Where(x => x.Id == personId)`
	`169`	`+ .ToFutureValue(q => q.FirstOrDefault());`
	`170`	`+ Assert.IsNotNull(futurePerson.Value);`
	`171`	`+ }`
	`172`	`+ }`
	`173`	`+`
`158`	`174`	`private int CreatePerson()`
`159`	`175`	`{`
`160`	`176`	`using (var session = Sfi.OpenSession())`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,14 @@`
`1`	`1`	`using System.Collections;`
`2`		`-using NHibernate.Driver;`
`3`		`-using NHibernate.Impl;`
`4`	`2`
`5`	`3`	`using NUnit.Framework;`
`6`	`4`
`7`		`-namespace NHibernate.Test.NHSpecificTest.Futures`
	`5`	`+namespace NHibernate.Test.Futures`
`8`	`6`	`{`
`9`	`7`	`public abstract class FutureFixture : TestCase`
`10`	`8`	`{`
`11`	`9`	`protected override IList Mappings`
`12`	`10`	`{`
`13`		`- get { return new[] { "NHSpecificTest.Futures.Mappings.hbm.xml" }; }`
	`11`	`+ get { return new[] { "Futures.Mappings.hbm.xml" }; }`
`14`	`12`	`}`
`15`	`13`
`16`	`14`	`protected override string MappingsAssembly`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,9 @@`
`1`	`1`	`using System.Linq;`
`2`	`2`	`using NHibernate.Driver;`
`3`		`-using NHibernate.Impl;`
`4`	`3`	`using NUnit.Framework;`
`5`	`4`
`6`		`-namespace NHibernate.Test.NHSpecificTest.Futures`
	`5`	`+namespace NHibernate.Test.Futures`
`7`	`6`	`{`
`8`		`- using System.Collections;`
`9`		`-`
`10`	`7`	`[TestFixture]`
`11`	`8`	`public class FutureQueryFixture : FutureFixture`
`12`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`	`using System.Linq;`
`5`	`5`
`6`		`-namespace NHibernate.Test.NHSpecificTest.Futures`
	`6`	`+namespace NHibernate.Test.Futures`
`7`	`7`	`{`
`8`	`8`	`[TestFixture]`
`9`	`9`	`public class LinqFutureFixture : FutureFixture`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using NHibernate.Linq;`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`
`5`		`-namespace NHibernate.Test.NHSpecificTest.Futures`
	`5`	`+namespace NHibernate.Test.Futures`
`6`	`6`	`{`
`7`	`7`	`public class LinqToFutureValueFixture : FutureFixture`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`
`3`		`-namespace NHibernate.Test.NHSpecificTest.Futures`
	`3`	`+namespace NHibernate.Test.Futures`
`4`	`4`	`{`
`5`	`5`	`public class Person`
`6`	`6`	`{`