async regen

Author: bahusoid

src/NHibernate.Test/Async/Criteria/EntityJoinCriteriaTest.cs

@@ -48,6 +48,25 @@ public async Task CanJoinNotAssociatedEntityAsync()
 			}
 		}
 
+		//check JoinEntityAlias - JoinAlias analog for entity join
+		[Test]
+		public async Task CanJoinNotAssociatedEntity_ExpressionAsync()
+		{
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntityComplex entityComplex = null;
+				EntityWithNoAssociation root = null;
+				root = await (session.QueryOver(() => root)
+						.JoinEntityAlias(() => entityComplex, () => root.Complex1Id == entityComplex.Id).Take(1)
+						.SingleOrDefaultAsync());
+				entityComplex = await (session.LoadAsync<EntityComplex>(root.Complex1Id));
+
+				Assert.That(NHibernateUtil.IsInitialized(entityComplex), Is.True);
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+			}
+		}
+		
 		//check JoinEntityQueryOver - JoinQueryOver analog for entity join
 		[Test]
 		public async Task CanJoinEntityQueryOverAsync()
@@ -254,6 +273,61 @@ public async Task EntityJoinForCustomEntityNameAsync()
 			}
 		}
 
+		[Test]
+		public async Task EntityJoinFoSubquery_JoinEntityAliasAsync()
+		{
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntityComplex ej = null;
+				EntityWithNoAssociation root = null;
+
+				EntityComplex ejSub = null;
+				EntityWithNoAssociation rootSub = null;
+
+				var subquery = QueryOver.Of<EntityWithNoAssociation>(() => rootSub)
+										.JoinEntityAlias(() => ejSub, () => rootSub.Complex1Id == ejSub.Id)
+										.Where(r => ejSub.Name == ej.Name)
+										.Select(x => ejSub.Id);
+
+				root = await (session.QueryOver(() => root)
+							.JoinEntityAlias(() => ej, Restrictions.Where(() => root.Complex1Id == ej.Id))
+							.WithSubquery.WhereExists(subquery)
+							.SingleOrDefaultAsync());
+				ej = await (session.LoadAsync<EntityComplex>(root.Complex1Id));
+
+				Assert.That(NHibernateUtil.IsInitialized(ej), Is.True);
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+			}
+		}
+		
+		[Test]
+		public async Task EntityJoinFoSubquery_JoinQueryOverAsync()
+		{
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntityComplex ej = null;
+				EntityWithNoAssociation root = null;
+
+				EntityComplex ejSub = null;
+				EntityWithNoAssociation rootSub = null;
+
+				var subquery = QueryOver.Of<EntityWithNoAssociation>(() => rootSub)
+										.JoinEntityQueryOver(() => ejSub, () => rootSub.Complex1Id == ejSub.Id)
+										.Where(x => x.Name == ej.Name)
+										.Select(x => ejSub.Id);
+
+				root = await (session.QueryOver(() => root)
+							.JoinEntityAlias(() => ej, Restrictions.Where(() => root.Complex1Id == ej.Id))
+							.WithSubquery.WhereExists(subquery)
+							.SingleOrDefaultAsync());
+				ej = await (session.LoadAsync<EntityComplex>(root.Complex1Id));
+
+				Assert.That(NHibernateUtil.IsInitialized(ej), Is.True);
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+			}
+		}
 		#region Test Setup
 
 		protected override HbmMapping GetMappings()

src/NHibernate/Loader/OuterJoinableAssociation.cs

@@ -156,12 +156,12 @@ public void AddManyToManyJoin(JoinFragment outerjoin, IQueryableCollection colle
 			string manyToManyFilter = collection.GetManyToManyFilterFragment(rhsAlias, enabledFilters);
 			SqlString condition = string.Empty.Equals(manyToManyFilter)
 								? on
-								: SqlStringHelper.IsEmpty(on) ? new SqlString(manyToManyFilter) :
+								: SqlStringHelper.IsEmpty(on) ? new SqlString(manyToManyFilter) : 
 									on.Append(" and ").Append(manyToManyFilter);
 
 			outerjoin.AddJoin(joinable.TableName, rhsAlias, lhsColumns, rhsColumns, joinType, condition);
 			outerjoin.AddJoins(joinable.FromJoinFragment(rhsAlias, false, true),
 							   joinable.WhereJoinFragment(rhsAlias, false, true));
 		}
 	}
-}
+}

src/NHibernate/SqlCommand/ANSIJoinFragment.cs

@@ -1,4 +1,3 @@
-using NHibernate.Linq;
 using NHibernate.Util;
 
 namespace NHibernate.SqlCommand