Skip to content

[7.1] HHH-19756 Improve entity sub-part resolution when a treat target type is specified #10923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 12, 2025
Merged

[7.1] HHH-19756 Improve entity sub-part resolution when a treat target type is specified #10923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bc13ee
HHH-19756 Add test for issue
mbellade Sep 10, 2025
a97cfac
HHH-19756 Improve sub-part resolution when specifying a treat type
mbellade Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 45 additions & 50 deletions hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@
import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
import org.hibernate.metamodel.mapping.JdbcMapping;
import org.hibernate.metamodel.mapping.ManagedMappingType;
import org.hibernate.metamodel.mapping.internal.MappingModelHelper;
import org.hibernate.metamodel.mapping.ModelPart;
import org.hibernate.metamodel.mapping.NaturalIdMapping;
import org.hibernate.metamodel.mapping.NonAggregatedIdentifierMapping;
Expand Down Expand Up @@ -304,6 +303,7 @@
import static org.hibernate.internal.util.collections.CollectionHelper.toSmallList;
import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.supportsSqlArrayType;
import static org.hibernate.metamodel.RepresentationMode.POJO;
import static org.hibernate.metamodel.mapping.internal.MappingModelHelper.isCompatibleModelPart;
import static org.hibernate.persister.entity.DiscriminatorHelper.NOT_NULL_DISCRIMINATOR;
import static org.hibernate.persister.entity.DiscriminatorHelper.NULL_DISCRIMINATOR;
import static org.hibernate.pretty.MessageHelper.infoString;
Expand Down Expand Up @@ -5773,50 +5773,30 @@ public ModelPart findSubPart(String name, EntityMappingType treatTargetType) {
}
}

if ( treatTargetType != null ) {
if ( ! treatTargetType.isTypeOrSuperType( this ) ) {
if ( treatTargetType == null ) {
final var subDefinedAttribute = findSubPartInSubclassMappings( name );
if ( subDefinedAttribute != null ) {
return subDefinedAttribute;
}
}
else if ( treatTargetType != this ) {
if ( !treatTargetType.isTypeOrSuperType( this ) ) {
return null;
}

if ( subclassMappingTypes != null && !subclassMappingTypes.isEmpty() ) {
for ( EntityMappingType subMappingType : subclassMappingTypes.values() ) {
if ( ! treatTargetType.isTypeOrSuperType( subMappingType ) ) {
continue;
}

final ModelPart subDefinedAttribute = subMappingType.findSubTypesSubPart( name, treatTargetType );

if ( subDefinedAttribute != null ) {
return subDefinedAttribute;
}
}
// Prefer attributes defined in the treat target type or its subtypes
final var treatTypeSubPart = treatTargetType.findSubTypesSubPart( name, null );
if ( treatTypeSubPart != null ) {
return treatTypeSubPart;
}
}
else {
if ( subclassMappingTypes != null && !subclassMappingTypes.isEmpty() ) {
ModelPart attribute = null;
for ( EntityMappingType subMappingType : subclassMappingTypes.values() ) {
final ModelPart subDefinedAttribute = subMappingType.findSubTypesSubPart( name, treatTargetType );
if ( subDefinedAttribute != null ) {
if ( attribute != null && !MappingModelHelper.isCompatibleModelPart( attribute, subDefinedAttribute ) ) {
throw new PathException(
String.format(
Locale.ROOT,
"Could not resolve attribute '%s' of '%s' due to the attribute being declared in multiple subtypes '%s' and '%s'",
name,
getJavaType().getTypeName(),
attribute.asAttributeMapping().getDeclaringType()
.getJavaType().getTypeName(),
subDefinedAttribute.asAttributeMapping().getDeclaringType()
.getJavaType().getTypeName()
)
);
}
attribute = subDefinedAttribute;
else {
// If not found, look in the treat target type's supertypes
EntityMappingType superType = treatTargetType.getSuperMappingType();
while ( superType != this ) {
final var superTypeSubPart = superType.findDeclaredAttributeMapping( name );
if ( superTypeSubPart != null ) {
return superTypeSubPart;
}
}
if ( attribute != null ) {
return attribute;
superType = superType.getSuperMappingType();
}
}
}
Expand All @@ -5838,22 +5818,37 @@ public ModelPart findSubPart(String name, EntityMappingType treatTargetType) {
}
}

private ModelPart findSubPartInSubclassMappings(String name) {
ModelPart attribute = null;
if ( isNotEmpty( subclassMappingTypes ) ) {
for ( var subMappingType : subclassMappingTypes.values() ) {
final var subDefinedAttribute = subMappingType.findSubTypesSubPart( name, null );
if ( subDefinedAttribute != null ) {
if ( attribute != null && !isCompatibleModelPart( attribute, subDefinedAttribute ) ) {
throw new PathException( String.format(
Locale.ROOT,
"Could not resolve attribute '%s' of '%s' due to the attribute being declared in multiple subtypes '%s' and '%s'",
name,
getJavaType().getTypeName(),
attribute.asAttributeMapping().getDeclaringType().getJavaType().getTypeName(),
subDefinedAttribute.asAttributeMapping().getDeclaringType().getJavaType().getTypeName()
) );
}
attribute = subDefinedAttribute;
}
}
}
return attribute;
}

@Override
public ModelPart findSubTypesSubPart(String name, EntityMappingType treatTargetType) {
final AttributeMapping declaredAttribute = declaredAttributeMappings.get( name );
if ( declaredAttribute != null ) {
return declaredAttribute;
}
else {
if ( subclassMappingTypes != null && !subclassMappingTypes.isEmpty() ) {
for ( EntityMappingType subMappingType : subclassMappingTypes.values() ) {
final ModelPart subDefinedAttribute = subMappingType.findSubTypesSubPart( name, treatTargetType );
if ( subDefinedAttribute != null ) {
return subDefinedAttribute;
}
}
}
return null;
return findSubPartInSubclassMappings( name );
}
}

Expand Down
157 changes: 157 additions & 0 deletions ...ava/org/hibernate/orm/test/inheritance/discriminator/JoinedDiscSameAttributeNameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
/*
* SPDX-License-Identifier: Apache-2.0
* Copyright Red Hat Inc. and Hibernate Authors
*/
package org.hibernate.orm.test.inheritance.discriminator;

import jakarta.persistence.DiscriminatorColumn;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Inheritance;
import jakarta.persistence.InheritanceType;
import jakarta.persistence.Table;
import jakarta.persistence.Tuple;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.Jira;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;

@DomainModel(annotatedClasses = {
JoinedDiscSameAttributeNameTest.Ancestor.class,
JoinedDiscSameAttributeNameTest.DescendantA.class,
JoinedDiscSameAttributeNameTest.DescendantB.class,
JoinedDiscSameAttributeNameTest.DescendantTak.class,
JoinedDiscSameAttributeNameTest.DescendantD.class,
})
@SessionFactory
@Jira( "https://hibernate.atlassian.net/browse/HHH-19756" )
public class JoinedDiscSameAttributeNameTest {
@Test
void testCoalesceSameType(SessionFactoryScope scope) {
scope.inTransaction( session -> {
final var cb = session.getCriteriaBuilder();
final var query = cb.createTupleQuery();
final var root = query.from( Ancestor.class );
final var dscCRoot = cb.treat( root, DescendantTak.class );

query.select( cb.tuple(
root.get( JoinedDiscSameAttributeNameTest_.Ancestor_.id ).alias( "id" ),
cb.coalesce(
dscCRoot.get( JoinedDiscSameAttributeNameTest_.DescendantTak_.subtitle ),
dscCRoot.get( JoinedDiscSameAttributeNameTest_.DescendantTak_.title )
).alias( "description" )
) ).orderBy( cb.asc( root.get( JoinedDiscSameAttributeNameTest_.Ancestor_.id ) ) );

final var resultList = session.createSelectionQuery( query ).getResultList();
assertResults( resultList, null, "title", null );
} );
}

@Test
void testCoalesceDifferentTypes(SessionFactoryScope scope) {
scope.inTransaction( session -> {
final var cb = session.getCriteriaBuilder();
final var query = cb.createTupleQuery();
final var root = query.from( Ancestor.class );
final var dscARoot = cb.treat( root, DescendantA.class );
final var dscCRoot = cb.treat( root, DescendantTak.class );
final var dscDRoot = cb.treat( root, DescendantD.class );

query.select( cb.tuple(
root.get( JoinedDiscSameAttributeNameTest_.Ancestor_.id ).alias( "id" ),
cb.coalesce(
dscDRoot.get( JoinedDiscSameAttributeNameTest_.DescendantD_.subtitle ),
cb.coalesce(
cb.coalesce(
dscARoot.get( JoinedDiscSameAttributeNameTest_.DescendantA_.subtitle ),
dscARoot.get( JoinedDiscSameAttributeNameTest_.DescendantA_.title )
),
cb.coalesce(
dscCRoot.get( JoinedDiscSameAttributeNameTest_.DescendantTak_.subtitle ),
dscCRoot.get( JoinedDiscSameAttributeNameTest_.DescendantTak_.title )
)
)
).alias( "description" )
) ).orderBy( cb.asc( root.get( JoinedDiscSameAttributeNameTest_.Ancestor_.id ) ) );

final var resultList = session.createSelectionQuery( query ).getResultList();
assertResults( resultList, null, "title", "subtitle" );
} );
}

private static void assertResults(List<Tuple> resultList, String... expected) {
assertThat( resultList ).hasSize( expected.length );
for ( int i = 0; i < expected.length; i++ ) {
final var r = resultList.get( i );
assertThat( r.get( 0, Integer.class) ).isEqualTo( i + 1 );
assertThat( r.get( 1, String.class ) ).isEqualTo( expected[i] );
}
}

@BeforeAll
public void setUp(SessionFactoryScope scope) {
scope.inTransaction( session -> {
final var descendantA = new DescendantA();
descendantA.id = 1;
session.persist( descendantA );
final var descendantTak = new DescendantTak();
descendantTak.id = 2;
descendantTak.title = "title";
session.persist( descendantTak );
final var descendantD = new DescendantD();
descendantD.id = 3;
descendantD.subtitle = "subtitle";
session.persist( descendantD );
} );
}

@AfterAll
public void tearDown(SessionFactoryScope scope) {
scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
}

@Entity(name = "Ancestor")
@Table(name = "t_ancestor")
@Inheritance(strategy = InheritanceType.JOINED)
@DiscriminatorColumn(name = "def_type_id")
static abstract class Ancestor {
@Id
Integer id;
}

@Entity(name = "DescendantA")
@DiscriminatorValue("A")
@Table(name = "t_descendant_a")
static class DescendantA extends Ancestor {
String title;
String subtitle;
}

@Entity(name = "DescendantB")
@Table(name = "t_descendant_b")
static abstract class DescendantB extends Ancestor {
}

@Entity(name = "DescendantTak")
@DiscriminatorValue("C")
@Table(name = "t_descendant_c")
static class DescendantTak extends DescendantB {
String title;
String subtitle;
}

@Entity(name = "DescendantD")
@DiscriminatorValue("D")
@Table(name = "t_descendant_d")
static class DescendantD extends DescendantB {
String subtitle;
}
}