Merge branch 'master' into gh2052

Author: hazzik

src/NHibernate.Test/Async/CacheTest/BatchableCacheFixture.cs

@@ -8,6 +8,7 @@
 //------------------------------------------------------------------------------
 
 
+using System.Text.RegularExpressions;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Mapping.ByCode;
 using NHibernate.Test.Hql.EntityJoinHqlTestEntities;
@@ -152,6 +153,67 @@ public async Task EntityJoinFoSubqueryAsync()
 			}
 		}
 
+		[Test]
+		public async Task EntityJoinWithEntityComparisonInWithClausShouldNotAddJoinAsync()
+		{
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntityComplex entityComplex =
+					await (session
+						.CreateQuery(
+							"select ex "
+							+ "from EntityComplex ex "
+							+ "inner join EntityComplex st with st = ex.SameTypeChild "
+						).SetMaxResults(1)
+						.UniqueResultAsync<EntityComplex>());
+
+				Assert.That(Regex.Matches(sqlLog.GetWholeLog(), "EntityComplex").Count, Is.EqualTo(2));
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+			}
+		}
+
+		[Test]
+		public async Task EntityJoinWithEntityAssociationComparisonShouldAddJoinAsync()
+		{
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntityComplex entityComplex =
+					await (session
+						.CreateQuery(
+							"select ex "
+							+ "from EntityComplex ex "
+							+ "inner join EntityComplex st with st = ex.SameTypeChild.SameTypeChild "
+						).SetMaxResults(1)
+						.UniqueResultAsync<EntityComplex>());
+
+				Assert.That(Regex.Matches(sqlLog.GetWholeLog(), "EntityComplex").Count, Is.EqualTo(3));
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+			}
+		}
+
+		[Test]
+		public async Task EntityJoinWithEntityAssociationComparison2ShouldAddJoinAsync()
+		{
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntityComplex entityComplex =
+					await (session
+						.CreateQuery(
+							"select ex "
+							+ "from EntityComplex ex "
+							+ "inner join EntityComplex st with st.Version = ex.SameTypeChild.Version "
+						).SetMaxResults(1)
+						.UniqueResultAsync<EntityComplex>());
+
+				Assert.That(Regex.Matches(sqlLog.GetWholeLog(), "EntityComplex").Count, Is.EqualTo(3));
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+			}
+		}
+
+
 		[Test, Ignore("Failing for unrelated reasons")]
 		public async Task CrossJoinAndWithClauseAsync()
 		{

src/NHibernate.Test/Async/Hql/EntityJoinHqlTest.cs

@@ -0,0 +1,64 @@
+//------------------------------------------------------------------------------
+// <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.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH2053
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class FixtureAsync : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e1 = new Entity { Description = "DESCRIPTION", Status = 0 };
+				session.Save(e1);
+
+				var e2 = new Entity { Description = "DESCRIPTION", Status = 1 };
+				session.Save(e2);
+
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from Entity").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public async Task TestAsync()
+		{
+			var descriptions = new [] { "DESCRIPTION" };
+
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var result = await (session.Query<Entity>()
+				                    .Where(x => descriptions.Contains(x.Description))
+				                    .UpdateAsync(x => new Entity {Description = "DESCRIPTION_UPDATED"}));
+				Assert.That(result, Is.EqualTo(1));
+
+				await (transaction.CommitAsync());
+			}
+		}
+	}
+}

src/NHibernate.Test/Async/NHSpecificTest/GH2053/Fixture.cs

@@ -0,0 +1,82 @@
+//------------------------------------------------------------------------------
+// <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;
+using System.Collections.Generic;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Criterion;
+using NHibernate.Mapping.ByCode;
+using NHibernate.SqlCommand;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1761
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class ByCodeFixtureAsync : TestCaseMappingByCode
+	{
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<FundingCategory>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+				rc.Property(x => x.Name);
+				rc.Bag(x => x.FundingPrograms, m => {}, r => r.OneToMany());
+				
+			});
+			mapper.Class<FundingProgram>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+				rc.ManyToOne(x => x.Recipient);
+				rc.Property(x => x.ObligatedAmount);
+				rc.Bag(x => x.Projects, m => { m.OrderBy("Name asc"); }, r => r.OneToMany());
+			});
+			mapper.Class<Project>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+				rc.ManyToOne(x => x.Recipient);
+				rc.Property(x => x.ObligatedAmount);
+			});
+			mapper.Class<Recipient>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+			});
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		[Test]
+		public async Task InvalidOrderByClauseAsync()
+		{
+			using (var session = OpenSession())
+			{
+				var recipientId = Guid.NewGuid();
+				await (session.CreateCriteria(typeof(FundingCategory), "fc")
+							.CreateCriteria("FundingPrograms", "fp")
+							.CreateCriteria("Projects", "p", JoinType.LeftOuterJoin)
+							.Add(
+								Restrictions.Disjunction()
+											.Add(Restrictions.Eq("fp.Recipient.Id", recipientId))
+											.Add(Restrictions.Eq("p.Recipient.Id", recipientId))
+							)
+							.SetProjection(
+								Projections.ProjectionList()
+											.Add(Projections.GroupProperty("fc.Name"), "fcn")
+											.Add(Projections.Sum("fp.ObligatedAmount"), "fpo")
+											.Add(Projections.Sum("p.ObligatedAmount"), "po")
+							)
+							.AddOrder(Order.Desc("fpo"))
+							.AddOrder(Order.Desc("po"))
+							.AddOrder(Order.Asc("fcn"))
+							.ListAsync<object[]>());
+			}
+		}
+	}
+}