HHH-18629 Fix inconsistent column alias generated while result class …

…is used for placeholder
hibernate · Sep 18, 2024 · 6b4ba43 · 6b4ba43
1 parent 0684c6e
commit 6b4ba43
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
@@ -969,7 +969,8 @@ else if ( List.class.equals( resultClass ) ) {
 			query.setTupleTransformer( NativeQueryListTransformer.INSTANCE );
 		}
 		else if ( getFactory().getMappingMetamodel().isEntityClass( resultClass ) ) {
-			query.addEntity( resultClass, LockMode.READ );
+			// use null as tableAlias to identify it as implicit
+			query.addEntity( null, resultClass, LockMode.READ );
 		}
 		else if ( resultClass != Object.class && resultClass != Object[].class ) {
 			if ( isClass( resultClass ) && !hasJavaTypeDescriptor( resultClass ) ) {

diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java
@@ -77,6 +77,11 @@ public interface ResultSetMapping extends JdbcValuesMappingProducer {
 	 */
 	void addResultBuilder(ResultBuilder resultBuilder);
 
+	/**
+	 * Remove a builder
+	 */
+	void removeResultBuilder(ResultBuilder resultBuilder);
+
 	/**
 	 * Add a legacy fetch builder
 	 */

diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMappingImpl.java
@@ -137,6 +137,11 @@ public void addResultBuilder(ResultBuilder resultBuilder) {
 		resultBuilders.add( resultBuilder );
 	}
 
+	@Override
+	public void removeResultBuilder(ResultBuilder resultBuilder) {
+		resultBuilders.remove( resultBuilder );
+	}
+
 	@Override
 	public void addLegacyFetchBuilder(DynamicFetchBuilderLegacy fetchBuilder) {
 		final Map<String, DynamicFetchBuilderLegacy> existingFetchBuildersByOwner;

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java
@@ -942,6 +942,23 @@ public NativeQueryImplementor<R> addScalar(int position, Class<?> type) {
 	}
 
 	protected NativeQueryImplementor<R> registerBuilder(ResultBuilder builder) {
+		// remove implicit ResultBuilder if explicit one provided
+		if ( builder instanceof DynamicResultBuilderEntityCalculated dynamicBuilder ) {
+			ResultBuilder implicitResultBuilder = null;
+			for ( ResultBuilder existing : resultSetMapping.getResultBuilders() ) {
+				if ( existing instanceof DynamicResultBuilderEntityCalculated existingDynamicBuilder ) {
+					if ( existingDynamicBuilder.getTableAlias() == null // implicit one doesn't have tableAlias
+							&& existingDynamicBuilder.getNavigablePath().equals( dynamicBuilder.getNavigablePath() )
+							&& existingDynamicBuilder.getEntityMapping().equals( dynamicBuilder.getEntityMapping() ) ) {
+						implicitResultBuilder = existingDynamicBuilder;
+						break;
+					}
+				}
+			}
+			if ( implicitResultBuilder != null ) {
+				resultSetMapping.removeResultBuilder( implicitResultBuilder );
+			}
+		}
 		resultSetMapping.addResultBuilder( builder );
 		return this;
 	}