HHH-15839 CriteriaBuilder treat method on Path causes ClassCastException
This commit is contained in:
parent
f7ae48ad08
commit
6f7b9362d2
|
@ -4797,7 +4797,8 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
|
|||
if ( lhs instanceof SqmTreatedPath<?, ?> ) {
|
||||
final SqmTreatedPath<?, ?> treatedPath = (SqmTreatedPath<?, ?>) lhs;
|
||||
final Class<?> treatTargetJavaType = treatedPath.getTreatTarget().getJavaType();
|
||||
final Class<?> originalJavaType = treatedPath.getWrappedPath().getJavaType();
|
||||
final SqmPath<?> wrappedPath = treatedPath.getWrappedPath();
|
||||
final Class<?> originalJavaType = wrappedPath.getJavaType();
|
||||
if ( treatTargetJavaType.isAssignableFrom( originalJavaType ) ) {
|
||||
// Treating a node to a super type can be ignored
|
||||
return expression;
|
||||
|
@ -4812,12 +4813,15 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
|
|||
final EntityPersister entityDescriptor = domainModel.findEntityDescriptor(
|
||||
treatedPath.getTreatTarget().getHibernateEntityName()
|
||||
);
|
||||
conjunctTreatUsages.computeIfAbsent( treatedPath.getWrappedPath(), p -> new HashSet<>( 1 ) )
|
||||
conjunctTreatUsages.computeIfAbsent( wrappedPath, p -> new HashSet<>( 1 ) )
|
||||
.addAll( entityDescriptor.getSubclassEntityNames() );
|
||||
return expression;
|
||||
}
|
||||
if ( wrappedPath instanceof DiscriminatorSqmPath ) {
|
||||
// Note: If the columns that are accessed are not shared with other entities, we could avoid this wrapping
|
||||
return createCaseExpression( treatedPath.getWrappedPath(), treatedPath.getTreatTarget(), expression );
|
||||
return createCaseExpression( wrappedPath, treatedPath.getTreatTarget(), expression );
|
||||
}
|
||||
return expression;
|
||||
}
|
||||
return expression;
|
||||
}
|
||||
|
|
|
@ -10,6 +10,7 @@ import org.hibernate.metamodel.model.domain.EntityDomainType;
|
|||
import org.hibernate.query.PathException;
|
||||
import org.hibernate.query.sqm.NodeBuilder;
|
||||
import org.hibernate.query.sqm.SemanticQueryWalker;
|
||||
import org.hibernate.query.sqm.SqmPathSource;
|
||||
import org.hibernate.query.sqm.tree.SqmCopyContext;
|
||||
|
||||
/**
|
||||
|
@ -31,7 +32,7 @@ public class SqmTreatedSimplePath<T, S extends T>
|
|||
wrappedPath.getNavigablePath().treatAs(
|
||||
treatTarget.getHibernateEntityName()
|
||||
),
|
||||
(EntityDomainType<S>) wrappedPath.getReferencedPathSource(),
|
||||
(SqmPathSource<S>) wrappedPath.getReferencedPathSource(),
|
||||
wrappedPath.getLhs(),
|
||||
nodeBuilder
|
||||
);
|
||||
|
@ -48,7 +49,7 @@ public class SqmTreatedSimplePath<T, S extends T>
|
|||
wrappedPath.getNavigablePath().treatAs(
|
||||
treatTarget.getHibernateEntityName()
|
||||
),
|
||||
(EntityDomainType<S>) wrappedPath.getReferencedPathSource(),
|
||||
(SqmPathSource<S>) wrappedPath.getReferencedPathSource(),
|
||||
wrappedPath.getLhs(),
|
||||
nodeBuilder
|
||||
);
|
||||
|
@ -95,6 +96,12 @@ public class SqmTreatedSimplePath<T, S extends T>
|
|||
return super.treatAs( treatJavaType );
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public SqmPath<?> get(String attributeName) {
|
||||
return resolvePath( attributeName, treatTarget.getSubPathSource( attributeName ) );
|
||||
}
|
||||
|
||||
@Override
|
||||
public <X> X accept(SemanticQueryWalker<X> walker) {
|
||||
return walker.visitTreatedPath( this );
|
||||
|
|
Loading…
Reference in New Issue