HHH-18515 Unrecognized discriminator value exception when running native query on entity with discriminator column

Author: dreab8

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappedDiscriminatorConverter.java

@@ -13,7 +13,9 @@
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.type.BasicType;
+import org.hibernate.type.descriptor.java.CharacterJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.java.StringJavaType;
 
 import java.util.List;
 import java.util.Map;
@@ -113,6 +115,23 @@ public DiscriminatorValueDetails getDetailsForDiscriminatorValue(Object value) {
 			return notNullMatch;
 		}
 
+		if ( value.getClass().isEnum() ) {
+			final Object enumValue;
+			if ( getRelationalJavaType() instanceof StringJavaType ) {
+				enumValue = ( (Enum) value ).name();
+			}
+			else if ( getRelationalJavaType() instanceof CharacterJavaType ) {
+				enumValue = ( (Enum) value ).name().charAt( 0 );
+			}
+			else {
+				enumValue = ( (Enum) value ).ordinal();
+			}
+			final DiscriminatorValueDetails enumMatch = discriminatorValueToEntityNameMap.get( enumValue );
+			if ( enumMatch != null ) {
+				return enumMatch;
+			}
+		}
+
 		throw new HibernateException( "Unrecognized discriminator value: " + value );
 	}