Merge pull request #1665 from fredericDelaporte/FutureGetEnumerable

Have IFutureEnumerable.GetEnumerable executing immediatly the query

Author: fredericDelaporte

build-common/NHibernate.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
     <VersionMinor Condition="'$(VersionMinor)' == ''">0</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">4</VersionPatch>
+    <VersionPatch Condition="'$(VersionPatch)' == ''">5</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>

build-common/common.xml

@@ -30,8 +30,8 @@
 
 	<!-- This is used only for build folder -->
 	<!-- TODO: Either remove or refactor to use NHibernate.props -->
-	<property name="project.version" value="5.0.4" overwrite="false" />
-	<property name="project.version.numeric" value="5.0.4" overwrite="false" />
+	<property name="project.version" value="5.0.5" overwrite="false" />
+	<property name="project.version.numeric" value="5.0.5" overwrite="false" />
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />

releasenotes.txt

@@ -1,4 +1,12 @@
-Build 5.0.4
+Build 5.0.5
+=============================
+
+Release notes - NHibernate - Version 5.0.5
+
+** Bug
+    * #1665 Have IFutureEnumerable.GetEnumerable executing immediatly the query
+
+Build 5.0.4
 =============================
 
 Release notes - NHibernate - Version 5.0.4

src/NHibernate.Test/Async/Futures/FutureQueryFixture.cs

@@ -152,5 +152,25 @@ public async Task CanExecuteMultipleQueryWithSameParameterNameAsync()
 				}
 			}
 		}
+
+		[Test]
+		public async Task FutureExecutedOnGetEnumerableAsync()
+		{
+			Sfi.Statistics.IsStatisticsEnabled = true;
+			try
+			{
+				using (var s = Sfi.OpenSession())
+				{
+					var persons = s.CreateQuery("from Person").Future<Person>();
+					Sfi.Statistics.Clear();
+					await (persons.GetEnumerableAsync());
+					Assert.That(Sfi.Statistics.PrepareStatementCount, Is.EqualTo(1));
+				}
+			}
+			finally
+			{
+				Sfi.Statistics.IsStatisticsEnabled = false;
+			}
+		}
 	}
 }

src/NHibernate.Test/Futures/FutureQueryFixture.cs

@@ -141,5 +141,25 @@ public void CanExecuteMultipleQueryWithSameParameterName()
 				}
 			}
 		}
+
+		[Test]
+		public void FutureExecutedOnGetEnumerable()
+		{
+			Sfi.Statistics.IsStatisticsEnabled = true;
+			try
+			{
+				using (var s = Sfi.OpenSession())
+				{
+					var persons = s.CreateQuery("from Person").Future<Person>();
+					Sfi.Statistics.Clear();
+					persons.GetEnumerable();
+					Assert.That(Sfi.Statistics.PrepareStatementCount, Is.EqualTo(1));
+				}
+			}
+			finally
+			{
+				Sfi.Statistics.IsStatisticsEnabled = false;
+			}
+		}
 	}
 }

src/NHibernate/Impl/DelayedEnumerator.cs

@@ -25,11 +25,7 @@ public DelayedEnumerator(GetResult result, GetResultAsync resultAsync)
 
 		public IEnumerable<T> GetEnumerable()
 		{
-			var value = _result();
-			foreach (T item in value)
-			{
-				yield return item;
-			}
+			return _result();
 		}
 
 		// Remove in 6.0