HHH-17355 Smoothen some rough edges with parameter typing and PG12 support

Author: beikov

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java

@@ -477,8 +477,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arrayRemoveIndex_unnest( true );
 		functionFactory.arraySlice_operator();
 		functionFactory.arrayReplace();
-		functionFactory.arrayTrim_trim_array();
-		functionFactory.arrayFill_postgresql();
+		functionFactory.arrayTrim_unnest();
+		functionFactory.arrayFill_cockroachdb();
 		functionFactory.arrayToString_postgresql();
 
 		functionContributions.getFunctionRegistry().register(

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java

@@ -597,7 +597,12 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arrayRemoveIndex_unnest( true );
 		functionFactory.arraySlice_operator();
 		functionFactory.arrayReplace();
-		functionFactory.arrayTrim_trim_array();
+		if ( getVersion().isSameOrAfter( 14 ) ) {
+			functionFactory.arrayTrim_trim_array();
+		}
+		else {
+			functionFactory.arrayTrim_unnest();
+		}
 		functionFactory.arrayFill_postgresql();
 		functionFactory.arrayToString_postgresql();
 

hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java

@@ -464,8 +464,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arrayRemoveIndex_unnest( true );
 		functionFactory.arraySlice_operator();
 		functionFactory.arrayReplace();
-		functionFactory.arrayTrim_trim_array();
-		functionFactory.arrayFill_postgresql();
+		functionFactory.arrayTrim_unnest();
+		functionFactory.arrayFill_cockroachdb();
 		functionFactory.arrayToString_postgresql();
 
 		functionContributions.getFunctionRegistry().register(

hibernate-core/src/main/java/org/hibernate/dialect/MySQLSqlAstTranslator.java

@@ -46,7 +46,7 @@ public static String getSqlType(CastTarget castTarget, Dialect dialect) {
 	}
 
 	public static String getSqlType(CastTarget castTarget, SessionFactoryImplementor factory) {
-		final String sqlType = getCastTypeName( castTarget, factory );
+		final String sqlType = getCastTypeName( castTarget, factory.getTypeConfiguration() );
 		return getSqlType( castTarget, sqlType, factory.getJdbcServices().getDialect() );
 	}
 

hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java

@@ -645,7 +645,12 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arrayRemoveIndex_unnest( true );
 		functionFactory.arraySlice_operator();
 		functionFactory.arrayReplace();
-		functionFactory.arrayTrim_trim_array();
+		if ( getVersion().isSameOrAfter( 14 ) ) {
+			functionFactory.arrayTrim_trim_array();
+		}
+		else {
+			functionFactory.arrayTrim_unnest();
+		}
 		functionFactory.arrayFill_postgresql();
 		functionFactory.arrayToString_postgresql();
 

hibernate-core/src/main/java/org/hibernate/dialect/function/CommonFunctionFactory.java

@@ -30,6 +30,7 @@
 import org.hibernate.dialect.function.array.ArraySliceUnnestFunction;
 import org.hibernate.dialect.function.array.ArrayToStringFunction;
 import org.hibernate.dialect.function.array.ArrayViaArgumentReturnTypeResolver;
+import org.hibernate.dialect.function.array.CockroachArrayFillFunction;
 import org.hibernate.dialect.function.array.ElementViaArrayArgumentReturnTypeResolver;
 import org.hibernate.dialect.function.array.H2ArrayContainsFunction;
 import org.hibernate.dialect.function.array.H2ArrayFillFunction;
@@ -72,6 +73,7 @@
 import org.hibernate.dialect.function.array.OracleArrayConstructorFunction;
 import org.hibernate.dialect.function.array.OracleArrayContainsFunction;
 import org.hibernate.dialect.function.array.PostgreSQLArrayPositionsFunction;
+import org.hibernate.dialect.function.array.PostgreSQLArrayTrimEmulation;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
 import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator;
 import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
@@ -3166,6 +3168,13 @@ public void arrayTrim_trim_array() {
 				.register();
 	}
 
+	/**
+	 * PostgreSQL array_trim() emulation for versions before 14
+	 */
+	public void arrayTrim_unnest() {
+		functionRegistry.register( "array_trim", new PostgreSQLArrayTrimEmulation() );
+	}
+
 	/**
 	 * Oracle array_trim() function
 	 */
@@ -3197,6 +3206,14 @@ public void arrayFill_postgresql() {
 		functionRegistry.register( "array_fill_list", new PostgreSQLArrayFillFunction( true ) );
 	}
 
+	/**
+	 * Cockroach array_fill() function
+	 */
+	public void arrayFill_cockroachdb() {
+		functionRegistry.register( "array_fill", new CockroachArrayFillFunction( false ) );
+		functionRegistry.register( "array_fill_list", new CockroachArrayFillFunction( true ) );
+	}
+
 	/**
 	 * Oracle array_fill() function
 	 */

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

@@ -0,0 +1,37 @@
+/*
+ * 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
+ */
+package org.hibernate.dialect.function.array;
+
+import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
+import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator;
+import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
+import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
+
+import static org.hibernate.query.sqm.produce.function.FunctionParameterType.ANY;
+import static org.hibernate.query.sqm.produce.function.FunctionParameterType.INTEGER;
+
+/**
+ * Encapsulates the validator, return type and argument type resolvers for the array_remove functions.
+ * Subclasses only have to implement the rendering.
+ */
+public abstract class AbstractArrayTrimFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
+
+	public AbstractArrayTrimFunction() {
+		super(
+				"array_trim",
+				StandardArgumentsValidators.composite(
+						new ArgumentTypesValidator( null, ANY, INTEGER ),
+						ArrayArgumentValidator.DEFAULT_INSTANCE
+				),
+				ArrayViaArgumentReturnTypeResolver.DEFAULT_INSTANCE,
+				StandardFunctionArgumentTypeResolvers.composite(
+						StandardFunctionArgumentTypeResolvers.invariant( ANY, INTEGER ),
+						StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE
+				)
+		);
+	}
+}

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

@@ -65,7 +65,7 @@ public void render(
 					sqlAppender.append( "] as " );
 					sqlAppender.append( DdlTypeHelper.getCastTypeName(
 							haystackExpression.getExpressionType(),
-							walker
+							walker.getSessionFactory().getTypeConfiguration()
 					) );
 					sqlAppender.append( ')' );
 				}

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

@@ -61,7 +61,10 @@ public void render(
 		sqlAppender.append( "),");
 		if ( castEmptyArrayLiteral ) {
 			sqlAppender.append( "cast(array[] as " );
-			sqlAppender.append( DdlTypeHelper.getCastTypeName( returnType, walker ) );
+			sqlAppender.append( DdlTypeHelper.getCastTypeName(
+					returnType,
+					walker.getSessionFactory().getTypeConfiguration()
+			) );
 			sqlAppender.append( ')' );
 		}
 		else {

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

@@ -68,7 +68,10 @@ public void render(
 		sqlAppender.append( "),");
 		if ( castEmptyArrayLiteral ) {
 			sqlAppender.append( "cast(array[] as " );
-			sqlAppender.append( DdlTypeHelper.getCastTypeName( returnType, walker ) );
+			sqlAppender.append( DdlTypeHelper.getCastTypeName(
+					returnType,
+					walker.getSessionFactory().getTypeConfiguration()
+			) );
 			sqlAppender.append( ')' );
 		}
 		else {