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

HHH-16425 Handle path sources in function return type resolvers

This commit is contained in:
Marco Belladelli 2023-04-12 10:38:42 +02:00 committed by Christian Beikov
parent c5c237e70e
commit 0d9ef5444a
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionReturnTypeResolvers.java
View File

@ -18,6 +18,7 @@ import org.hibernate.metamodel.mapping.JdbcMapping;
import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.JdbcMappingContainer;
import org.hibernate.query.ReturnableType; import org.hibernate.query.ReturnableType;
import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.SqmExpressible;
import org.hibernate.query.sqm.SqmPathSource;
import org.hibernate.query.sqm.tree.SqmTypedNode; import org.hibernate.query.sqm.tree.SqmTypedNode;
import org.hibernate.sql.ast.tree.SqlAstNode; import org.hibernate.sql.ast.tree.SqlAstNode;
import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Expression;
@ -103,10 +104,14 @@ public class StandardFunctionReturnTypeResolvers {
} }
@Override @Override
public ReturnableType<?> resolveFunctionReturnType(ReturnableType<?> impliedType, List<? extends SqmTypedNode<?>> arguments, TypeConfiguration typeConfiguration) { public ReturnableType<?> resolveFunctionReturnType(
ReturnableType<?> impliedType,
List<? extends SqmTypedNode<?>> arguments,
TypeConfiguration typeConfiguration) {
for ( SqmTypedNode<?> arg : arguments ) { for ( SqmTypedNode<?> arg : arguments ) {
if (arg!=null && arg.getNodeType() instanceof ReturnableType ) { final SqmExpressible<?> argumentNodeType = arg != null ? getArgumentExpressible( arg ) : null;
ReturnableType<?> argType = (ReturnableType<?>) arg.getNodeType(); if ( argumentNodeType instanceof ReturnableType ) {
ReturnableType<?> argType = (ReturnableType<?>) argumentNodeType;
return isAssignableTo( argType, impliedType ) ? impliedType : argType; return isAssignableTo( argType, impliedType ) ? impliedType : argType;
} }
} }
@ -208,7 +213,7 @@ public class StandardFunctionReturnTypeResolvers {
List<? extends SqmTypedNode<?>> arguments, List<? extends SqmTypedNode<?>> arguments,
int position) { int position) {
final SqmTypedNode<?> specifiedArgument = arguments.get( position - 1 ); final SqmTypedNode<?> specifiedArgument = arguments.get( position - 1 );
final SqmExpressible<?> specifiedArgType = specifiedArgument.getNodeType(); final SqmExpressible<?> specifiedArgType = getArgumentExpressible( specifiedArgument );
if ( !(specifiedArgType instanceof ReturnableType ) ) { if ( !(specifiedArgType instanceof ReturnableType ) ) {
throw new QueryException( throw new QueryException(
String.format( String.format(
@ -224,6 +229,13 @@ public class StandardFunctionReturnTypeResolvers {
return (ReturnableType<?>) specifiedArgType; return (ReturnableType<?>) specifiedArgType;
} }
private static SqmExpressible<?> getArgumentExpressible(SqmTypedNode<?> specifiedArgument) {
final SqmExpressible<?> specifiedArgType = specifiedArgument.getNodeType();
return specifiedArgType instanceof SqmPathSource ?
( (SqmPathSource<?>) specifiedArgType ).getSqmPathType() :
specifiedArgType;
}
public static JdbcMapping extractArgumentJdbcMapping( public static JdbcMapping extractArgumentJdbcMapping(
TypeConfiguration typeConfiguration, TypeConfiguration typeConfiguration,
List<? extends SqmTypedNode<?>> arguments, List<? extends SqmTypedNode<?>> arguments,