HHH-6100 Bug fix related to CriteriaQuery (JPA) when using XML mappings

hibernate · Mar 6, 2012 · ae5d030 · ae5d030
1 parent 7a9cdb5
commit ae5d030
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java
@@ -452,6 +452,7 @@ private static void bindSimpleId(Element idNode, RootClass entity, Mappings mapp
 			prop.setValue( id );
 			bindProperty( idNode, prop, mappings, inheritedMetas );
 			entity.setIdentifierProperty( prop );
+			entity.setDeclaredIdentifierProperty( prop );
 		}
 
 		// TODO:
@@ -485,6 +486,7 @@ private static void bindCompositeId(Element idNode, RootClass entity, Mappings m
 			prop.setValue( id );
 			bindProperty( idNode, prop, mappings, inheritedMetas );
 			entity.setIdentifierProperty( prop );
+			entity.setDeclaredIdentifierProperty( prop );
 		}
 
 		makeIdentifier( idNode, id, mappings );
@@ -569,6 +571,7 @@ public static void bindClass(Element node, PersistentClass persistentClass, Mapp
 			throw new MappingException( "Unable to determine entity name" );
 		}
 		persistentClass.setEntityName( entityName );
+		persistentClass.setJpaEntityName( entityName );
 
 		bindPojoRepresentation( node, persistentClass, mappings, inheritedMetas );
 		bindDom4jRepresentation( node, persistentClass, mappings, inheritedMetas );

diff --git a/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/Qualifier.hbm.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/Qualifier.hbm.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!--
+
+-->
+
+<hibernate-mapping package="org.hibernate.ejb.test.xml">
+
+    <class name="Qualifier" table="QUALIFIER">
+        <id name="qualifierId" column="QUALIFIER_ID" type="long">
+            <generator class="native"/>
+        </id>
+        <property name="name" type="string">
+            <column name="NAME" length="20" not-null="true"/>
+        </property>
+        <property name="value" type="string">
+            <column name="VALUE" length="1948"/>
+        </property>
+    </class>
+
+</hibernate-mapping>
+