add appropriate casts on parameters in binary numeric expressions on Informix

Author: gavinking

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

@@ -106,7 +106,6 @@
 import static org.hibernate.internal.util.JdbcExceptionHelper.extractErrorCode;
 import static org.hibernate.query.sqm.produce.function.FunctionParameterType.STRING;
 import static org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers.impliedOrInvariant;
-import static org.hibernate.type.SqlTypes.BIGINT;
 import static org.hibernate.type.SqlTypes.BINARY;
 import static org.hibernate.type.SqlTypes.FLOAT;
 import static org.hibernate.type.SqlTypes.LONG32NVARCHAR;
@@ -214,8 +213,8 @@ protected String columnType(int sqlTypeCode) {
 		switch ( sqlTypeCode ) {
 			case TINYINT:
 				return "smallint";
-			case BIGINT:
-				return "int8";
+//			case BIGINT:
+//				return "int8";
 			case TIME:
 				return "datetime hour to second";
 			case TIMESTAMP:
@@ -982,14 +981,13 @@ public void appendDateTimeLiteral(SqlAppender appender, Date date, TemporalType
 	@Override
 	public String getSelectClauseNullString(int sqlType, TypeConfiguration typeConfiguration) {
 		final DdlType descriptor = typeConfiguration.getDdlTypeRegistry().getDescriptor( sqlType );
-		if ( descriptor == null ) {
-			// just cast it to an arbitrary SQL type,
-			// which we expect to be ignored by higher layers
-			return "cast(null as int)";
-		}
-		else {
-			return "cast(null as " + castType( descriptor ) + ")";
-		}
+		final String castType =
+				descriptor != null
+						? castType( descriptor )
+						// just cast it to an arbitrary SQL type,
+						// which we expect to be ignored by higher layers
+						: "integer";
+		return "cast(null as " + castType + ")";
 	}
 
 	private static String castType(DdlType descriptor) {

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

@@ -246,6 +246,33 @@ public void visitQuerySpec(QuerySpec querySpec) {
 		}
 	}
 
+	@Override
+	protected void visitArithmeticOperand(Expression expression) {
+		if ( expression instanceof SqmParameterInterpretation
+				&& expression.getExpressionType() != null
+				&& expression.getExpressionType().getJdbcTypeCount() == 1 ) {
+			final String castType =
+					switch ( expression.getExpressionType().getSingleJdbcMapping().getCastType() ) {
+						case FLOAT, DOUBLE ->  "float" ;
+						case INTEGER -> "integer" ;
+						case LONG -> "bigint";
+						default -> null;
+					};
+			if ( castType != null ) {
+				append( "cast(" );
+			}
+			super.visitArithmeticOperand( expression );
+			if ( castType != null ) {
+				append( " as " );
+				append( castType );
+				append( ")" );
+			}
+		}
+		else {
+			super.visitArithmeticOperand( expression );
+		}
+	}
+
 	@Override
 	public void visitSelfRenderingExpression(SelfRenderingExpression expression) {
 		final boolean isStringFunctionWithParameterArg =

hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/spi/DdlTypeRegistry.java

@@ -135,8 +135,8 @@ public DdlType getDescriptor(int sqlTypeCode) {
 	}
 
 	/**
-	 * Get the SQL type name for the specified {@link java.sql.Types JDBC type code},
-	 * filling in the placemarkers {@code $l}, {@code $p}, and {@code $s}
+	 * Get the SQL type name for the specified {@linkplain java.sql.Types JDBC
+	 * type code}, filling in the placemarkers {@code $l}, {@code $p}, and {@code $s}
 	 * with the default length, precision, and scale for the given SQL dialect.
 	 *
 	 * @param typeCode the JDBC type code