|
From: <hib...@li...> - 2006-04-27 17:15:02
|
Author: epbernard
Date: 2006-04-27 13:14:58 -0400 (Thu, 27 Apr 2006)
New Revision: 9820
Modified:
trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/EntityTest.java
Log:
ANN-330
Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2006-04-27 17:02:51 UTC (rev 9819)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2006-04-27 17:14:58 UTC (rev 9820)
@@ -296,7 +296,7 @@
private String getClassTableName(String tableName) {
if ( StringHelper.isEmpty( tableName ) ) {
- return mappings.getNamingStrategy().classToTableName( persistentClass.getEntityName() );
+ return mappings.getNamingStrategy().classToTableName( name );
}
else {
return mappings.getNamingStrategy().tableName( tableName );
@@ -310,7 +310,7 @@
) {
String logicalName = StringHelper.isNotEmpty( tableName ) ?
tableName :
- StringHelper.unqualify( persistentClass.getEntityName() );
+ StringHelper.unqualify( name );
Table table = TableBinder.fillTable(
schema, catalog,
getClassTableName( tableName ),
Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/EntityTest.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/EntityTest.java 2006-04-27 17:02:51 UTC (rev 9819)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/EntityTest.java 2006-04-27 17:14:58 UTC (rev 9820)
@@ -24,6 +24,8 @@
public void testLoad() throws Exception {
//put an object in DB
+ assertEquals( "Flight", getCfg().getClassMapping( Flight.class.getName() ).getTable().getName() );
+
Session s = openSession();
Transaction tx = s.beginTransaction();
Flight firstOne = new Flight();
@@ -257,6 +259,7 @@
}
public void testEntityName() throws Exception {
+ assertEquals( "Corporation", getCfg().getClassMapping( Company.class.getName() ).getTable().getName() );
Session s = openSession();
Transaction tx = s.beginTransaction();
Company comp = new Company();
|