HHH-17299 Avoid unneeded treats to the same subtype

mbellade · mbellade · commit 408777469148 · 2023-11-08T22:26:42.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
@@ -5212,7 +5212,7 @@ private Set<String> determineEntityNamesForTreatTypeRestriction(
 
 	private Predicate createTreatTypeRestriction(SqmPath<?> lhs, EntityDomainType<?> treatTarget) {
 		final AbstractEntityPersister entityDescriptor = (AbstractEntityPersister) domainModel.findEntityDescriptor( treatTarget.getHibernateEntityName() );
-		if ( entityDescriptor.isPolymorphic() ) {
+		if ( entityDescriptor.isPolymorphic() && lhs.getNodeType() != treatTarget ) {
 			final Set<String> subclassEntityNames = entityDescriptor.getSubclassEntityNames();
 			return createTreatTypeRestriction( lhs, subclassEntityNames );
 		}

Original file line number	Diff line number	Diff line change
`@@ -5212,7 +5212,7 @@ private Set<String> determineEntityNamesForTreatTypeRestriction(`
`5212`	`5212`
`5213`	`5213`	`private Predicate createTreatTypeRestriction(SqmPath<?> lhs, EntityDomainType<?> treatTarget) {`
`5214`	`5214`	`final AbstractEntityPersister entityDescriptor = (AbstractEntityPersister) domainModel.findEntityDescriptor( treatTarget.getHibernateEntityName() );`
`5215`		`- if ( entityDescriptor.isPolymorphic() ) {`
	`5215`	`+ if ( entityDescriptor.isPolymorphic() && lhs.getNodeType() != treatTarget ) {`
`5216`	`5216`	`final Set<String> subclassEntityNames = entityDescriptor.getSubclassEntityNames();`
`5217`	`5217`	`return createTreatTypeRestriction( lhs, subclassEntityNames );`
`5218`	`5218`	`}`