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

HHH-15232 fix a bug when empty entity collection is provided for a query parameter

This commit is contained in:
Nathan Xu 2022-05-01 18:03:22 -04:00 committed by Christian Beikov
parent 049a61479b
commit b469c73d1e
2 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6433,6 +6433,7 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
return processInSingleParameter( sqmPredicate, sqmWrapper, jpaCriteriaParameter, domainParamBinding );
}
@SuppressWarnings( "rawtypes" )
private Predicate processInSingleParameter(
SqmInListPredicate<?> sqmPredicate,
SqmParameter<?> sqmParameter,
@ -6445,11 +6446,14 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
sqmPredicate.isNegated(),
getBooleanType()
);
final FromClauseIndex fromClauseIndex = fromClauseIndexStack.getCurrent();
if ( !iterator.hasNext() ) {
domainParamBinding.setType( (MappingModelExpressible) determineValueMapping( sqmPredicate.getTestExpression(), fromClauseIndex ) );
return inListPredicate;
}
final FromClauseIndex fromClauseIndex = fromClauseIndexStack.getCurrent();
inferrableTypeAccessStack.push(
() -> determineValueMapping( sqmPredicate.getTestExpression(), fromClauseIndex )
);

60
hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/EmptyEntityCollectionParameterTests.java Normal file
View File

@ -0,0 +1,60 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.orm.test.query.sqm.param;
import java.util.Collections;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.Test;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.OneToOne;
/**
* @author Nathan Xu
*/
@DomainModel(annotatedClasses = {
EmptyEntityCollectionParameterTests.DbEntity.class,
EmptyEntityCollectionParameterTests.ContentEntry.class
})
@SessionFactory
@TestForIssue(jiraKey = "HHH-15232")
class EmptyEntityCollectionParameterTests {
@Test
void testNoPersistenceExceptionThrown(SessionFactoryScope scope) {
// without fixing, the following exception would be thrown:
// Converting `org.hibernate.type.descriptor.java.spi.JdbcTypeRecommendationException` to JPA `PersistenceException` :
// Could not determine recommended JdbcType for `org.hibernate.orm.test.query.sqm.param.EmptyEntityCollectionParameterTests$ContentEntry`
scope.inTransaction( session ->
session.createQuery( "FROM DbEntity WHERE content IN (:vals)", DbEntity.class )
.setParameter( "vals", Collections.emptyList() )
.list()
);
}
@Entity(name = "DbEntity")
static class DbEntity {
@Id
long id;
@OneToOne
ContentEntry content;
}
@Entity(name = "ContentEntry")
static class ContentEntry {
@Id
long id;
String content;
}
}