HHH-18494 Always use standard table group in result builder entity

Also ignore placeholder aliases for to-one properties using join-tables, and use the target column name instead

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java

@@ -26,7 +26,6 @@
 import org.hibernate.query.results.DomainResultCreationStateImpl;
 import org.hibernate.query.results.FetchBuilder;
 import org.hibernate.query.results.ResultsHelper;
-import org.hibernate.query.results.TableGroupImpl;
 import org.hibernate.query.results.complete.CompleteFetchBuilder;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.FromClauseAccess;
@@ -194,15 +193,17 @@ private <T> T buildResultOrFetch(
 		final TableGroup tableGroup = fromClauseAccess.resolveTableGroup(
 				elementNavigablePath,
 				np -> {
-					final TableReference tableReference = entityMapping.createPrimaryTableReference(
-							new SqlAliasBaseConstant( tableAlias ),
-							creationState
-					);
-
 					if ( lockMode != null ) {
 						domainResultCreationState.getSqlAstCreationState().registerLockMode( tableAlias, lockMode );
 					}
-					return new TableGroupImpl( elementNavigablePath, tableAlias, tableReference, entityMapping );
+					return entityMapping.createRootTableGroup(
+							true,
+							navigablePath,
+							tableAlias,
+							new SqlAliasBaseConstant( tableAlias ),
+							null,
+							creationState
+					);
 				}
 		);
 		final TableReference tableReference = tableGroup.getPrimaryTableReference();

hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java

@@ -23,6 +23,7 @@
 import org.hibernate.loader.internal.AliasConstantsHelper;
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.mapping.EntityMappingType;
+import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.NativeQuery;
@@ -393,6 +394,17 @@ else if ( propertyType instanceof ComponentType ) {
 			resultBuilderEntity.addFetchBuilder( propertyName, fetchBuilder );
 		}
 		else if ( columnAliases.length != 0 ) {
+			if ( propertyType instanceof EntityType ) {
+				final ToOneAttributeMapping toOne = (ToOneAttributeMapping) loadable.findAttributeMapping( propertyName );
+				if ( !toOne.getIdentifyingColumnsTableExpression().equals( loadable.getTableName() ) ) {
+					// The to-one has a join-table, use the plain join column name instead of the alias
+					assert columnAliases.length == 1;
+					final String[] targetAliases = new String[1];
+					targetAliases[0] = toOne.getTargetKeyPropertyName();
+					resultBuilderEntity.addProperty( propertyName, targetAliases );
+					return;
+				}
+			}
 			resultBuilderEntity.addProperty( propertyName, columnAliases );
 		}
 	}