Skip to content

Expressions.nullExpresion() in querydsl result in NPE in SqmExpressible with named parameters #9917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 28, 2025
Merged

Expressions.nullExpresion() in querydsl result in NPE in SqmExpressible with named parameters #9917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27ca7d1
HHH-19291 Add test for issue
dreab8 Mar 27, 2025
af03c32
HHH-19291 Expressions.nullExpresion() in querydsl result in NPE in Sq…
dreab8 Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,22 +749,29 @@ public CommonQueryContract setParameter(String name, Object value) {
}
else {
final QueryParameterBinding<Object> binding = getQueryParameterBindings().getBinding( name );
final QueryParameter<Object> param = binding.getQueryParameter();
if ( param.allowsMultiValuedBinding() ) {
final BindableType<?> hibernateType = param.getHibernateType();
if ( hibernateType == null || isInstance( hibernateType, value ) ) {
if ( value instanceof Collection<?> collection
&& !isRegisteredAsBasicType( value.getClass() ) ) {
return setParameterList( name, collection );
}
}
if ( multipleBinding( binding.getQueryParameter(), value )
&& value instanceof Collection<?> collectionValue
&& !isRegisteredAsBasicType( value.getClass() ) ) {
return setParameterList( name, collectionValue );
}
binding.setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
}

return this;
}

private boolean multipleBinding(QueryParameter<Object> param, Object value){
if ( param.allowsMultiValuedBinding() ) {
final BindableType<?> hibernateType = param.getHibernateType();
if ( hibernateType == null
|| hibernateType instanceof NullSqmExpressible
|| isInstance( hibernateType, value ) ) {
return true;
}
}
return false;
}

private <T> void setTypedParameter(String name, TypedParameterValue<T> typedValue) {
final BindableType<T> type = typedValue.getType();
setParameter( name, typedValue.getValue(), type != null ? type : typedValue.getTypeReference() );
Expand Down Expand Up @@ -815,17 +822,10 @@ public CommonQueryContract setParameter(int position, Object value) {
}
else {
final QueryParameterBinding<Object> binding = getQueryParameterBindings().getBinding( position );
final QueryParameter<Object> param = binding.getQueryParameter();
if ( param.allowsMultiValuedBinding() ) {
final BindableType<?> hibernateType = param.getHibernateType();
if ( hibernateType == null
|| hibernateType instanceof NullSqmExpressible
|| isInstance( hibernateType, value ) ) {
if ( value instanceof Collection<?> collection
&& !isRegisteredAsBasicType( value.getClass() ) ) {
return setParameterList( position, collection );
}
}
if ( multipleBinding( binding.getQueryParameter(), value )
&& value instanceof Collection<?> collectionValue
&& !isRegisteredAsBasicType( value.getClass() ) ) {
return setParameterList( position, collectionValue );
}
binding.setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
}
Expand Down
24 changes: 24 additions & 0 deletions hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,30 @@ public void testSelectCaseWhenNullLiteralWithParameters(SessionFactoryScope scop
);
}

@Test
@JiraKey( "HHH-19291" )
public void testSelectCaseWhenNullLiteralWithParametersWithNamedParameters(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
List result = session.createQuery( "select case when 1=1 then :value else null end from Person p" )
.setParameter( "value", 2 )
.list();
assertThat( result.size(), is( 1 ) );
assertThat( result.get( 0 ), is( 2 ) );
}
);

scope.inTransaction(
session -> {
List result = session.createQuery( "select count(case when 1=1 then :value else null end) from Person p" )
.setParameter( "value", 2 )
.list();
assertThat( result.size(), is( 1 ) );
assertThat( result.get( 0 ), is( 1L ) );
}
);
}

@Entity(name = "Person")
@Table(name = "PERSON_TABLE")
public static class Person {
Expand Down
Loading