Merge pull request #409 from nhibernate/NH-3583

NH-3583 - Fix AutoFlush inside TransactionScope

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH3583/AutoFlushFixture.cs

@@ -0,0 +1,69 @@
+using System.Linq;
+using System.Transactions;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Linq;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3583
+{
+	public class AutoFlushFixture : TestCaseMappingByCode
+	{
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<Entity>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+				rc.Property(x => x.Name);
+			});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void ShouldAutoFlushWhenInExplicitTransaction()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var e1 = new Entity { Name = "Bob" };
+				session.Save(e1);
+
+				var result = (from e in session.Query<Entity>()
+							  where e.Name == "Bob"
+							  select e).ToList();
+
+				Assert.That(result.Count, Is.EqualTo(1));
+			}
+		}
+		[Test]
+		public void ShouldAutoFlushWhenInDistributedTransaction()
+		{
+			using (new TransactionScope())
+			using (var session = OpenSession())
+			{
+				var e1 = new Entity { Name = "Bob" };
+				session.Save(e1);
+
+				var result = (from e in session.Query<Entity>()
+							  where e.Name == "Bob"
+							  select e).ToList();
+
+				Assert.That(result.Count, Is.EqualTo(1));
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3583/Entity.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH3583
+{
+	class Entity
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -715,6 +715,8 @@
     <Compile Include="NHSpecificTest\BagWithLazyExtraAndFilter\Fixture.cs" />
     <Compile Include="Linq\ByMethod\DistinctTests.cs" />
     <Compile Include="Component\Basic\ComponentWithUniqueConstraintTests.cs" />
+    <Compile Include="NHSpecificTest\NH3583\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH3583\AutoFlushFixture.cs" />
     <Compile Include="NHSpecificTest\NH3372\Entity.cs" />
     <Compile Include="NHSpecificTest\NH3372\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3453\Classes.cs" />

src/NHibernate/Impl/SessionImpl.cs

@@ -1124,7 +1124,7 @@ private bool AutoFlushIfRequired(ISet<string> querySpaces)
 			using (new SessionIdLoggingContext(SessionId))
 			{
 				CheckAndUpdateSessionStatus();
-				if (!TransactionInProgress)
+				if (!ConnectionManager.IsInActiveTransaction)
 				{
 					// do not auto-flush while outside a transaction
 					return false;
@@ -1467,10 +1467,7 @@ public override void Flush()
 
 		public override bool TransactionInProgress
 		{
-			get
-			{
-				return !IsClosed && Transaction.IsActive;
-			}
+			get { return ConnectionManager.IsInActiveTransaction; }
 		}
 
 		public bool IsDirty()