Disable implicit join generation for implied entity joins

Author: bahusoid

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

@@ -37,9 +37,9 @@ public async Task BugAsync()
 					var message = ls.GetWholeLog();
 					var paramFormatter = (ISqlParameterFormatter)Sfi.ConnectionProvider.Driver;
 					Assert.That(message, Does.Contain(
-						"xchild0_.ParentId=xparent1_.Id and (" +
-						$"{paramFormatter.GetParameterName(0)}={Dialect.ToBooleanValueString(true)} or " +
-						$"xparent1_.A<{paramFormatter.GetParameterName(1)})"));
+						"on xchild0_.ParentId=xparent1_.Id").And.Contain(
+						$"where {paramFormatter.GetParameterName(0)}={Dialect.ToBooleanValueString(true)} or " +
+						$"xparent1_.A<{paramFormatter.GetParameterName(1)};"));
 				}
 			}
 		}

src/NHibernate.Test/NHSpecificTest/NH1444/Fixture.cs

@@ -26,9 +26,9 @@ public void Bug()
 					var message = ls.GetWholeLog();
 					var paramFormatter = (ISqlParameterFormatter)Sfi.ConnectionProvider.Driver;
 					Assert.That(message, Does.Contain(
-						"xchild0_.ParentId=xparent1_.Id and (" +
-						$"{paramFormatter.GetParameterName(0)}={Dialect.ToBooleanValueString(true)} or " +
-						$"xparent1_.A<{paramFormatter.GetParameterName(1)})"));
+						"on xchild0_.ParentId=xparent1_.Id").And.Contain(
+						$"where {paramFormatter.GetParameterName(0)}={Dialect.ToBooleanValueString(true)} or " +
+						$"xparent1_.A<{paramFormatter.GetParameterName(1)};"));
 				}
 			}
 		}

src/NHibernate/Hql/Ast/ANTLR/SessionFactoryHelperExtensions.cs

@@ -319,7 +319,7 @@ public JoinSequence CreateCollectionJoinSequence(IQueryableCollection collPersis
 		{
 			JoinSequence joinSequence = CreateJoinSequence();
 			joinSequence.SetRoot(collPersister, collectionName);
-			joinSequence.SetUseThetaStyle(true);		// TODO: figure out how this should be set.
+			joinSequence.SetUseThetaStyle(false);		// TODO: figure out how this should be set.
 
 			///////////////////////////////////////////////////////////////////////////////
 			// This was the reason for failures regarding INDEX_OP and subclass joins on

src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs

@@ -519,7 +519,7 @@ private void DereferenceEntityJoin(string classAlias, EntityType propertyType, b
 				// If this is an implied join in a from element, then use the impled join type which is part of the
 				// tree parser's state (set by the gramamar actions).
 				JoinSequence joinSequence = SessionFactoryHelper
-					.CreateJoinSequence( impliedJoin, propertyType, tableAlias, _joinType, joinColumns );
+					.CreateJoinSequence(false, propertyType, tableAlias, _joinType, joinColumns);
 
 				var factory = new FromElementFactory(
 						currentFromClause,

src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementFactory.cs

@@ -122,6 +122,10 @@ private FromElement CreateFromElementInSubselect(
 
 			string tableAlias = correlatedSubselect ? fromElement.TableAlias : null;
 
+			//To properly generete subselect implicit join is required by SqlGenerator
+			if (fromElement.IsImplied)
+				fromElement.JoinSequence.SetUseThetaStyle(true);
+
 			// If the from element isn't in the same clause, create a new from element.
 			if (fromElement.FromClause != _fromClause)
 			{
@@ -190,17 +194,20 @@ public FromElement CreateCollection(IQueryableCollection queryableCollection,
 			{
 				// A collection of entities...
 				elem = CreateEntityAssociation(role, roleAlias, joinType);
+				//TODO: Investigate why not implicit indexed join is incorrectly generated and get rid of it
+				if (indexed && elem.IsImplied)
+					elem.JoinSequence.SetUseThetaStyle(true);
 			}
 			else if (elementType.IsComponentType)
 			{
 				// A collection of components...
-				JoinSequence joinSequence = CreateJoinSequence(roleAlias, joinType);
+				JoinSequence joinSequence = CreateJoinSequence(roleAlias, joinType, indexed);
 				elem = CreateCollectionJoin(joinSequence, roleAlias);
 			}
 			else
 			{
 				// A collection of scalar elements...
-				JoinSequence joinSequence = CreateJoinSequence(roleAlias, joinType);
+				JoinSequence joinSequence = CreateJoinSequence(roleAlias, joinType, indexed);
 				elem = CreateCollectionJoin(joinSequence, roleAlias);
 			}
 
@@ -429,15 +436,16 @@ private FromElement CreateManyToMany(
 			return elem;
 		}
 
-		private JoinSequence CreateJoinSequence(string roleAlias, JoinType joinType)
+		//TODO: Investigate why not implicit indexed join is incorrectly generated and get rid of implicitJoin parameter
+		private JoinSequence CreateJoinSequence(string roleAlias, JoinType joinType, bool implicitJoin = false)
 		{
 			SessionFactoryHelperExtensions sessionFactoryHelper = _fromClause.SessionFactoryHelper;
 			string[] joinColumns = Columns;
 			if (_collectionType == null)
 			{
 				throw new InvalidOperationException("collectionType is null!");
 			}
-			return sessionFactoryHelper.CreateJoinSequence(_implied, _collectionType, roleAlias, joinType, joinColumns);
+			return sessionFactoryHelper.CreateJoinSequence(implicitJoin, _collectionType, roleAlias, joinType, joinColumns);
 		}
 
 		private FromElement CreateJoin(

src/NHibernate/Hql/CollectionSubqueryFactory.cs

@@ -3,7 +3,6 @@
 using System.Text;
 using NHibernate.Engine;
 using NHibernate.SqlCommand;
-using NHibernate.Util;
 
 namespace NHibernate.Hql
 {
@@ -16,6 +15,7 @@ public static string CreateCollectionSubquery(
 		{
 			try
 			{
+				joinSequence.SetUseThetaStyle(true);
 				JoinFragment join = joinSequence.ToJoinFragment(enabledFilters, true);
 				return new StringBuilder()
 					.Append("select ")