Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-03-07 10:19:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-18274 Properly resolving Java type in binary and unary expressions

Browse Source
This commit is contained in:
Cedomir Igaly 2024-06-14 12:46:42 +02:00 committed by Marco Belladelli
parent 63e90a3dcb
commit aeb7601ac9
3 changed files with 8 additions and 9 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/internal/TypecheckUtil.java
View File

@ -491,8 +491,8 @@ else if ( !isTypeAssignable( targetType, expressionType, bindingContext) ) {
} }
public static void assertOperable(SqmExpression<?> left, SqmExpression<?> right, BinaryArithmeticOperator op) { public static void assertOperable(SqmExpression<?> left, SqmExpression<?> right, BinaryArithmeticOperator op) {
final SqmExpressible<?> leftNodeType = left.getNodeType(); final SqmExpressible<?> leftNodeType = left.getExpressible();
final SqmExpressible<?> rightNodeType = right.getNodeType(); final SqmExpressible<?> rightNodeType = right.getExpressible();
if ( leftNodeType != null && rightNodeType != null ) { if ( leftNodeType != null && rightNodeType != null ) {
final Class<?> leftJavaType = leftNodeType.getRelationalJavaType().getJavaTypeClass(); final Class<?> leftJavaType = leftNodeType.getRelationalJavaType().getJavaTypeClass();
final Class<?> rightJavaType = rightNodeType.getRelationalJavaType().getJavaTypeClass(); final Class<?> rightJavaType = rightNodeType.getRelationalJavaType().getJavaTypeClass();
@ -628,7 +628,7 @@ public static void assertDuration(SqmExpression<?> expression) {
} }
public static void assertNumeric(SqmExpression<?> expression, UnaryArithmeticOperator op) { public static void assertNumeric(SqmExpression<?> expression, UnaryArithmeticOperator op) {
final SqmExpressible<?> nodeType = expression.getNodeType(); final SqmExpressible<?> nodeType = expression.getExpressible();
if ( nodeType != null ) { if ( nodeType != null ) {
if ( !( nodeType.getSqmType() instanceof JdbcMapping jdbcMapping ) if ( !( nodeType.getSqmType() instanceof JdbcMapping jdbcMapping )
|| !jdbcMapping.getJdbcType().isNumber() ) { || !jdbcMapping.getJdbcType().isNumber() ) {

9
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmBinaryArithmetic.java
View File

@ -12,7 +12,6 @@
import org.hibernate.query.sqm.tree.SqmCopyContext; import org.hibernate.query.sqm.tree.SqmCopyContext;
import org.hibernate.query.sqm.tree.select.SqmSelectableNode; import org.hibernate.query.sqm.tree.select.SqmSelectableNode;
import static org.hibernate.query.sqm.BinaryArithmeticOperator.ADD; import static org.hibernate.query.sqm.BinaryArithmeticOperator.ADD;
import static org.hibernate.query.sqm.BinaryArithmeticOperator.SUBTRACT; import static org.hibernate.query.sqm.BinaryArithmeticOperator.SUBTRACT;
import static org.hibernate.type.spi.TypeConfiguration.isDuration; import static org.hibernate.type.spi.TypeConfiguration.isDuration;
@ -34,8 +33,8 @@ public SqmBinaryArithmetic(
//noinspection unchecked //noinspection unchecked
super( super(
(SqmExpressible<T>) domainModel.getTypeConfiguration().resolveArithmeticType( (SqmExpressible<T>) domainModel.getTypeConfiguration().resolveArithmeticType(
lhsOperand.getNodeType(), lhsOperand.getExpressible(),
rhsOperand.getNodeType(), rhsOperand.getExpressible(),
operator operator
), ),
nodeBuilder nodeBuilder
@ -49,8 +48,8 @@ public SqmBinaryArithmetic(
( operator == ADD || operator == SUBTRACT ) ) { ( operator == ADD || operator == SUBTRACT ) ) {
return; return;
} }
this.lhsOperand.applyInferableType( rhsOperand.getNodeType() ); this.lhsOperand.applyInferableType( rhsOperand.getExpressible() );
this.rhsOperand.applyInferableType( lhsOperand.getNodeType() ); this.rhsOperand.applyInferableType( lhsOperand.getExpressible() );
} }
public SqmBinaryArithmetic( public SqmBinaryArithmetic(

2
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmUnaryOperation.java
View File

@ -22,7 +22,7 @@ public SqmUnaryOperation(UnaryArithmeticOperator operation, SqmExpression<T> ope
operation, operation,
operand, operand,
operand.nodeBuilder().getTypeConfiguration().getBasicTypeForJavaType( operand.nodeBuilder().getTypeConfiguration().getBasicTypeForJavaType(
operand.getNodeType().getRelationalJavaType().getJavaType() operand.getExpressible().getRelationalJavaType().getJavaType()
) )
); );
} }