Merge pull request #318 from rjperes/NH-3575

NH-3575

Author: oskarb

src/NHibernate.Test/NHSpecificTest/Futures/FutureCriteriaFixture.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using NHibernate.Criterion;
 using NHibernate.Impl;
 using NUnit.Framework;
@@ -7,6 +8,20 @@ namespace NHibernate.Test.NHSpecificTest.Futures
     [TestFixture]
     public class FutureCriteriaFixture : FutureFixture
     {
+		[Test]
+		public void DefaultReadOnlyTest()
+		{
+			//NH-3575
+			using (var s = sessions.OpenSession())
+			{
+				s.DefaultReadOnly = true;
+
+				var persons = s.CreateCriteria(typeof(Person)).Future<Person>();
+
+				Assert.IsTrue(persons.All(p => s.IsReadOnly(p)));
+			}
+		}
+
         [Test]
         public void CanUseFutureCriteria()
         {

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

@@ -1,4 +1,5 @@
-using NHibernate.Driver;
+using System.Linq;
+using NHibernate.Driver;
 using NHibernate.Impl;
 using NUnit.Framework;
 
@@ -9,6 +10,20 @@ namespace NHibernate.Test.NHSpecificTest.Futures
     [TestFixture]
     public class FutureQueryFixture : FutureFixture
     {
+		[Test]
+		public void DefaultReadOnlyTest()
+		{
+			//NH-3575
+			using (var s = sessions.OpenSession())
+			{
+				s.DefaultReadOnly = true;
+
+				var persons = s.CreateQuery("from Person").Future<Person>();
+
+				Assert.IsTrue(persons.All(p => s.IsReadOnly(p)));
+			}
+		}
+
         [Test]
         public void CanUseFutureQuery()
         {

src/NHibernate.Test/NHSpecificTest/Futures/FutureQueryOverFixture.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using NHibernate.Criterion;
 using NHibernate.Impl;
 using NUnit.Framework;
@@ -30,6 +31,20 @@ protected override void OnTearDown()
 			}
 		}
 
+		[Test]
+		public void DefaultReadOnlyTest()
+		{
+			//NH-3575
+			using (var s = sessions.OpenSession())
+			{
+				s.DefaultReadOnly = true;
+
+				var persons = s.QueryOver<Person>().Future<Person>();
+
+				Assert.IsTrue(persons.All(p => s.IsReadOnly(p)));
+			}
+		}
+
 		[Test]
 		public void CanUseFutureCriteria()
 		{

src/NHibernate.Test/NHSpecificTest/Futures/LinqFutureFixture.cs

@@ -8,6 +8,20 @@ namespace NHibernate.Test.NHSpecificTest.Futures
 	[TestFixture]
 	public class LinqFutureFixture : FutureFixture
 	{
+		[Test]
+		public void DefaultReadOnlyTest()
+		{
+			//NH-3575
+			using (var s = sessions.OpenSession())
+			{
+				s.DefaultReadOnly = true;
+
+				var persons = s.Query<Person>().ToFuture();
+
+				Assert.IsTrue(persons.All(p => s.IsReadOnly(p)));
+			}
+		}
+
 		[Test]
 		public void CoalesceShouldWorkForFutures()
 		{

src/NHibernate/Impl/MultiCriteriaImpl.cs

@@ -247,7 +247,7 @@ private void GetResultsFromDatabase(IList results)
 					for (int i = 0; i < loaders.Count; i++)
 					{
 						CriteriaLoader loader = loaders[i];
-						loader.InitializeEntitiesAndCollections(hydratedObjects[i], reader, session, false);
+						loader.InitializeEntitiesAndCollections(hydratedObjects[i], reader, session, session.DefaultReadOnly);
 
 						if (createSubselects[i])
 						{