HHH-9955 - EnumType mapped via hbm.xml not always resolved properly as far as named/ordinal

Author: sebersole

hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/BasicMetadataGenerator.java

@@ -17,7 +17,6 @@
 import org.hibernate.type.EnumType;
 import org.hibernate.type.SerializableToBlobType;
 import org.hibernate.type.Type;
-import org.hibernate.usertype.DynamicParameterizedType;
 
 import org.dom4j.Element;
 
@@ -109,14 +108,10 @@ private void mapEnumerationType(Element parent, Type type, Properties parameters
 					)
 			);
 		}
-		else if ( parameters.get( DynamicParameterizedType.XPROPERTY ) != null ) {
-			// Case of annotations.
+		else {
 			parent.addElement( "param" ).addAttribute( "name", EnumType.NAMED )
 					.setText( "" + !((EnumType) ((CustomType) type).getUserType()).isOrdinal() );
 		}
-		// Otherwise we assume that the choice between ordinal and named representation has been omitted.
-		// Call to EnumType#isOrdinal() would always return the default Types.INTEGER. We let Hibernate
-		// to choose the proper strategy during runtime.
 	}
 
 	@SuppressWarnings({"unchecked"})

hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java

@@ -68,11 +68,11 @@ public void dropSchema(Session session) {
 	private void createSchema(Session session) {
 		executeUpdateSafety(
 				session,
-				"create table ENUM_ENTITY (ID bigint not null, enum1 varchar(255), enum2 integer, primary key (ID))"
+				"create table ENUM_ENTITY (ID bigint not null, enum1 integer, enum2 integer, primary key (ID))"
 		);
 		executeUpdateSafety(
 				session,
-				"create table ENUM_ENTITY_AUD (ID bigint not null, REV integer not null, REVTYPE tinyint, enum1 varchar(255), enum2 integer, primary key (ID, REV))"
+				"create table ENUM_ENTITY_AUD (ID bigint not null, REV integer not null, REVTYPE tinyint, enum1 integer, enum2 integer, primary key (ID, REV))"
 		);
 		executeUpdateSafety(
 				session,
@@ -159,7 +159,7 @@ public void testEnumRepresentation() {
 
 		Assert.assertNotNull( values );
 		Assert.assertEquals( 2, values.size() );
-		Assert.assertArrayEquals( new Object[] {"X", 0}, values.get( 0 ) );
-		Assert.assertArrayEquals( new Object[] {"Y", 1}, values.get( 1 ) );
+		Assert.assertArrayEquals( new Object[] {0, 0}, values.get( 0 ) );
+		Assert.assertArrayEquals( new Object[] {1, 1}, values.get( 1 ) );
 	}
 }