HHH-19202 Fix array_intersects function with array parameters

hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayIntersectsFunction.java

@@ -6,7 +6,6 @@
 
 import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
 import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
-import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
 import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers;
 import org.hibernate.type.spi.TypeConfiguration;
 
@@ -26,10 +25,7 @@ public AbstractArrayIntersectsFunction(boolean nullable, TypeConfiguration typeC
 						ArraysOfSameTypeArgumentValidator.INSTANCE
 				),
 				StandardFunctionReturnTypeResolvers.invariant( typeConfiguration.standardBasicTypeForJavaType( Boolean.class ) ),
-				StandardFunctionArgumentTypeResolvers.byArgument(
-						StandardFunctionArgumentTypeResolvers.argumentsOrImplied( 1 ),
-						StandardFunctionArgumentTypeResolvers.argumentsOrImplied( 0 )
-				)
+				ArrayIntersectsArgumentTypeResolver.INSTANCE
 		);
 		this.nullable = nullable;
 	}

hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsArgumentTypeResolver.java

@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.metamodel.mapping.MappingModelExpressible;
+import org.hibernate.query.sqm.produce.function.FunctionArgumentTypeResolver;
+import org.hibernate.query.sqm.produce.function.internal.AbstractFunctionArgumentTypeResolver;
+import org.hibernate.query.sqm.sql.SqmToSqlAstConverter;
+import org.hibernate.query.sqm.tree.SqmTypedNode;
+import org.hibernate.query.sqm.tree.expression.SqmExpression;
+import org.hibernate.type.BasicPluralType;
+
+import java.util.List;
+
+/**
+ * A {@link FunctionArgumentTypeResolver} that resolves the argument types for the {@code array_intersects} function.
+ */
+public class ArrayIntersectsArgumentTypeResolver implements AbstractFunctionArgumentTypeResolver {
+
+	public static final FunctionArgumentTypeResolver INSTANCE = new ArrayIntersectsArgumentTypeResolver();
+
+	@Override
+	public @Nullable MappingModelExpressible<?> resolveFunctionArgumentType(List<? extends SqmTypedNode<?>> arguments, int argumentIndex, SqmToSqlAstConverter converter) {
+		if ( argumentIndex == 0 ) {
+			final SqmTypedNode<?> node = arguments.get( 1 );
+			if ( node instanceof SqmExpression<?> sqmExpression ) {
+				final MappingModelExpressible<?> expressible = converter.determineValueMapping( sqmExpression );
+				if ( expressible instanceof BasicPluralType<?, ?> ) {
+					return expressible;
+				}
+			}
+		}
+		else if ( argumentIndex == 1 ) {
+			final SqmTypedNode<?> node = arguments.get( 0 );
+			if ( node instanceof SqmExpression<?> sqmExpression ) {
+				final MappingModelExpressible<?> expressible = converter.determineValueMapping( sqmExpression );
+				if ( expressible instanceof BasicPluralType<?, ?> ) {
+					return expressible;
+				}
+			}
+		}
+		return null;
+	}
+}

hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIntersectsFunction.java

@@ -7,6 +7,7 @@
 import java.util.List;
 
 import org.hibernate.metamodel.model.domain.ReturnableType;
+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;
@@ -50,15 +51,15 @@ public void render(
 			sqlAppender.append( ",null) and " );
 		}
 		sqlAppender.append( "exists(select array_get(" );
-		needleExpression.accept( walker );
+		walker.render( needleExpression, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
 		sqlAppender.append( ",t.i) from system_range(1," );
 		sqlAppender.append( Integer.toString( maximumArraySize ) );
 		sqlAppender.append( ") t(i) where array_length(" );
 		needleExpression.accept( walker );
 		sqlAppender.append( ")>=t.i" );
 		sqlAppender.append( " intersect " );
 		sqlAppender.append( "select array_get(" );
-		haystackExpression.accept( walker );
+		walker.render( haystackExpression, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
 		sqlAppender.append( ",t.i) from system_range(1," );
 		sqlAppender.append( Integer.toString( maximumArraySize ) );
 		sqlAppender.append( ") t(i) where array_length(" );

hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayIntersectsTest.java

@@ -174,4 +174,15 @@ public void testIntersectsSyntax(SessionFactoryScope scope) {
 		} );
 	}
 
+	@Test
+	public void testArrayParameter(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			List<EntityWithArrays> results = em.createQuery( "from EntityWithArrays e where array_intersects(e.theArray, :array)", EntityWithArrays.class )
+					.setParameter( "array", new String[]{ "abc", "xyz" } )
+					.getResultList();
+			assertEquals( 1, results.size() );
+			assertEquals( 2L, results.get( 0 ).getId() );
+		} );
+	}
+
 }