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

make SelfRenderingFunctionSqlAstExpression not blow up with NPE 

this doesn't exactly *fix* cases with a nonsensible argument list,
but it at least gives us a chance to produce a more meaningful error
This commit is contained in:
Gavin 2023-01-11 11:12:24 +01:00 committed by Gavin King
parent 296cbb88bd
commit 1606953a32
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingFunctionSqlAstExpression.java
View File

@ -73,10 +73,9 @@ public class SelfRenderingFunctionSqlAstExpression
@Override
public JdbcMappingContainer getExpressionType() {
if ( type instanceof SqlExpressible) {
return (JdbcMappingContainer) type;
}
return expressible;
return type instanceof SqlExpressible
? (JdbcMappingContainer) type
: expressible;
}
protected FunctionRenderingSupport getRenderer() {
@ -107,10 +106,14 @@ public class SelfRenderingFunctionSqlAstExpression
jdbcJavaType = jdbcMapping.getJdbcJavaType();
converter = jdbcMapping.getValueConverter();
}
else {
else if ( type != null ) {
jdbcJavaType = type.getExpressibleJavaType();
converter = null;
}
else {
jdbcJavaType = null;
converter = null;
}
final SqlAstCreationState sqlAstCreationState = creationState.getSqlAstCreationState();
return new BasicResult(
sqlAstCreationState.getSqlExpressionResolver()
@ -123,7 +126,7 @@ public class SelfRenderingFunctionSqlAstExpression
)
.getValuesArrayPosition(),
resultVariable,
type.getExpressibleJavaType(),
type == null ? null : type.getExpressibleJavaType(),
converter
);
}
@ -178,9 +181,15 @@ public class SelfRenderingFunctionSqlAstExpression
@Override
public JdbcMapping getJdbcMapping() {
return type instanceof SqlExpressible
? ( (SqlExpressible) type ).getJdbcMapping()
: ( (SqlExpressible) expressible ).getJdbcMapping();
if ( type instanceof SqlExpressible ) {
return ( (SqlExpressible) type ).getJdbcMapping();
}
else if ( expressible instanceof SqlExpressible ) {
return ( (SqlExpressible) expressible ).getJdbcMapping();
}
else {
return null;
}
}
@Override