HHH-19490 Apply review feedbacks and fix testcase to work well with H2

Author: chanzxxx

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

@@ -38,10 +38,7 @@ public void validate(
 			if ( elementIndex < arguments.size() ) {
 				final SqmTypedNode<?> elementArgument = arguments.get( elementIndex );
 				final SqmBindableType<?> expressible = elementArgument.getExpressible();
-				if (expressible == null) {
-					return;
-				}
-				final SqmExpressible<?> elementType = expressible.getSqmType();
+				final SqmExpressible<?> elementType = expressible != null ? expressible.getSqmType() : null;
 				if ( expectedElementType != null && elementType != null && expectedElementType != elementType ) {
 					throw new FunctionArgumentException(
 							String.format(

hibernate-core/src/test/java/org/hibernate/orm/test/query/QuerySelectWhereArrayPositionTest.java

@@ -7,12 +7,13 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
-import org.hibernate.dialect.PostgreSQLDialect;
+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.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -26,7 +27,8 @@
 		}
 )
 @SessionFactory
-@RequiresDialect( PostgreSQLDialect.class )
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsStructuralArrays.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsArrayPositions.class)
 @JiraKey("HHH-19490")
 public class QuerySelectWhereArrayPositionTest {
 	@BeforeEach
@@ -40,15 +42,20 @@ public void setUp(SessionFactoryScope scope) {
 		);
 	}
 
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+	}
+
 	@Test
 	public void testSelectWhereArrayPosition(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			List<TestEntity> result = session.createQuery( "select testEntity "
 														+ "from TestEntity testEntity "
-														+ "where ARRAY_POSITION(testEntity.values, ?1) IS NOT NULL", TestEntity.class )
-					.setParameter( 1, 3)
+														+ "where ARRAY_POSITION(testEntity.numbers, ?1) > 0", TestEntity.class )
+					.setParameter( 1, 2 )
 					.getResultList();
-			assertThat( result.size() ).isEqualTo( 3 );
+			assertThat( result.size() ).isEqualTo( 2 );
 		} );
 	}
 
@@ -59,13 +66,13 @@ public static class TestEntity {
 		@GeneratedValue
 		private Long id;
 
-		private List<Integer> values;
+		private List<Integer> numbers;
 
 		public TestEntity() {
 		}
 
-		public TestEntity(List<Integer> values) {
-			this.values = values;
+		public TestEntity(List<Integer> numbers) {
+			this.numbers = numbers;
 		}
 	}
 }