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

Fix Criteria NPE for named parameters when paramClass is a Collection

This commit is contained in:
Andrea Boriero 2021-03-18 15:06:22 +01:00
parent 0a1527186b
commit 4144c4af4c
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -883,6 +883,7 @@ public class SqmCriteriaNodeBuilder implements NodeBuilder, SqmCreationContext {
if ( Collection.class.isAssignableFrom( paramClass ) ) {
// a multi-valued parameter
return new JpaCriteriaParameter(
name,
new MultiValueParameterType<>( Collection.class ),
true,
this
@ -892,6 +893,7 @@ public class SqmCriteriaNodeBuilder implements NodeBuilder, SqmCreationContext {
if ( paramClass.isArray() ) {
// an array-valued, multi-valued parameter
return new JpaCriteriaParameter(
name,
new MultiValueParameterType( Object[].class ),
true,
this

3
hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/BasicCriteriaExecutionTests.java
View File

@ -11,13 +11,12 @@ import javax.persistence.criteria.ParameterExpression;
import javax.persistence.criteria.Root;
import org.hibernate.dialect.DerbyDialect;
import org.hibernate.testing.SkipForDialect;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.query.criteria.HibernateCriteriaBuilder;
import org.hibernate.query.criteria.JpaCriteriaQuery;
import org.hibernate.query.criteria.JpaRoot;
import org.hibernate.testing.SkipForDialect;
import org.hibernate.testing.orm.domain.gambit.BasicEntity;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.RequiresDialect;

25
hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaParameterTests.java
View File

@ -6,11 +6,14 @@
*/
package org.hibernate.orm.test.query.criteria;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.ParameterExpression;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Root;
import org.hibernate.query.criteria.HibernateCriteriaBuilder;
@ -42,6 +45,28 @@ public class CriteriaParameterTests {
);
}
@Test
public void testNamedParameterBaseline(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
final CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
final ParameterExpression<Collection> parameter = criteriaBuilder.parameter( Collection.class, "datas" );
final CriteriaQuery<BasicEntity> criteria = criteriaBuilder.createQuery( BasicEntity.class );
final Root<BasicEntity> root = criteria.from( BasicEntity.class );
Path<?> property = root.get( "data" );
criteria.where( property.in( parameter ) );
final QueryImplementor<BasicEntity> query = session.createQuery( criteria );
List<String> parameterValue = new ArrayList<>();
parameterValue.add( "fe" );
query.setParameter( "datas", parameterValue );
query.list();
}
);
}
@Test
public void testMultiValuedParameterBaseline(SessionFactoryScope scope) {
scope.inTransaction(