Skip to content

HHH-18321 SqlTreeCreationException when using sum/diff with coalesce on properties of embeddable component #8730

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

Closed
wants to merge 2 commits into from
Closed

HHH-18321 SqlTreeCreationException when using sum/diff with coalesce on properties of embeddable component #8730

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
f15e4aa
HHH-18321 Add test for issue
mbellade Jul 1, 2024
fec9092
HHH-18321 Only infer temporal type from other operand when needed
mbellade Jul 1, 2024
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
29 changes: 17 additions & 12 deletions hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6562,19 +6562,9 @@ public Object visitBinaryArithmeticExpression(SqmBinaryArithmetic<?> expression)
SqmExpression<?> leftOperand = expression.getLeftHandOperand();
SqmExpression<?> rightOperand = expression.getRightHandOperand();

// Need to infer the operand types here first to decide how to transform the expression
final FromClauseIndex fromClauseIndex = fromClauseIndexStack.getCurrent();
inferrableTypeAccessStack.push( () -> determineValueMapping( rightOperand, fromClauseIndex ) );
final MappingModelExpressible<?> leftOperandType = determineValueMapping( leftOperand );
inferrableTypeAccessStack.pop();
inferrableTypeAccessStack.push( () -> determineValueMapping( leftOperand, fromClauseIndex ) );
final MappingModelExpressible<?> rightOperandType = determineValueMapping( rightOperand );
inferrableTypeAccessStack.pop();

final boolean durationToRight = isDuration( rightOperand.getNodeType() );
final TypeConfiguration typeConfiguration = getCreationContext().getMappingMetamodel().getTypeConfiguration();
final TemporalType temporalTypeToLeft = typeConfiguration.getSqlTemporalType( leftOperandType );
final TemporalType temporalTypeToRight = typeConfiguration.getSqlTemporalType( rightOperandType );
final TemporalType temporalTypeToLeft = inferTemporalType( leftOperand, rightOperand );
final TemporalType temporalTypeToRight = inferTemporalType( rightOperand, leftOperand );
final boolean temporalTypeSomewhereToLeft = adjustedTimestamp != null || temporalTypeToLeft != null;

if ( temporalTypeToLeft != null && durationToRight ) {
Expand All @@ -6592,6 +6582,7 @@ else if ( temporalTypeToLeft != null && temporalTypeToRight != null ) {
}
else {
// Infer one operand type through the other
final FromClauseIndex fromClauseIndex = fromClauseIndexStack.getCurrent();
inferrableTypeAccessStack.push( () -> determineValueMapping( rightOperand, fromClauseIndex ) );
final Expression lhs = toSqlExpression( leftOperand.accept( this ) );
inferrableTypeAccessStack.pop();
Expand Down Expand Up @@ -6620,6 +6611,20 @@ else if ( temporalTypeToLeft != null && temporalTypeToRight != null ) {
}
}

private TemporalType inferTemporalType(SqmExpression<?> expression, SqmExpression<?> inferrableOperand) {
final SqmExpressible<?> nodeType = expression.getNodeType();
if ( nodeType != null ) {
return getTypeConfiguration().getSqlTemporalType( nodeType );
}
else {
// Need to infer the type here first to determine the correct temporal type
final FromClauseIndex fromClauseIndex = fromClauseIndexStack.getCurrent();
inferrableTypeAccessStack.push( () -> determineValueMapping( inferrableOperand, fromClauseIndex ) );
Copy link
Member

@beikov beikov Sep 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Push without pop?

final MappingModelExpressible<?> mappingType = determineValueMapping( expression );
return TypeConfiguration.getSqlTemporalType( mappingType );
}
}

private BasicValuedMapping getExpressionType(SqmExpression<?> expression) {
final SqmExpressible<?> nodeType = expression.getNodeType();
if ( nodeType != null ) {
Expand Down
115 changes: 75 additions & 40 deletions hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CoalesceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,44 @@
*/
package org.hibernate.orm.test.jpa.criteria;

import java.math.BigDecimal;
import java.util.List;

import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
import org.hibernate.testing.orm.junit.Jira;
import org.hibernate.testing.orm.junit.Jpa;
import org.hibernate.testing.orm.junit.SessionFactoryScope;

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Embedded;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Tuple;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Expression;
import jakarta.persistence.criteria.ParameterExpression;
import jakarta.persistence.criteria.Root;

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

/**
* @author Will Dazy
*/
@Jpa(annotatedClasses = CoalesceTest.HHH15291Entity.class)
@Jpa( annotatedClasses = {
CoalesceTest.HHH15291Entity.class,
CoalesceTest.ComponentEntity.class,
CoalesceTest.ComponentA.class,
} )
@TestForIssue( jiraKey = "HHH-15291")
public class CoalesceTest {

@Test
public void hhh15291JPQL1Test(EntityManagerFactoryScope scope) {
scope.inEntityManager(
Expand Down Expand Up @@ -97,9 +112,46 @@ public void hhh15291Criteria2Test(EntityManagerFactoryScope scope) {
);
}

@Test
@Jira( "https://hibernate.atlassian.net/browse/HHH-18321" )
public void testCoalesceInBinaryArithmetic(EntityManagerFactoryScope scope) {
scope.inTransaction( entityManager -> {
final CriteriaBuilder cb = entityManager.getCriteriaBuilder();
final CriteriaQuery<Tuple> cquery = cb.createTupleQuery();
final Root<ComponentEntity> root = cquery.from( ComponentEntity.class );

cquery.multiselect(
root.get( "id" ),
cb.diff(
cb.coalesce( root.get( "componentA" ).get( "income" ), BigDecimal.ZERO ),
cb.coalesce( root.get( "componentA" ).get( "expense" ), BigDecimal.ZERO )
)
);

final List<Tuple> resultList = entityManager.createQuery( cquery ).getResultList();
assertThat( resultList ).hasSize( 2 );
for ( Tuple result : resultList ) {
final Long id = result.get( 0, Long.class );
assertThat( result.get( 1, BigDecimal.class ).intValue() ).isEqualTo( id == 1L ? 0 : 1 );
}
} );
}

@BeforeAll
public void setUp(EntityManagerFactoryScope scope) {
scope.inTransaction( entityManager -> {
entityManager.persist( new ComponentEntity( 1L, new ComponentA( BigDecimal.ONE, BigDecimal.ONE ) ) );
entityManager.persist( new ComponentEntity( 2L, new ComponentA( BigDecimal.ONE, null ) ) );
} );
}

@AfterAll
public void tearDown(EntityManagerFactoryScope scope) {
scope.inTransaction( entityManager -> entityManager.createQuery( "delete from ComponentEntity" ).executeUpdate() );
}

@Entity(name = "HHH15291Entity")
public static class HHH15291Entity {

@Id
@Column(name = "KEY_CHAR")
private String KeyString;
Expand All @@ -118,53 +170,36 @@ public static class HHH15291Entity {

@Column(name = "ITEM_INTEGER1")
private Integer itemInteger1;
}

public String getKeyString() {
return KeyString;
}

public void setKeyString(String keyString) {
KeyString = keyString;
}

public String getItemString1() {
return itemString1;
}

public void setItemString1(String itemString1) {
this.itemString1 = itemString1;
}

public String getItemString2() {
return itemString2;
}

public void setItemString2(String itemString2) {
this.itemString2 = itemString2;
}
@Entity( name = "ComponentEntity" )
static class ComponentEntity {
@Id
private Long id;

public String getItemString3() {
return itemString3;
}
@Embedded
private ComponentA componentA;

public void setItemString3(String itemString3) {
this.itemString3 = itemString3;
public ComponentEntity() {
}

public String getItemString4() {
return itemString4;
public ComponentEntity(Long id, ComponentA componentA) {
this.id = id;
this.componentA = componentA;
}
}

public void setItemString4(String itemString4) {
this.itemString4 = itemString4;
}
@Embeddable
static class ComponentA {
private BigDecimal income;
private BigDecimal expense;

public Integer getItemInteger1() {
return itemInteger1;
public ComponentA() {
}

public void setItemInteger1(Integer itemInteger1) {
this.itemInteger1 = itemInteger1;
public ComponentA(BigDecimal income, BigDecimal expense) {
this.income = income;
this.expense = expense;
}
}
}