Fix optional join optimistic lock handling

src/NHibernate.Test/Async/NHSpecificTest/GH1235/OptionalJoinFixture.cs

@@ -0,0 +1,198 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+using NUnit.Framework.Constraints;
+using NHibernate.Linq;
+
+namespace NHibernate.Test.NHSpecificTest.GH1235
+{
+	using System.Threading.Tasks;
+	//NH-2785
+	[TestFixture(OptimisticLockMode.None)]
+	[TestFixture(OptimisticLockMode.Version)]
+	[TestFixture(OptimisticLockMode.Dirty)]
+	public class OptionalJoinFixtureAsync : TestCaseMappingByCode
+	{
+		private readonly OptimisticLockMode _optimisticLock;
+
+		public OptionalJoinFixtureAsync(OptimisticLockMode optimisticLock)
+		{
+			_optimisticLock = optimisticLock;
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (Dialect.SupportsTemporaryTables)
+					session.CreateQuery("delete from System.Object").ExecuteUpdate();
+				else
+					session.Delete("from System.Object");
+
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public async Task UpdateNullOptionalJoinToNotNullAsync()
+		{
+			object id;
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = new MultiTableEntity { Name = "Bob" };
+				id = await (s.SaveAsync(entity));
+				await (t.CommitAsync());
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var e = await (s.GetAsync<MultiTableEntity>(id));
+				e.OtherName = "Sally";
+				await (t.CommitAsync());
+			}
+
+			using (var s = OpenSession())
+			{
+				var e = await (s.GetAsync<MultiTableEntity>(id));
+				Assert.That(e.OtherName, Is.EqualTo("Sally"));
+			}
+		}
+
+		[Test]
+		public async Task UpdateNullOptionalJoinToNotNullDetachedAsync()
+		{
+			object id;
+			MultiTableEntity entity;
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				entity = new MultiTableEntity { Name = "Bob" };
+				id = await (s.SaveAsync(entity));
+				await (t.CommitAsync());
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				entity.OtherName = "Sally";
+				await (s.UpdateAsync(entity));
+				await (t.CommitAsync());
+			}
+
+			using (var s = OpenSession())
+			{
+				var e = await (s.GetAsync<MultiTableEntity>(id));
+				Assert.That(e.OtherName, Is.EqualTo("Sally"));
+			}
+		}
+
+		[Test]
+		public async Task ShouldThrowStaleStateForOptimisticLockUpdateAsync()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var result = new MultiTableEntity { Name = "Bob", OtherName = "Bob" };
+				await (s.SaveAsync(result));
+				await (t.CommitAsync());
+			}
+
+			using (var s1 = OpenSession())
+			using (var t1 = s1.BeginTransaction())
+			{
+				var result = await (s1.Query<MultiTableEntity>().FirstOrDefaultAsync());
+
+				result.OtherName += "x";
+				using (var s2 = OpenSession())
+				{
+					var result2 = await (s2.Query<MultiTableEntity>().FirstOrDefaultAsync());
+					result2.OtherName += "y";
+					await (t1.CommitAsync());
+
+					using (var t2 = s2.BeginTransaction())
+						Assert.That(
+							() => t2.CommitAsync(),
+							_optimisticLock == OptimisticLockMode.None
+								? (IResolveConstraint) Throws.Nothing
+								: Throws.InstanceOf<StaleObjectStateException>());
+				}
+			}
+		}
+
+		[Test]
+		public async Task ShouldThrowStaleStateForOptimisticLockDeleteAsync()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var result = new MultiTableEntity { Name = "Bob", OtherName = "Bob" };
+				await (s.SaveAsync(result));
+				await (t.CommitAsync());
+			}
+
+			using (var s1 = OpenSession())
+			using (var t1 = s1.BeginTransaction())
+			{
+				var result = await (s1.Query<MultiTableEntity>().FirstOrDefaultAsync());
+
+				result.OtherName += "x";
+				using (var s2 = OpenSession())
+				{
+					var result2 = await (s2.Query<MultiTableEntity>().FirstOrDefaultAsync());
+					await (s2.DeleteAsync(result2));
+					await (t1.CommitAsync());
+
+					using (var t2 = s2.BeginTransaction())
+						Assert.That(
+							() => t2.CommitAsync(),
+							_optimisticLock == OptimisticLockMode.None
+								? (IResolveConstraint) Throws.Nothing
+								: Throws.InstanceOf<StaleObjectStateException>());
+				}
+			}
+		}
+
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<MultiTableEntity>(
+				rc =>
+				{
+					rc.Id(x => x.Id, m => m.Generator(Generators.Native));
+					rc.DynamicUpdate(true);
+					rc.OptimisticLock(_optimisticLock);
+
+					if (_optimisticLock == OptimisticLockMode.Version)
+						rc.Version(x => x.Version, _ => { });
+
+					rc.Property(x => x.Name);
+					rc.Join(
+						"SecondTable",
+						m =>
+						{
+							m.Key(k => k.Column("Id"));
+							m.Property(x => x.OtherName);
+							m.Optional(true);
+						});
+				});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+	}
+}

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

@@ -0,0 +1,12 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.GH1235
+{
+	class MultiTableEntity
+	{
+		public virtual int Id { get; set; }
+		public virtual int Version { get; set; }
+		public virtual string Name { get; set; }
+		public virtual string OtherName { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH1235/OptionalJoinFixture.cs

@@ -0,0 +1,186 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+using NUnit.Framework.Constraints;
+
+namespace NHibernate.Test.NHSpecificTest.GH1235
+{
+	//NH-2785
+	[TestFixture(OptimisticLockMode.None)]
+	[TestFixture(OptimisticLockMode.Version)]
+	[TestFixture(OptimisticLockMode.Dirty)]
+	public class OptionalJoinFixture : TestCaseMappingByCode
+	{
+		private readonly OptimisticLockMode _optimisticLock;
+
+		public OptionalJoinFixture(OptimisticLockMode optimisticLock)
+		{
+			_optimisticLock = optimisticLock;
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (Dialect.SupportsTemporaryTables)
+					session.CreateQuery("delete from System.Object").ExecuteUpdate();
+				else
+					session.Delete("from System.Object");
+
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void UpdateNullOptionalJoinToNotNull()
+		{
+			object id;
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = new MultiTableEntity { Name = "Bob" };
+				id = s.Save(entity);
+				t.Commit();
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var e = s.Get<MultiTableEntity>(id);
+				e.OtherName = "Sally";
+				t.Commit();
+			}
+
+			using (var s = OpenSession())
+			{
+				var e = s.Get<MultiTableEntity>(id);
+				Assert.That(e.OtherName, Is.EqualTo("Sally"));
+			}
+		}
+
+		[Test]
+		public void UpdateNullOptionalJoinToNotNullDetached()
+		{
+			object id;
+			MultiTableEntity entity;
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				entity = new MultiTableEntity { Name = "Bob" };
+				id = s.Save(entity);
+				t.Commit();
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				entity.OtherName = "Sally";
+				s.Update(entity);
+				t.Commit();
+			}
+
+			using (var s = OpenSession())
+			{
+				var e = s.Get<MultiTableEntity>(id);
+				Assert.That(e.OtherName, Is.EqualTo("Sally"));
+			}
+		}
+
+		[Test]
+		public void ShouldThrowStaleStateForOptimisticLockUpdate()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var result = new MultiTableEntity { Name = "Bob", OtherName = "Bob" };
+				s.Save(result);
+				t.Commit();
+			}
+
+			using (var s1 = OpenSession())
+			using (var t1 = s1.BeginTransaction())
+			{
+				var result = s1.Query<MultiTableEntity>().FirstOrDefault();
+
+				result.OtherName += "x";
+				using (var s2 = OpenSession())
+				{
+					var result2 = s2.Query<MultiTableEntity>().FirstOrDefault();
+					result2.OtherName += "y";
+					t1.Commit();
+
+					using (var t2 = s2.BeginTransaction())
+						Assert.That(
+							() => t2.Commit(),
+							_optimisticLock == OptimisticLockMode.None
+								? (IResolveConstraint) Throws.Nothing
+								: Throws.InstanceOf<StaleObjectStateException>());
+				}
+			}
+		}
+
+		[Test]
+		public void ShouldThrowStaleStateForOptimisticLockDelete()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var result = new MultiTableEntity { Name = "Bob", OtherName = "Bob" };
+				s.Save(result);
+				t.Commit();
+			}
+
+			using (var s1 = OpenSession())
+			using (var t1 = s1.BeginTransaction())
+			{
+				var result = s1.Query<MultiTableEntity>().FirstOrDefault();
+
+				result.OtherName += "x";
+				using (var s2 = OpenSession())
+				{
+					var result2 = s2.Query<MultiTableEntity>().FirstOrDefault();
+					s2.Delete(result2);
+					t1.Commit();
+
+					using (var t2 = s2.BeginTransaction())
+						Assert.That(
+							() => t2.Commit(),
+							_optimisticLock == OptimisticLockMode.None
+								? (IResolveConstraint) Throws.Nothing
+								: Throws.InstanceOf<StaleObjectStateException>());
+				}
+			}
+		}
+
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<MultiTableEntity>(
+				rc =>
+				{
+					rc.Id(x => x.Id, m => m.Generator(Generators.Native));
+					rc.DynamicUpdate(true);
+					rc.OptimisticLock(_optimisticLock);
+
+					if (_optimisticLock == OptimisticLockMode.Version)
+						rc.Version(x => x.Version, _ => { });
+
+					rc.Property(x => x.Name);
+					rc.Join(
+						"SecondTable",
+						m =>
+						{
+							m.Key(k => k.Column("Id"));
+							m.Property(x => x.OtherName);
+							m.Optional(true);
+						});
+				});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+	}
+}