Code review changes

Author: maca88

src/NHibernate.Test/Async/FetchLazyProperties/FetchLazyPropertiesFixture.cs

@@ -948,6 +948,11 @@ public async Task TestFetchAfterEntityIsInitializedAsync(bool readOnly)
 		[Test]
 		public async Task TestHqlCrossJoinFetchFormulaAsync()
 		{
+			if (!Dialect.SupportsCrossJoin)
+			{
+				Assert.Ignore("Dialect does not support cross join.");
+			}
+
 			var persons = new List<Person>();
 			var bestFriends = new List<Person>();
 			using (var sqlSpy = new SqlLogSpy())

src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs

@@ -1065,8 +1065,8 @@ join c in db.Customers on
 				await (ObjectDumper.WriteAsync(q));
 
 				var sql = sqlSpy.GetWholeLog();
-				Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(1));
-				Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(1));
+				Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(0));
+				Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(2));
 			}
 		}
 

src/NHibernate.Test/FetchLazyProperties/FetchLazyPropertiesFixture.cs

@@ -937,6 +937,11 @@ public void TestFetchAfterEntityIsInitialized(bool readOnly)
 		[Test]
 		public void TestHqlCrossJoinFetchFormula()
 		{
+			if (!Dialect.SupportsCrossJoin)
+			{
+				Assert.Ignore("Dialect does not support cross join.");
+			}
+
 			var persons = new List<Person>();
 			var bestFriends = new List<Person>();
 			using (var sqlSpy = new SqlLogSpy())

src/NHibernate.Test/Linq/LinqQuerySamples.cs

@@ -1609,8 +1609,8 @@ join c in db.Customers on
 				ObjectDumper.Write(q);
 
 				var sql = sqlSpy.GetWholeLog();
-				Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(1));
-				Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(1));
+				Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(0));
+				Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(2));
 			}
 		}
 

src/NHibernate/Linq/ReWriters/AddJoinsReWriter.cs

@@ -20,7 +20,6 @@ public class AddJoinsReWriter : NhQueryModelVisitorBase, IIsEntityDecider
 		private readonly ISessionFactoryImplementor _sessionFactory;
 		private readonly MemberExpressionJoinDetector _memberExpressionJoinDetector;
 		private readonly WhereJoinDetector _whereJoinDetector;
-		private int? _joinInsertIndex;
 		private JoinClause _currentJoin;
 
 		private AddJoinsReWriter(ISessionFactoryImplementor sessionFactory, QueryModel queryModel)
@@ -72,13 +71,11 @@ private void VisitJoinClause(JoinClause joinClause, QueryModel queryModel, IBody
 			joinClause.InnerSequence = _whereJoinDetector.Transform(joinClause.InnerSequence);
 
 			// When associations are located in the outer key (e.g. from a in A join b in B b on a.C.D.Id equals b.Id),
-			// we have to insert the association join before the current join in order to produce a valid query.
-			_joinInsertIndex = queryModel.BodyClauses.IndexOf(bodyClause);
-			joinClause.OuterKeySelector = _whereJoinDetector.Transform(joinClause.OuterKeySelector);
-			_joinInsertIndex = null;
+			// do nothing and leave them to HQL for adding the missing joins.
 
 			// When associations are located in the inner key (e.g. from a in A join b in B b on a.Id equals b.C.D.Id),
-			// we have to move the condition to the where statement, otherwise the query will be invalid.
+			// we have to move the condition to the where statement, otherwise the query will be invalid (HQL does not
+			// support them).
 			// Link newly created joins with the current join clause in order to later detect which join type to use.
 			_currentJoin = joinClause;
 			joinClause.InnerKeySelector = _whereJoinDetector.Transform(joinClause.InnerKeySelector);
@@ -99,15 +96,7 @@ public bool IsIdentifier(System.Type type, string propertyName)
 		private void AddJoin(QueryModel queryModel, NhJoinClause joinClause)
 		{
 			joinClause.ParentJoinClause = _currentJoin;
-			if (_joinInsertIndex.HasValue)
-			{
-				queryModel.BodyClauses.Insert(_joinInsertIndex.Value, joinClause);
-				_joinInsertIndex++;
-			}
-			else
-			{
-				queryModel.BodyClauses.Add(joinClause);
-			}
+			queryModel.BodyClauses.Add(joinClause);
 		}
 	}
 }