HHH-19905 Force implicit joins to inner type on creation

Author: mbellade

hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java

@@ -109,6 +109,7 @@ public void consumeIdentifier(String identifier, boolean isBase, boolean isTermi
 			assert delegate != null;
 			delegate.consumeIdentifier(
 					identifier,
+					isTerminal,
 					!nested && isTerminal,
 					// Non-nested joins shall allow reuse, but nested ones (i.e. in treat)
 					// only allow join reuse for non-terminal parts
@@ -254,7 +255,7 @@ else if ( fetch ) {
 	}
 
 	private interface ConsumerDelegate {
-		void consumeIdentifier(String identifier, boolean isTerminal, boolean allowReuse);
+		void consumeIdentifier(String identifier, boolean originallyTerminal, boolean isTerminal, boolean allowReuse);
 		void consumeTreat(String typeName, boolean isTerminal);
 		SemanticPathPart getConsumedPart();
 	}
@@ -282,11 +283,11 @@ private AttributeJoinDelegate(
 		}
 
 		@Override
-		public void consumeIdentifier(String identifier, boolean isTerminal, boolean allowReuse) {
+		public void consumeIdentifier(String identifier, boolean originallyTerminal, boolean isTerminal, boolean allowReuse) {
 			currentPath = createJoin(
 					currentPath,
 					identifier,
-					joinType,
+					originallyTerminal ? joinType : SqmJoinType.INNER,
 					alias,
 					fetch,
 					isTerminal,
@@ -347,11 +348,11 @@ public ExpectingEntityJoinDelegate(
 			this.fetch = fetch;
 			this.alias = alias;
 
-			consumeIdentifier( identifier, isTerminal, true );
+			consumeIdentifier( identifier, isTerminal, isTerminal, true );
 		}
 
 		@Override
-		public void consumeIdentifier(String identifier, boolean isTerminal, boolean allowReuse) {
+		public void consumeIdentifier(String identifier, boolean originallyTerminal, boolean isTerminal, boolean allowReuse) {
 			if ( !path.isEmpty() ) {
 				path.append( '.' );
 			}

hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/JoinFetchElementCollectionTest.java

@@ -58,7 +58,7 @@ public void testJoinFetchesByPath(SessionFactoryScope scope) {
 				session -> {
 					final String qry = "SELECT user "
 							+ "FROM User user "
-							+ "LEFT OUTER JOIN FETCH user.contact "
+							+ "JOIN FETCH user.contact "
 							+ "LEFT OUTER JOIN FETCH user.contact.emailAddresses2 "
 							+ "LEFT OUTER JOIN FETCH user.contact.emailAddresses";
 					User user = (User) session.createQuery( qry ).uniqueResult();

hibernate-core/src/test/java/org/hibernate/orm/test/hql/FunctionNameAsColumnTest.java

@@ -106,7 +106,7 @@ public void testGetMultiColumnSameNameAsArgFunctionHQL(SessionFactoryScope sessi
 		sessionFactory.inTransaction(s -> {
 			EntityWithFunctionAsColumnHolder holder1 = (EntityWithFunctionAsColumnHolder) s.createQuery(
 					"from EntityWithFunctionAsColumnHolder h left join fetch h.entityWithArgFunctionAsColumns " +
-							"left join fetch h.nextHolder left join fetch h.nextHolder.entityWithArgFunctionAsColumns " +
+							"join fetch h.nextHolder left join fetch h.nextHolder.entityWithArgFunctionAsColumns " +
 							"where h.nextHolder is not null" )
 					.uniqueResult();
 			assertTrue( Hibernate.isInitialized( holder1.getEntityWithArgFunctionAsColumns() ) );
@@ -193,7 +193,7 @@ public void testGetMultiColumnSameNameAsNoArgFunctionHQL(SessionFactoryScope fac
 			var hql = """
 					from EntityWithFunctionAsColumnHolder h
 						left join fetch h.entityWithNoArgFunctionAsColumns
-						left join fetch h.nextHolder
+						join fetch h.nextHolder
 						left join fetch h.nextHolder.entityWithNoArgFunctionAsColumns
 					where h.nextHolder is not null
 					""";