HHH-10463 Implement function argument type inference

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

@@ -173,7 +173,8 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 				queryEngine.getTypeConfiguration().getBasicTypeRegistry().resolve( StandardBasicTypes.INTEGER ),
 				"$find(?2,?1)",
 				"$find(?2,?1,?3)",
-				STRING, STRING, INTEGER
+				STRING, STRING, INTEGER,
+				queryEngine.getTypeConfiguration()
 		).setArgumentListSignature("(pattern, string[, start])");
 		functionFactory.bitLength_pattern( "($length(?1)*8)" );
 

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

@@ -284,7 +284,8 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 				integerType,
 				"position(?1 in ?2)",
 				"position(?1,?2,?3)",
-				STRING, STRING, INTEGER
+				STRING, STRING, INTEGER,
+				queryEngine.getTypeConfiguration()
 		).setArgumentListSignature( "(pattern, string[, start])" );
 		functionRegistry.namedDescriptorBuilder( "ascii_val" )
 				.setExactArgumentCount( 1 )

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

@@ -288,7 +288,8 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 				integerType,
 				"position(?1 in ?2)",
 				"(position(?1 in substring(?2 from ?3))+(?3)-1)",
-				STRING, STRING, INTEGER
+				STRING, STRING, INTEGER,
+				queryEngine.getTypeConfiguration()
 		).setArgumentListSignature("(pattern, string[, start])");
 
 		queryEngine.getSqmFunctionRegistry().registerPattern( "extract", "date_part('?1',?2)", integerType );

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

@@ -168,7 +168,8 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		queryEngine.getSqmFunctionRegistry().registerBinaryTernaryPattern(
 				"locate",
 				integerType, "index(?2,?1)", "index(?2,?1,?3)",
-				STRING, STRING, INTEGER
+				STRING, STRING, INTEGER,
+				queryEngine.getTypeConfiguration()
 		).setArgumentListSignature("(pattern, string[, start])");
 	}
 

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

@@ -277,21 +277,24 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 				integerType,
 				"instr(?2,?1)",
 				"instr(?2,?1,?3)",
-				STRING, STRING, INTEGER
+				STRING, STRING, INTEGER,
+				queryEngine.getTypeConfiguration()
 		).setArgumentListSignature("(pattern, string[, start])");
 		queryEngine.getSqmFunctionRegistry().registerBinaryTernaryPattern(
 				"lpad",
 				stringType,
 				"(substr(replace(hex(zeroblob(?2)),'00',' '),1,?2-length(?1))||?1)",
 				"(substr(replace(hex(zeroblob(?2)),'00',?3),1,?2-length(?1))||?1)",
-				STRING, INTEGER, STRING
+				STRING, INTEGER, STRING,
+				queryEngine.getTypeConfiguration()
 		).setArgumentListSignature("(string, length[, padding])");
 		queryEngine.getSqmFunctionRegistry().registerBinaryTernaryPattern(
 				"rpad",
 				stringType,
 				"(?1||substr(replace(hex(zeroblob(?2)),'00',' '),1,?2-length(?1)))",
 				"(?1||substr(replace(hex(zeroblob(?2)),'00',?3),1,?2-length(?1)))",
-				STRING, INTEGER, STRING
+				STRING, INTEGER, STRING,
+				queryEngine.getTypeConfiguration()
 		).setArgumentListSignature("(string, length[, padding])");
 
 		queryEngine.getSqmFunctionRegistry().namedDescriptorBuilder("format", "strftime")

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

@@ -168,7 +168,8 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 				queryEngine.getTypeConfiguration().getBasicTypeRegistry().resolve( StandardBasicTypes.INTEGER ),
 				"instr(?2,?1)",
 				"instr(?2,?1,?3)",
-				STRING, STRING, INTEGER
+				STRING, STRING, INTEGER,
+				queryEngine.getTypeConfiguration()
 		).setArgumentListSignature("(pattern, string[, start])");
 	}
 

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

@@ -79,6 +79,7 @@
 import jakarta.persistence.TemporalType;
 
 import org.hibernate.query.sqm.produce.function.FunctionParameterType;
+import org.hibernate.type.spi.TypeConfiguration;
 
 /**
  * An abstract base class for SAP HANA dialects.
@@ -274,13 +275,15 @@ public int getDefaultDecimalPrecision() {
 	@Override
 	public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		super.initializeFunctionRegistry( queryEngine );
+		final TypeConfiguration typeConfiguration = queryEngine.getTypeConfiguration();
 
 		queryEngine.getSqmFunctionRegistry().registerBinaryTernaryPattern(
 				"locate",
-				queryEngine.getTypeConfiguration().getBasicTypeRegistry().resolve( StandardBasicTypes.INTEGER ),
+				typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.INTEGER ),
 				"locate(?2,?1)",
 				"locate(?2,?1,?3)",
-				FunctionParameterType.STRING, FunctionParameterType.STRING, FunctionParameterType.INTEGER
+				FunctionParameterType.STRING, FunctionParameterType.STRING, FunctionParameterType.INTEGER,
+				typeConfiguration
 		).setArgumentListSignature("(pattern, string[, start])");
 
 		CommonFunctionFactory functionFactory = new CommonFunctionFactory(queryEngine);
@@ -317,7 +320,7 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		functionFactory.hypotheticalOrderedSetAggregates_windowEmulation();
 
 		queryEngine.getSqmFunctionRegistry().register( "timestampadd",
-				new IntegralTimestampaddFunction( this, queryEngine.getTypeConfiguration() ) );
+				new IntegralTimestampaddFunction( this, typeConfiguration ) );
 	}
 
 	@Override

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

@@ -142,7 +142,6 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		functionFactory.yearMonthDay();
 		functionFactory.ascii();
 		functionFactory.chr_char();
-		functionFactory.concat_plusOperator();
 		functionFactory.trim1();
 		functionFactory.repeat_replicate();
 		functionFactory.characterLength_len();

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

@@ -160,6 +160,7 @@
 import org.hibernate.type.descriptor.jdbc.NClobJdbcType;
 import org.hibernate.type.descriptor.jdbc.NVarcharJdbcType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
+import org.hibernate.type.spi.TypeConfiguration;
 
 import jakarta.persistence.TemporalType;
 
@@ -769,7 +770,8 @@ else if ( isNumericType(sqlType) ) {
 	 * same names.
 	 */
 	public void initializeFunctionRegistry(QueryEngine queryEngine) {
-		final BasicTypeRegistry basicTypeRegistry = queryEngine.getTypeConfiguration().getBasicTypeRegistry();
+		final TypeConfiguration typeConfiguration = queryEngine.getTypeConfiguration();
+		final BasicTypeRegistry basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
 		final BasicType<Date> timestampType = basicTypeRegistry.resolve( StandardBasicTypes.TIMESTAMP );
 		final BasicType<Date> dateType = basicTypeRegistry.resolve( StandardBasicTypes.DATE );
 		final BasicType<Date> timeType = basicTypeRegistry.resolve( StandardBasicTypes.TIME );
@@ -842,20 +844,20 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		//define it here as an alias for locate()
 
 		queryEngine.getSqmFunctionRegistry().register( "position",
-				new LocatePositionEmulation( queryEngine.getTypeConfiguration() ) );
+				new LocatePositionEmulation( typeConfiguration ) );
 
 		//very few databases support ANSI-style overlay() function, so emulate
 		//it here in terms of either insert() or concat()/substring()
 
 		queryEngine.getSqmFunctionRegistry().register( "overlay",
-				new InsertSubstringOverlayEmulation( queryEngine.getTypeConfiguration(), false ) );
+				new InsertSubstringOverlayEmulation( typeConfiguration, false ) );
 
 		//ANSI SQL trim() function is supported on almost all of the databases
 		//we care about, but on some it must be emulated using ltrim(), rtrim(),
 		//and replace()
 
 		queryEngine.getSqmFunctionRegistry().register( "trim",
-				new TrimFunction( this, queryEngine.getTypeConfiguration() ) );
+				new TrimFunction( this, typeConfiguration ) );
 
 		//ANSI SQL cast() function is supported on the databases we care most
 		//about but in certain cases it doesn't allow some useful typecasts,
@@ -883,7 +885,7 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		//a very dialect-specific way
 
 		queryEngine.getSqmFunctionRegistry().register( "extract",
-				new ExtractFunction( this ) );
+				new ExtractFunction( this, typeConfiguration ) );
 
 		//comparison functions supported on most databases, emulated on others
 		//using a case expression
@@ -905,13 +907,13 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		//pad() is a function we've designed to look like ANSI trim()
 
 		queryEngine.getSqmFunctionRegistry().register( "pad",
-				new LpadRpadPadEmulation( queryEngine.getTypeConfiguration() ) );
+				new LpadRpadPadEmulation( typeConfiguration ) );
 
 		//legacy Hibernate convenience function for casting to string, defined
 		//here as an alias for cast(arg as String)
 
 		queryEngine.getSqmFunctionRegistry().register( "str",
-				new CastStrEmulation( queryEngine.getTypeConfiguration() ) );
+				new CastStrEmulation( typeConfiguration ) );
 
 		//format() function for datetimes, emulated on many databases using the
 		//Oracle-style to_char() function, and on others using their native
@@ -923,9 +925,9 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		//since there is a great variety of different ways to emulate them
 
 		queryEngine.getSqmFunctionRegistry().register( "timestampadd",
-				new TimestampaddFunction( this ) );
+				new TimestampaddFunction( this, typeConfiguration ) );
 		queryEngine.getSqmFunctionRegistry().register( "timestampdiff",
-				new TimestampdiffFunction( this, queryEngine.getTypeConfiguration() ) );
+				new TimestampdiffFunction( this, typeConfiguration ) );
 		queryEngine.getSqmFunctionRegistry().registerAlternateKey( "dateadd", "timestampadd" );
 		queryEngine.getSqmFunctionRegistry().registerAlternateKey( "datediff", "timestampdiff" );
 

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

@@ -19,6 +19,7 @@
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
 import org.hibernate.type.StandardBasicTypes;
+import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.query.sqm.produce.function.FunctionParameterType.ANY;
 
@@ -102,20 +103,22 @@ private void registerHanaCloudKeywords() {
 	@Override
 	public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		super.initializeFunctionRegistry( queryEngine );
+		final TypeConfiguration typeConfiguration = queryEngine.getTypeConfiguration();
 
 		// full-text search functions
 		queryEngine.getSqmFunctionRegistry().registerNamed(
 				"score",
-				queryEngine.getTypeConfiguration().getBasicTypeRegistry().resolve( StandardBasicTypes.DOUBLE )
+				typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.DOUBLE )
 		);
 		queryEngine.getSqmFunctionRegistry().registerNamed( "snippets" );
 		queryEngine.getSqmFunctionRegistry().registerNamed( "highlighted" );
 		queryEngine.getSqmFunctionRegistry().registerBinaryTernaryPattern(
 				"contains",
-				queryEngine.getTypeConfiguration().getBasicTypeRegistry().resolve( StandardBasicTypes.BOOLEAN ),
+				typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.BOOLEAN ),
 				"contains(?1,?2)",
 				"contains(?1,?2,?3)",
-				ANY, ANY, ANY
+				ANY, ANY, ANY,
+				typeConfiguration
 		);
 	}
 

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

@@ -93,6 +93,8 @@
 import static org.hibernate.query.sqm.TemporalUnit.YEAR;
 
 import org.hibernate.query.sqm.produce.function.FunctionParameterType;
+import org.hibernate.type.spi.TypeConfiguration;
+
 import static org.hibernate.type.SqlTypes.*;
 
 /**
@@ -136,6 +138,7 @@ public int getPreferredSqlTypeCodeForBoolean() {
 	@Override
 	public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		super.initializeFunctionRegistry( queryEngine );
+		final TypeConfiguration typeConfiguration = queryEngine.getTypeConfiguration();
 
 		CommonFunctionFactory functionFactory = new CommonFunctionFactory(queryEngine);
 		functionFactory.cosh();
@@ -185,10 +188,11 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 
 		queryEngine.getSqmFunctionRegistry().registerBinaryTernaryPattern(
 				"locate",
-				queryEngine.getTypeConfiguration().getBasicTypeRegistry().resolve( StandardBasicTypes.INTEGER ),
+				typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.INTEGER ),
 				"instr(?2,?1)",
 				"instr(?2,?1,?3)",
-				FunctionParameterType.STRING, FunctionParameterType.STRING, FunctionParameterType.INTEGER
+				FunctionParameterType.STRING, FunctionParameterType.STRING, FunctionParameterType.INTEGER,
+				typeConfiguration
 		).setArgumentListSignature("(pattern, string[, start])");
 		// The within group clause became optional in 18
 		if ( getVersion().isSameOrAfter( 18 ) ) {
@@ -203,7 +207,7 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		// Oracle has a regular aggregate function named stats_mode
 		queryEngine.getSqmFunctionRegistry().register(
 				"mode",
-				new ModeStatsModeEmulation( queryEngine.getTypeConfiguration() )
+				new ModeStatsModeEmulation( typeConfiguration )
 		);
 	}
 

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

@@ -15,7 +15,9 @@
 import org.hibernate.query.sqm.function.FunctionKind;
 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 org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers;
+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;
@@ -49,7 +51,8 @@ public AvgFunction(
 				new ArgumentTypesValidator( StandardArgumentsValidators.exactly( 1 ), NUMERIC ),
 				StandardFunctionReturnTypeResolvers.invariant(
 						typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.DOUBLE )
-				)
+				),
+				StandardFunctionArgumentTypeResolvers.invariant( typeConfiguration, NUMERIC )
 		);
 		this.defaultArgumentRenderingMode = defaultArgumentRenderingMode;
 		doubleType = typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.DOUBLE );
@@ -80,8 +83,10 @@ public void render(
 			arg = (Expression) sqlAstArguments.get( 0 );
 		}
 		if ( caseWrapper ) {
+			translator.getCurrentClauseStack().push( Clause.WHERE );
 			sqlAppender.appendSql( "case when " );
 			filter.accept( translator );
+			translator.getCurrentClauseStack().pop();
 			sqlAppender.appendSql( " then " );
 			renderArgument( sqlAppender, translator, arg );
 			sqlAppender.appendSql( " else null end)" );
@@ -90,9 +95,11 @@ public void render(
 			renderArgument( sqlAppender, translator, arg );
 			sqlAppender.appendSql( ')' );
 			if ( filter != null ) {
+				translator.getCurrentClauseStack().push( Clause.WHERE );
 				sqlAppender.appendSql( " filter (where " );
 				filter.accept( translator );
 				sqlAppender.appendSql( ')' );
+				translator.getCurrentClauseStack().pop();
 			}
 		}
 	}

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

@@ -11,6 +11,7 @@
 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 org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlAppender;
@@ -33,7 +34,8 @@ public CaseLeastGreatestEmulation(boolean least) {
 		super(
 				least ? "least" : "greatest",
 				new ArgumentTypesValidator( StandardArgumentsValidators.min( 2 ), COMPARABLE, COMPARABLE ),
-				StandardFunctionReturnTypeResolvers.useFirstNonNull()
+				StandardFunctionReturnTypeResolvers.useFirstNonNull(),
+				StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE
 		);
 		this.operator = least ? "<=" : ">=";
 	}

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

@@ -14,6 +14,7 @@
 import org.hibernate.query.sqm.CastType;
 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.query.sqm.produce.function.internal.PatternRenderer;
 import org.hibernate.sql.ast.SqlAstTranslator;
@@ -38,7 +39,8 @@ public CastFunction(Dialect dialect, int preferredSqlTypeCodeForBoolean) {
 		super(
 				"cast",
 				StandardArgumentsValidators.exactly( 2 ),
-				StandardFunctionReturnTypeResolvers.useArgType( 2 )
+				StandardFunctionReturnTypeResolvers.useArgType( 2 ),
+				StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE
 		);
 		this.dialect = dialect;
 		this.booleanCastType = getBooleanCastType( preferredSqlTypeCodeForBoolean );

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

@@ -37,15 +37,16 @@ public CastStrEmulation(TypeConfiguration typeConfiguration) {
 				StandardArgumentsValidators.exactly( 1 ),
 				StandardFunctionReturnTypeResolvers.invariant(
 						typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.STRING )
-				)
+				),
+				null
 		);
 	}
 
 	protected CastStrEmulation(
 			String name,
 			ArgumentsValidator argumentsValidator,
 			FunctionReturnTypeResolver returnTypeResolver) {
-		super( name, argumentsValidator, returnTypeResolver );
+		super( name, argumentsValidator, returnTypeResolver, null );
 	}
 
 	@Override

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

@@ -15,6 +15,7 @@
 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 org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers;
 import org.hibernate.query.sqm.produce.function.internal.PatternRenderer;
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
@@ -42,10 +43,11 @@ public CastingConcatFunction(
 			TypeConfiguration typeConfiguration) {
 		super(
 				"concat",
-				new ArgumentTypesValidator( StandardArgumentsValidators.min( 1 ), STRING ),
+				StandardArgumentsValidators.min( 1 ),
 				StandardFunctionReturnTypeResolvers.invariant(
 						typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.STRING )
-				)
+				),
+				StandardFunctionArgumentTypeResolvers.impliedOrInvariant( typeConfiguration, STRING )
 		);
 		this.dialect = dialect;
 		this.concatOperator = concatOperator;