HHH-17803 Fix resolving enum basic path source mapping expressibles

mbellade · mbellade · commit af747ad5313c · 2024-03-29T10:40:15.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java
@@ -785,12 +785,12 @@ public MappingModelExpressible<?> resolveMappingExpressible(
 			return (BasicType<?>) sqmExpressible;
 		}
 
-		if ( sqmExpressible instanceof BasicDomainType ) {
+		if ( sqmExpressible instanceof BasicDomainType<?> ) {
 			return getTypeConfiguration().getBasicTypeForJavaType( sqmExpressible.getRelationalJavaType().getJavaType() );
 		}
 
 		if ( sqmExpressible instanceof BasicSqmPathSource<?> ) {
-			return getTypeConfiguration().getBasicTypeForJavaType( sqmExpressible.getRelationalJavaType().getJavaType() );
+			return resolveMappingExpressible( sqmExpressible.getSqmType(), tableGroupLocator );
 		}
 
 		if ( sqmExpressible instanceof SqmFieldLiteral ) {

Original file line number	Diff line number	Diff line change
`@@ -785,12 +785,12 @@ public MappingModelExpressible<?> resolveMappingExpressible(`
`785`	`785`	`return (BasicType<?>) sqmExpressible;`
`786`	`786`	`}`
`787`	`787`
`788`		`- if ( sqmExpressible instanceof BasicDomainType ) {`
	`788`	`+ if ( sqmExpressible instanceof BasicDomainType<?> ) {`
`789`	`789`	`return getTypeConfiguration().getBasicTypeForJavaType( sqmExpressible.getRelationalJavaType().getJavaType() );`
`790`	`790`	`}`
`791`	`791`
`792`	`792`	`if ( sqmExpressible instanceof BasicSqmPathSource<?> ) {`
`793`		`- return getTypeConfiguration().getBasicTypeForJavaType( sqmExpressible.getRelationalJavaType().getJavaType() );`
	`793`	`+ return resolveMappingExpressible( sqmExpressible.getSqmType(), tableGroupLocator );`
`794`	`794`	`}`
`795`	`795`
`796`	`796`	`if ( sqmExpressible instanceof SqmFieldLiteral ) {`