Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ public ArrayAndElementArgumentTypeResolver(int arrayIndex, int... elementIndexes
public @Nullable MappingModelExpressible<?> resolveFunctionArgumentType(List<? extends SqmTypedNode<?>> arguments, int argumentIndex, SqmToSqlAstConverter converter) {
if ( argumentIndex == arrayIndex ) {
for ( int elementIndex : elementIndexes ) {
if ( elementIndex >= arguments.size() ) {
continue;
}
final SqmTypedNode<?> node = arguments.get( elementIndex );
if ( node instanceof SqmExpression<?> sqmExpression ) {
final MappingModelExpressible<?> expressible = converter.determineValueMapping( sqmExpression );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ public ArrayToStringFunction(TypeConfiguration typeConfiguration) {
"array_to_string",
FunctionKind.NORMAL,
StandardArgumentsValidators.composite(
new ArgumentTypesValidator( StandardArgumentsValidators.between( 2, 3 ), ANY, STRING, ANY )
new ArgumentTypesValidator( StandardArgumentsValidators.between( 2, 3 ), ANY, STRING, STRING )
),
StandardFunctionReturnTypeResolvers.invariant(
typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.STRING )
),
StandardFunctionArgumentTypeResolvers.composite(
new ArrayAndElementArgumentTypeResolver( 0, 2 ),
StandardFunctionArgumentTypeResolvers.invariant( typeConfiguration, ANY, STRING )
StandardFunctionArgumentTypeResolvers.invariant( typeConfiguration, ANY, STRING, STRING )
)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@
import java.util.List;

import org.hibernate.metamodel.model.domain.ReturnableType;
import org.hibernate.query.sqm.function.SelfRenderingOrderedSetAggregateFunctionSqlAstExpression;
import org.hibernate.sql.ast.Clause;
import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
import org.hibernate.sql.ast.SqlAstTranslator;
import org.hibernate.sql.ast.spi.SqlAppender;
import org.hibernate.sql.ast.tree.SqlAstNode;
import org.hibernate.sql.ast.tree.expression.Expression;
import org.hibernate.sql.ast.tree.predicate.Predicate;
import org.hibernate.sql.ast.tree.select.SortSpecification;
import org.hibernate.type.BasicPluralType;
import org.hibernate.type.SqlTypes;
import org.hibernate.type.spi.TypeConfiguration;
Expand Down Expand Up @@ -41,39 +46,94 @@ public void render(
final BasicPluralType<?, ?> pluralType = (BasicPluralType<?, ?>) arrayExpression.getExpressionType().getSingleJdbcMapping();
final int ddlTypeCode = pluralType.getElementType().getJdbcType().getDdlTypeCode();
final boolean needsCast = !SqlTypes.isStringType( ddlTypeCode );
sqlAppender.append( "case when " );
arrayExpression.accept( walker );
sqlAppender.append( " is not null then coalesce((select listagg(" );
if ( defaultExpression != null ) {
sqlAppender.append( "coalesce(" );
}
if ( needsCast ) {
if ( ddlTypeCode == SqlTypes.BOOLEAN ) {
// By default, H2 uses upper case, so lower it for a consistent experience
sqlAppender.append( "lower(" );
if ( arrayExpression instanceof SelfRenderingOrderedSetAggregateFunctionSqlAstExpression<?> functionExpression
&& ArrayAggFunction.FUNCTION_NAME.equals( functionExpression.getFunctionName() ) ) {
// When the array argument is an aggregate expression, we access its contents directly
final Expression arrayElementExpression = (Expression) functionExpression.getArguments().get( 0 );
final List<SortSpecification> withinGroup = functionExpression.getWithinGroup();
final Predicate filter = functionExpression.getFilter();

sqlAppender.append( "listagg(" );
if ( defaultExpression != null ) {
sqlAppender.append( "coalesce(" );
}
sqlAppender.append( "cast(" );
}
sqlAppender.append( "array_get(" );
arrayExpression.accept( walker );
sqlAppender.append(",i.idx)" );
if ( needsCast ) {
sqlAppender.append( " as varchar)" );
if ( ddlTypeCode == SqlTypes.BOOLEAN ) {
if ( needsCast ) {
if ( ddlTypeCode == SqlTypes.BOOLEAN ) {
// By default, H2 uses upper case, so lower it for a consistent experience
sqlAppender.append( "lower(" );
}
sqlAppender.append( "cast(" );
}
arrayElementExpression.accept( walker );
if ( needsCast ) {
sqlAppender.append( " as varchar)" );
if ( ddlTypeCode == SqlTypes.BOOLEAN ) {
sqlAppender.append( ')' );
}
}
if ( defaultExpression != null ) {
sqlAppender.append( ',' );
defaultExpression.accept( walker );
sqlAppender.append( ')' );
}
sqlAppender.append( "," );
walker.render( separatorExpression, SqlAstNodeRenderingMode.DEFAULT );
sqlAppender.appendSql( ')' );

if ( withinGroup != null && !withinGroup.isEmpty() ) {
walker.getCurrentClauseStack().push( Clause.WITHIN_GROUP );
sqlAppender.appendSql( " within group (order by " );
withinGroup.get( 0 ).accept( walker );
for ( int i = 1; i < withinGroup.size(); i++ ) {
sqlAppender.appendSql( ',' );
withinGroup.get( i ).accept( walker );
}
sqlAppender.appendSql( ')' );
walker.getCurrentClauseStack().pop();
}
if ( filter != null ) {
walker.getCurrentClauseStack().push( Clause.WHERE );
sqlAppender.appendSql( " filter (where " );
filter.accept( walker );
sqlAppender.appendSql( ')' );
walker.getCurrentClauseStack().pop();
}
}
if ( defaultExpression != null ) {
sqlAppender.append( ',' );
defaultExpression.accept( walker );
sqlAppender.append( ')' );
else {
sqlAppender.append( "case when " );
arrayExpression.accept( walker );
sqlAppender.append( " is not null then coalesce((select listagg(" );
if ( defaultExpression != null ) {
sqlAppender.append( "coalesce(" );
}
if ( needsCast ) {
if ( ddlTypeCode == SqlTypes.BOOLEAN ) {
// By default, H2 uses upper case, so lower it for a consistent experience
sqlAppender.append( "lower(" );
}
sqlAppender.append( "cast(" );
}
sqlAppender.append( "array_get(" );
arrayExpression.accept( walker );
sqlAppender.append( ",i.idx)" );
if ( needsCast ) {
sqlAppender.append( " as varchar)" );
if ( ddlTypeCode == SqlTypes.BOOLEAN ) {
sqlAppender.append( ')' );
}
}
if ( defaultExpression != null ) {
sqlAppender.append( ',' );
defaultExpression.accept( walker );
sqlAppender.append( ')' );
}
sqlAppender.append( "," );
walker.render( separatorExpression, SqlAstNodeRenderingMode.DEFAULT );
sqlAppender.append( ") within group (order by i.idx) from system_range(1," );
sqlAppender.append( Integer.toString( maximumArraySize ) );
sqlAppender.append( ") i(idx) where i.idx<=coalesce(cardinality(" );
arrayExpression.accept( walker );
sqlAppender.append( "),0)),'') end" );
}
sqlAppender.append("," );
separatorExpression.accept( walker );
sqlAppender.append( ") within group (order by i.idx) from system_range(1,");
sqlAppender.append( Integer.toString( maximumArraySize ) );
sqlAppender.append( ") i(idx) where i.idx<=coalesce(cardinality(");
arrayExpression.accept( walker );
sqlAppender.append("),0)),'') end" );
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@
import java.util.List;

import org.hibernate.metamodel.model.domain.ReturnableType;
import org.hibernate.query.sqm.function.SelfRenderingOrderedSetAggregateFunctionSqlAstExpression;
import org.hibernate.sql.ast.Clause;
import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
import org.hibernate.sql.ast.SqlAstTranslator;
import org.hibernate.sql.ast.spi.SqlAppender;
import org.hibernate.sql.ast.tree.SqlAstNode;
import org.hibernate.sql.ast.tree.expression.Expression;
import org.hibernate.sql.ast.tree.predicate.Predicate;
import org.hibernate.sql.ast.tree.select.SortSpecification;
import org.hibernate.type.BasicPluralType;
import org.hibernate.type.SqlTypes;
import org.hibernate.type.spi.TypeConfiguration;
Expand All @@ -37,36 +41,91 @@ public void render(
final BasicPluralType<?, ?> pluralType = (BasicPluralType<?, ?>) arrayExpression.getExpressionType().getSingleJdbcMapping();
final int ddlTypeCode = pluralType.getElementType().getJdbcType().getDdlTypeCode();
final boolean needsCast = !SqlTypes.isStringType( ddlTypeCode );
sqlAppender.append( "case when " );
arrayExpression.accept( walker );
sqlAppender.append( " is not null then coalesce((select group_concat(" );
if ( defaultExpression != null ) {
sqlAppender.append( "coalesce(" );
}
if ( needsCast ) {
if ( ddlTypeCode == SqlTypes.BOOLEAN ) {
// By default, HSQLDB uses upper case, so lower it for a consistent experience
sqlAppender.append( "lower(" );
if ( arrayExpression instanceof SelfRenderingOrderedSetAggregateFunctionSqlAstExpression<?> functionExpression
&& ArrayAggFunction.FUNCTION_NAME.equals( functionExpression.getFunctionName() ) ) {
// When the array argument is an aggregate expression, we access its contents directly
final Expression arrayElementExpression = (Expression) functionExpression.getArguments().get( 0 );
final List<SortSpecification> withinGroup = functionExpression.getWithinGroup();
final Predicate filter = functionExpression.getFilter();

sqlAppender.append( "group_concat(" );
if ( defaultExpression != null ) {
sqlAppender.append( "coalesce(" );
}
sqlAppender.append( "cast(" );
}
sqlAppender.append( "t.val" );
if ( needsCast ) {
sqlAppender.append( " as longvarchar)" );
if ( ddlTypeCode == SqlTypes.BOOLEAN ) {
sqlAppender.append( ')' );
if ( needsCast ) {
if ( ddlTypeCode == SqlTypes.BOOLEAN ) {
// By default, HSQLDB uses upper case, so lower it for a consistent experience
sqlAppender.append( "lower(" );
}
sqlAppender.append( "cast(" );
}
arrayElementExpression.accept( walker );
if ( needsCast ) {
sqlAppender.append( " as longvarchar)" );
if ( ddlTypeCode == SqlTypes.BOOLEAN ) {
sqlAppender.append( ')' );
}
}
if ( defaultExpression != null ) {
sqlAppender.append( "," );
defaultExpression.accept( walker );
sqlAppender.append( ")" );
}

if ( withinGroup != null && !withinGroup.isEmpty() ) {
walker.getCurrentClauseStack().push( Clause.WITHIN_GROUP );
sqlAppender.appendSql( " order by " );
withinGroup.get( 0 ).accept( walker );
for ( int i = 1; i < withinGroup.size(); i++ ) {
sqlAppender.appendSql( ',' );
withinGroup.get( i ).accept( walker );
}
walker.getCurrentClauseStack().pop();
}
sqlAppender.append( " separator " );
// HSQLDB doesn't like non-literals as separator
walker.render( separatorExpression, SqlAstNodeRenderingMode.INLINE_PARAMETERS );
sqlAppender.appendSql( ')' );
if ( filter != null ) {
walker.getCurrentClauseStack().push( Clause.WHERE );
sqlAppender.appendSql( " filter (where " );
filter.accept( walker );
sqlAppender.appendSql( ')' );
walker.getCurrentClauseStack().pop();
}
}
if ( defaultExpression != null ) {
sqlAppender.append( "," );
defaultExpression.accept( walker );
sqlAppender.append( ")" );
else {
sqlAppender.append( "case when " );
arrayExpression.accept( walker );
sqlAppender.append( " is not null then coalesce((select group_concat(" );
if ( defaultExpression != null ) {
sqlAppender.append( "coalesce(" );
}
if ( needsCast ) {
if ( ddlTypeCode == SqlTypes.BOOLEAN ) {
// By default, HSQLDB uses upper case, so lower it for a consistent experience
sqlAppender.append( "lower(" );
}
sqlAppender.append( "cast(" );
}
sqlAppender.append( "t.val" );
if ( needsCast ) {
sqlAppender.append( " as longvarchar)" );
if ( ddlTypeCode == SqlTypes.BOOLEAN ) {
sqlAppender.append( ')' );
}
}
if ( defaultExpression != null ) {
sqlAppender.append( "," );
defaultExpression.accept( walker );
sqlAppender.append( ")" );
}
sqlAppender.append( " order by t.idx separator " );
// HSQLDB doesn't like non-literals as separator
walker.render( separatorExpression, SqlAstNodeRenderingMode.INLINE_PARAMETERS );
sqlAppender.append( ") from unnest(" );
arrayExpression.accept( walker );
sqlAppender.append( ") with ordinality t(val,idx)),'') end" );
}
sqlAppender.append( " order by t.idx separator " );
// HSQLDB doesn't like non-literals as separator
walker.render( separatorExpression, SqlAstNodeRenderingMode.INLINE_PARAMETERS );
sqlAppender.append( ") from unnest(");
arrayExpression.accept( walker );
sqlAppender.append(") with ordinality t(val,idx)),'') end" );
}
}
Loading