[7.1] HHH-19747 Hibernate Envers can not handle @EnumeratedValue annotation

hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java

@@ -65,6 +65,7 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
 import org.hibernate.type.internal.BasicTypeImpl;
+import org.hibernate.type.internal.ConvertedBasicTypeImpl;
 import org.hibernate.type.spi.TypeConfiguration;
 import org.hibernate.type.spi.TypeConfigurationAware;
 import org.hibernate.usertype.DynamicParameterizedType;
@@ -849,7 +850,8 @@ public TypeConfiguration getTypeConfiguration() {
 //			return EnumeratedValueResolution.fromName( name, stdIndicators, context );
 //		}
 
-		if ( name.startsWith( BasicTypeImpl.EXTERNALIZED_PREFIX ) ) {
+		if ( name.startsWith( BasicTypeImpl.EXTERNALIZED_PREFIX )
+			|| name.startsWith( ConvertedBasicTypeImpl.EXTERNALIZED_PREFIX ) ) {
 			return getNamedBasicTypeResolution(
 					bootstrapContext.resolveAdHocBasicType( name ),
 					explicitMutabilityPlanAccess,

hibernate-envers/src/test/java/org/hibernate/orm/test/envers/mapping/enumeratedvalue/CharEnumerateValueTests.java

@@ -0,0 +1,75 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.envers.mapping.enumeratedvalue;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.EnumeratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.envers.Audited;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.type.SqlTypes;
+import org.junit.Test;
+
+
+@JiraKey( "HHH-19747" )
+public class CharEnumerateValueTests extends EntityManagerFactoryBasedFunctionalTest {
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] {Person.class};
+	}
+
+	@Test
+	public void testBasicUsage() {
+		final EntityManagerFactory testEmf = produceEntityManagerFactory();
+		testEmf.close();
+	}
+
+	public enum Gender {
+		MALE( 'M' ),
+		FEMALE( 'F' ),
+		OTHER( 'U' );
+
+		@EnumeratedValue
+		private final char code;
+
+		Gender(char code) {
+			this.code = code;
+		}
+
+		public char getCode() {
+			return code;
+		}
+	}
+
+	@Audited
+	@Entity(name = "Person")
+	@Table(name = "persons")
+	public static class Person {
+		@Id
+		private Integer id;
+		private String name;
+		@Enumerated(EnumType.STRING)
+		@JdbcTypeCode(SqlTypes.CHAR)
+		@Column(length = 1)
+		private Gender gender;
+
+		public Person() {
+		}
+
+		public Person(Integer id, String name, Gender gender) {
+			this.id = id;
+			this.name = name;
+			this.gender = gender;
+		}
+	}
+}