HHH-18851 Fix parameter type inference issue when IN predicate is uses array_contains()

Author: beikov

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

@@ -43,10 +43,15 @@ public class ArrayContainsArgumentTypeResolver extends AbstractFunctionArgumentT
 			}
 		}
 		else if ( argumentIndex == 1 ) {
+			final SqmTypedNode<?> nodeToResolve = arguments.get( 1 );
+			if ( nodeToResolve.getExpressible() instanceof MappingModelExpressible<?> ) {
+				// If the node already has suitable type, don't infer it to be treated as an array
+				return null;
+			}
 			final SqmTypedNode<?> node = arguments.get( 0 );
 			if ( node instanceof SqmExpression<?> ) {
 				final MappingModelExpressible<?> expressible = converter.determineValueMapping( (SqmExpression<?>) node );
-				if ( expressible != null ) {
+				if ( expressible instanceof BasicPluralType<?, ?> ) {
 					return expressible;
 				}
 			}

hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java

@@ -3494,11 +3494,14 @@ else if ( inListContext instanceof HqlParser.ArrayInListContext ) {
 
 			final SqmExpression<?> arrayExpr = (SqmExpression<?>) arrayInListContext.expression().accept( this );
 			final SqmExpressible<?> arrayExpressible = arrayExpr.getExpressible();
-			if ( arrayExpressible != null && !( arrayExpressible.getSqmType() instanceof BasicPluralType<?, ?>) ) {
-				throw new SemanticException(
-						"Right operand for in-array predicate must be a basic plural type expression, but found: " + arrayExpressible.getSqmType(),
-						query
-				);
+			if ( arrayExpressible != null ) {
+				if ( !(arrayExpressible.getSqmType() instanceof BasicPluralType<?, ?> pluralType) ) {
+					throw new SemanticException(
+							"Right operand for in-array predicate must be a basic plural type expression, but found: " + arrayExpressible.getSqmType(),
+							query
+					);
+				}
+				testExpression.applyInferableType( pluralType.getElementType() );
 			}
 			final SelfRenderingSqmFunction<Boolean> contains = getFunctionDescriptor( "array_contains" ).generateSqmExpression(
 					asList( arrayExpr, testExpression ),

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

@@ -15,6 +15,7 @@
 import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -156,4 +157,22 @@ public void testInSyntax(SessionFactoryScope scope) {
 		} );
 	}
 
+	@Test
+	@JiraKey( "HHH-18851" )
+	public void testInArray(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			List<Tuple> results = em.createQuery(
+							"select e.id " +
+									"from EntityWithArrays e " +
+									"where :p in e.theArray",
+							Tuple.class
+					)
+					.setParameter( "p", "abc" )
+					.getResultList();
+
+			assertEquals( 1, results.size() );
+			assertEquals( 2L, results.get( 0 ).get( 0 ) );
+		} );
+	}
+
 }

hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/IdClassSyntheticAttributesTest.java

@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.idClass;
 
@@ -16,23 +14,23 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DomainModel(
-        annotatedClasses = MyEntity.class
+		annotatedClasses = MyEntity.class
 )
 @SessionFactory
 public class IdClassSyntheticAttributesTest {
 
-    @Jira("https://hibernate.atlassian.net/browse/HHH-18841")
-    @Test
-    public void test(DomainModelScope scope) {
-        final PersistentClass entityBinding = scope.getDomainModel().getEntityBinding(MyEntity.class.getName());
-        assertThat(entityBinding.getProperties()).hasSize(2)
-                .anySatisfy(p -> {
-                    assertThat(p.isSynthetic()).isTrue();
-                    assertThat(p.getName()).isEqualTo("_identifierMapper");
-                })
-                .anySatisfy(p -> {
-                    assertThat(p.isSynthetic()).isFalse();
-                    assertThat(p.getName()).isEqualTo("notes");
-                });
-    }
+	@Jira("https://hibernate.atlassian.net/browse/HHH-18841")
+	@Test
+	public void test(DomainModelScope scope) {
+		final PersistentClass entityBinding = scope.getDomainModel().getEntityBinding(MyEntity.class.getName());
+		assertThat(entityBinding.getProperties()).hasSize(2)
+				.anySatisfy(p -> {
+					assertThat(p.isSynthetic()).isTrue();
+					assertThat(p.getName()).isEqualTo("_identifierMapper");
+				})
+				.anySatisfy(p -> {
+					assertThat(p.isSynthetic()).isFalse();
+					assertThat(p.getName()).isEqualTo("notes");
+				});
+	}
 }