HHH-15822 Make sure MappedSuperclass can act as type for entity value…

…d paths
hibernate · Jan 27, 2023 · 69a5b1f · 69a5b1f
1 parent 477f1b1
commit 69a5b1f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/...ate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEntityValuedSimplePath.java b/...ate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEntityValuedSimplePath.java
@@ -63,10 +63,18 @@ public <X> X accept(SemanticQueryWalker<X> walker) {
 	}
 
 	@Override
-	public EntityDomainType<T> getNodeType() {
+	public SqmPathSource<T> getNodeType() {
 		//noinspection unchecked
-		return (EntityDomainType<T>) getReferencedPathSource().getSqmPathType();
+		return (SqmPathSource<T>) getReferencedPathSource().getSqmPathType();
 	}
+// We can't expose that the type is a EntityDomainType because it could also be a MappedSuperclass
+// Ideally, we would specify the return type to be IdentifiableDomainType, but that does not implement SqmPathSource yet
+// and is hence incompatible with the return type of the super class
+//	@Override
+//	public EntityDomainType<T> getNodeType() {
+//		//noinspection unchecked
+//		return (EntityDomainType<T>) getReferencedPathSource().getSqmPathType();
+//	}
 
 	@Override
 	public <S extends T> SqmTreatedSimplePath<T,S> treatAs(Class<S> treatJavaType) throws PathException {

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFkExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFkExpression.java
@@ -6,6 +6,7 @@
  */
 package org.hibernate.query.sqm.tree.domain;
 
+import org.hibernate.metamodel.model.domain.IdentifiableDomainType;
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.SemanticQueryWalker;
 import org.hibernate.query.sqm.SqmExpressible;
@@ -24,7 +25,7 @@ public class SqmFkExpression<T> extends AbstractSqmExpression<T> {
 
 	public SqmFkExpression(SqmEntityValuedSimplePath<?> toOnePath, NodeBuilder criteriaBuilder) {
 		//noinspection unchecked
-		super( (SqmExpressible<? extends T>) toOnePath.getNodeType().getIdType(), criteriaBuilder );
+		super( (SqmExpressible<? extends T>) ( (IdentifiableDomainType<?>) toOnePath.getNodeType() ).getIdType(), criteriaBuilder );
 		this.toOnePath = toOnePath;
 	}