Validate against an enum field

Author: lucamolteni

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

@@ -10,6 +10,7 @@
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.query.ReturnableType;
 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.StandardFunctionReturnTypeResolvers;
 import org.hibernate.sql.ast.SqlAstTranslator;
@@ -21,6 +22,8 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.spi.TypeConfiguration;
 
+import static org.hibernate.query.sqm.produce.function.FunctionParameterType.ENUM;
+
 
 /**
  * The HQL {@code ordinal()} function returns the ordinal value of an enum
@@ -36,7 +39,10 @@ public class OrdinalFunction
 	public OrdinalFunction(TypeConfiguration typeConfiguration) {
 		super(
 				"ordinal",
-				StandardArgumentsValidators.exactly( 1 ),
+				StandardArgumentsValidators.composite(
+						StandardArgumentsValidators.exactly( 1 ),
+						new ArgumentTypesValidator( null, ENUM )
+				),
 				StandardFunctionReturnTypeResolvers.invariant(
 						typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.INTEGER )
 				),

hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentTypesValidator.java

@@ -253,6 +253,7 @@ private static boolean isCompatible(FunctionParameterType type, JdbcType jdbcTyp
 			case IMPLICIT_JSON -> jdbcType.isImplicitJson();
 			case XML -> jdbcType.isXml();
 			case IMPLICIT_XML -> jdbcType.isImplicitXml();
+			case ENUM -> jdbcType.isEnum();
 			default -> true; // TODO: should we throw here?
 		};
 	}

hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionParameterType.java

@@ -98,6 +98,12 @@ public enum FunctionParameterType {
 	 * @since 7.0
 	 */
 	IMPLICIT_JSON,
+	/**
+	 * Indicates that the argument should be an ENUM type
+	 * @see org.hibernate.type.SqlTypes#isEnumType(int)
+	 * @since 7.0
+	 */
+	ENUM,
 	/**
 	 * Indicates that the argument should be a XML type
 	 * @see org.hibernate.type.SqlTypes#isXmlType(int)

hibernate-core/src/main/java/org/hibernate/type/SqlTypes.java

@@ -1022,6 +1022,24 @@ public static boolean isImplicitJsonType(int typeCode) {
 		}
 	}
 
+	/**
+	 * Does the typecode represent an ENUM type, whether it's mapped as a native ENUM, a STRING or an INT.
+	 *
+	 * @param typeCode - a JDBC type code
+	 * @since 7.0
+	 */
+	public static boolean isImplicitEnumType(int typeCode) {
+		switch ( typeCode ) {
+			case ENUM:
+			case VARCHAR:
+			case INTEGER:
+			case TINYINT:
+				return true;
+			default:
+				return false;
+		}
+	}
+
 	/**
 	 * Does the typecode represent a XML type.
 	 *

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java

@@ -296,7 +296,7 @@ default boolean isArray() {
 	}
 
 	default boolean isEnum() {
-		return getDdlTypeCode() == ENUM;
+		return isImplicitEnumType( getDdlTypeCode() );
 	}
 
 	static boolean isArray(int jdbcTypeCode) {