Skip to content

HHH-19896 Criteria select case expressions: NPE when second query contains an otherwise case expression but not the first query #11163

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
Oct 28, 2025
Merged

HHH-19896 Criteria select case expressions: NPE when second query contains an otherwise case expression but not the first query #11163

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
a55c7f2
HHH-19896 Add test for issue
dreab8 Oct 28, 2025
7bbb44b
HHH-19896 Criteria select case expressions: NPE when second query con…
dreab8 Oct 28, 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
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmCacheable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public interface SqmCacheable {
int cacheHashCode();

static boolean areCompatible(@Nullable SqmCacheable e1, @Nullable SqmCacheable e2) {
return e1 == null ? e2 == null : e1.isCompatible( e2 );
return e1 == null ? e2 == null : e2 != null && e1.isCompatible( e2 );
}

static boolean areCompatible(@Nullable Collection<? extends SqmCacheable> collection1, @Nullable Collection<? extends SqmCacheable> collection2) {
Expand Down
148 changes: 99 additions & 49 deletions ...org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/
package org.hibernate.orm.test.query.criteria.internal.expression;

import java.util.List;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
Expand All @@ -15,107 +14,160 @@
import jakarta.persistence.criteria.Expression;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Root;


import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.JiraKey;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Assert;
import org.junit.Test;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;

import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
import static org.junit.Assert.assertEquals;
import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;

/**
*
* @author Vasyl Danyliuk
*/
public class SearchedCaseExpressionTest extends BaseCoreFunctionalTestCase {
@DomainModel(
annotatedClasses = {
SearchedCaseExpressionTest.Event.class,
SearchedCaseExpressionTest.EventType.class
}
)
@SessionFactory
public class SearchedCaseExpressionTest {

@AfterEach
public void tearDown(SessionFactoryScope scope) {
scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
}

@Test
public void testCaseClause() {
doInHibernate( this::sessionFactory, session -> {
public void testCaseClause(SessionFactoryScope scope) {
scope.inTransaction( session -> {
CriteriaBuilder cb = session.getCriteriaBuilder();

CriteriaQuery<Event> criteria = cb.createQuery(Event.class);
CriteriaQuery<Event> criteria = cb.createQuery( Event.class );

Root<Event> event = criteria.from(Event.class);
Path<EventType> type = event.get("type");
Root<Event> event = criteria.from( Event.class );
Path<EventType> type = event.get( "type" );

Expression<String> caseWhen = cb.<EventType, String>selectCase(type)
.when(EventType.TYPE1, "Admin Event")
.when(EventType.TYPE2, "User Event")
.when(EventType.TYPE3, "Reporter Event")
.otherwise("");
Expression<String> caseWhen = cb.<EventType, String>selectCase( type )
.when( EventType.TYPE1, "Admin Event" )
.when( EventType.TYPE2, "User Event" )
.when( EventType.TYPE3, "Reporter Event" )
.otherwise( "" );

criteria.select(event);
criteria.where(cb.equal(caseWhen, "Admin Event")); // OK when use cb.like() method and others
List<Event> resultList = session.createQuery(criteria).getResultList();
criteria.select( event );
criteria.where( cb.equal( caseWhen, "Admin Event" ) ); // OK when use cb.like() method and others
List<Event> resultList = session.createQuery( criteria ).getResultList();

Assert.assertNotNull(resultList);
assertThat( resultList ).isNotNull();
} );
}

@Test
public void testEqualClause() {
doInHibernate( this::sessionFactory, session -> {
public void testEqualClause(SessionFactoryScope scope) {
scope.inTransaction( session -> {
CriteriaBuilder cb = session.getCriteriaBuilder();

CriteriaQuery<Event> criteria = cb.createQuery(Event.class);
CriteriaQuery<Event> criteria = cb.createQuery( Event.class );

Root<Event> event = criteria.from(Event.class);
Path<EventType> type = event.get("type");
Root<Event> event = criteria.from( Event.class );
Path<EventType> type = event.get( "type" );

Expression<String> caseWhen = cb.<String>selectCase()
.when(cb.equal(type, EventType.TYPE1), "Type1")
.otherwise("");

criteria.select(event);
criteria.where(cb.equal(caseWhen, "Admin Event")); // OK when use cb.like() method and others
List<Event> resultList = session.createQuery(criteria).getResultList();
.when( cb.equal( type, EventType.TYPE1 ), "Type1" )
.otherwise( "" );

criteria.select( event );
criteria.where( cb.equal( caseWhen, "Admin Event" ) ); // OK when use cb.like() method and others
List<Event> resultList = session.createQuery( criteria ).getResultList();

Assert.assertNotNull(resultList);
assertThat( resultList ).isNotNull();
} );
}

@Test
@JiraKey(value = "HHH-13167")
public void testMissingElseClause() {
doInHibernate( this::sessionFactory, session -> {
public void testMissingElseClause(SessionFactoryScope scope) {
scope.inTransaction( session -> {
Event event = new Event();
event.id = 1L;
event.type = EventType.TYPE1;

session.persist( event );
} );

doInHibernate( this::sessionFactory, session -> {
scope.inTransaction( session -> {
CriteriaBuilder cb = session.getCriteriaBuilder();

CriteriaQuery<Event> criteria = cb.createQuery( Event.class );

Root<Event> root = criteria.from( Event.class );
Path<EventType> type = root.get( "type" );

Expression<String> caseWhen = cb.<String> selectCase()
Expression<String> caseWhen = cb.<String>selectCase()
.when( cb.equal( type, EventType.TYPE1 ), "Matched" );

criteria.select( root );
criteria.where( cb.equal( caseWhen, "Matched" ) );

Event event = session.createQuery( criteria ).getSingleResult();
assertEquals( 1L, (long) event.id );
assertThat( event.id ).isEqualTo( 1L );
} );
}

@Override
protected boolean isCleanupTestDataRequired() {
return true;
}

@Override
protected Class[] getAnnotatedClasses() {
return new Class[]{ Event.class, EventType.class };
@Test
@JiraKey( "HHH-19896" )
public void testCaseWhenWithOtherwiseClauseExecutedAfterOneWithout(SessionFactoryScope scope) {
scope.inTransaction( session -> {
Event event = new Event();
event.id = 1L;
event.type = EventType.TYPE1;

session.persist( event );
} );

scope.inTransaction( session -> {
CriteriaBuilder cb = session.getCriteriaBuilder();

CriteriaQuery<Event> criteria = cb.createQuery( Event.class );

Root<Event> root = criteria.from( Event.class );
Path<EventType> type = root.get( "type" );

Expression<String> caseWhen = cb.<String>selectCase()
.when( cb.equal( type, EventType.TYPE1 ), "Matched" );

criteria.select( root );
criteria.where( cb.equal( caseWhen, "Matched" ) );

Event event = session.createQuery( criteria ).getSingleResult();
assertThat( event.id ).isEqualTo( 1L );
} );

scope.inTransaction( session -> {
CriteriaBuilder cb = session.getCriteriaBuilder();

CriteriaQuery<Event> criteria = cb.createQuery( Event.class );

Root<Event> event = criteria.from( Event.class );
Path<EventType> type = event.get( "type" );

Expression<String> caseWhen = cb.<String>selectCase()
.when( cb.equal( type, EventType.TYPE1 ), "Type1" )
.otherwise( "" );

criteria.select( event );
criteria.where( cb.equal( caseWhen, "Admin Event" ) ); // OK when use cb.like() method and others
List<Event> resultList = session.createQuery( criteria ).getResultList();

assertThat( resultList ).isNotNull();
assertThat( resultList ).hasSize( 0 );
} );
}

@Entity(name = "Event")
Expand All @@ -142,8 +194,6 @@ public Event type(EventType type) {
}

public enum EventType {

TYPE1, TYPE2, TYPE3

}
}