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

HHH-15233 Query NPE when using ':param IS NULL' and the parameter is an Entity

This commit is contained in:
Andrea Boriero 2022-04-29 15:44:49 +02:00 committed by Steve Ebersole
parent d4f03109c8
commit 5d0fc0f488
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
View File

@ -94,6 +94,7 @@ import org.hibernate.metamodel.model.domain.BasicDomainType;
import org.hibernate.metamodel.model.domain.EmbeddableDomainType; import org.hibernate.metamodel.model.domain.EmbeddableDomainType;
import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.metamodel.model.domain.EntityDomainType;
import org.hibernate.metamodel.model.domain.PluralPersistentAttribute; import org.hibernate.metamodel.model.domain.PluralPersistentAttribute;
import org.hibernate.metamodel.model.domain.SimpleDomainType;
import org.hibernate.metamodel.model.domain.internal.BasicSqmPathSource; import org.hibernate.metamodel.model.domain.internal.BasicSqmPathSource;
import org.hibernate.metamodel.model.domain.internal.CompositeSqmPathSource; import org.hibernate.metamodel.model.domain.internal.CompositeSqmPathSource;
import org.hibernate.metamodel.model.domain.internal.DiscriminatorSqmPath; import org.hibernate.metamodel.model.domain.internal.DiscriminatorSqmPath;
@ -4878,9 +4879,20 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
if ( inferredValueMapping != null ) { if ( inferredValueMapping != null ) {
return inferredValueMapping; return inferredValueMapping;
} }
return getTypeConfiguration().getBasicTypeForJavaType(
final BasicType basicTypeForJavaType = getTypeConfiguration().getBasicTypeForJavaType(
paramSqmType.getExpressibleJavaType().getJavaTypeClass() paramSqmType.getExpressibleJavaType().getJavaTypeClass()
); );
if ( basicTypeForJavaType == null && paramSqmType instanceof EntityDomainType ) {
final SimpleDomainType idType = ( (EntityDomainType) paramSqmType ).getIdType();
if ( idType != null ) {
return getTypeConfiguration().getBasicTypeForJavaType(
idType.getExpressibleJavaType().getJavaTypeClass() );
}
}
return basicTypeForJavaType;
} }
throw new ConversionException( "Could not determine ValueMapping for SqmParameter: " + sqmParameter ); throw new ConversionException( "Could not determine ValueMapping for SqmParameter: " + sqmParameter );