HHH-18357 Account for mapped-superclasses without ids

mbellade · mbellade · commit 492fabd477fc · 2024-07-24T16:59:40.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java
@@ -402,7 +402,7 @@ public void finishUp() {
 	private SqmPathSource<?> interpretIdDescriptor() {
 		log.tracef( "Interpreting domain-model identifier descriptor" );
 
-		if ( getSuperType() != null ) {
+		if ( getSuperType() != null && getSuperType().getIdentifierDescriptor() != null ) {
 			return getSuperType().getIdentifierDescriptor();
 		}
 		else if ( id != null ) {

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ public void finishUp() {`
`402`	`402`	`private SqmPathSource<?> interpretIdDescriptor() {`
`403`	`403`	`log.tracef( "Interpreting domain-model identifier descriptor" );`
`404`	`404`
`405`		`- if ( getSuperType() != null ) {`
	`405`	`+ if ( getSuperType() != null && getSuperType().getIdentifierDescriptor() != null ) {`
`406`	`406`	`return getSuperType().getIdentifierDescriptor();`
`407`	`407`	`}`
`408`	`408`	`else if ( id != null ) {`