Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-17405 Fix failing generic MappedSuperclass comparison test

This commit is contained in:
Marco Belladelli 2023-12-05 17:38:00 +01:00 committed by Christian Beikov
parent a69553e8bf
commit 4a6c26ca4b
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
View File

@ -45,6 +45,7 @@ import org.hibernate.metamodel.model.domain.BasicDomainType;
import org.hibernate.metamodel.model.domain.DomainType;
import org.hibernate.metamodel.model.domain.JpaMetamodel;
import org.hibernate.metamodel.model.domain.SimpleDomainType;
import org.hibernate.metamodel.model.domain.SingularPersistentAttribute;
import org.hibernate.metamodel.model.domain.internal.BasicTypeImpl;
import org.hibernate.metamodel.model.domain.spi.JpaMetamodelImplementor;
import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
@ -75,6 +76,7 @@ import org.hibernate.query.sqm.FrameKind;
import org.hibernate.query.sqm.NodeBuilder;
import org.hibernate.query.sqm.SetOperator;
import org.hibernate.query.sqm.SqmExpressible;
import org.hibernate.query.sqm.SqmPathSource;
import org.hibernate.query.sqm.SqmQuerySource;
import org.hibernate.query.sqm.TemporalUnit;
import org.hibernate.query.sqm.TrimSpec;
@ -1827,14 +1829,27 @@ public class SqmCriteriaNodeBuilder implements NodeBuilder, SqmCreationContext,
if ( typeInferenceSource instanceof BindableType ) {
return (BindableType<T>) typeInferenceSource;
}
if ( typeInferenceSource.getNodeType() != null ) {
return (BindableType<T>) typeInferenceSource.getNodeType();
final SqmExpressible<?> nodeType = getNodeType( typeInferenceSource );
if ( nodeType != null ) {
return (BindableType<T>) nodeType;
}
}
return value == null ? null : (BasicType<T>) typeConfiguration.getBasicTypeForJavaType( value.getClass() );
}
private static SqmExpressible<?> getNodeType(SqmExpression<?> expression) {
if ( expression instanceof SqmPath<?> ) {
final SqmPathSource<?> pathSource = ( (SqmPath<?>) expression ).getResolvedModel();
return pathSource instanceof SingularPersistentAttribute<?, ?> ?
( (SingularPersistentAttribute<?, ?>) pathSource ).getPathSource() :
pathSource;
}
else {
return expression.getNodeType();
}
}
private <T> ValueBindJpaCriteriaParameter<T> valueParameter(T value, SqmExpression<? extends T> typeInferenceSource) {
final BindableType<T> bindableType =
resolveInferredParameterType( value, typeInferenceSource, getTypeConfiguration() );