Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-9280 : Table name generated for @ElementCollection uses owning entity class name instead of mapped entity name

This commit is contained in:
Gail Badner 2014-07-09 15:08:21 -07:00
parent ee0cf672d7
commit ccffe0dea9
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java
View File

@ -1214,7 +1214,7 @@ public abstract class CollectionBinder {
if ( StringHelper.isEmpty( associationTableBinder.getName() ) ) { if ( StringHelper.isEmpty( associationTableBinder.getName() ) ) {
//default value //default value
associationTableBinder.setDefaultName( associationTableBinder.setDefaultName(
collValue.getOwner().getEntityName(), collValue.getOwner().getJpaEntityName(),
mappings.getLogicalTableName( collValue.getOwner().getTable() ), mappings.getLogicalTableName( collValue.getOwner().getTable() ),
collectionEntity != null ? collectionEntity.getEntityName() : null, collectionEntity != null ? collectionEntity.getEntityName() : null,
collectionEntity != null ? mappings.getLogicalTableName( collectionEntity.getTable() ) : null, collectionEntity != null ? mappings.getLogicalTableName( collectionEntity.getTable() ) : null,

8
hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
View File

@ -36,6 +36,7 @@ import org.hibernate.Session;
import org.hibernate.Transaction; import org.hibernate.Transaction;
import org.hibernate.mapping.Collection; import org.hibernate.mapping.Collection;
import org.hibernate.mapping.Column; import org.hibernate.mapping.Column;
import org.hibernate.mapping.Table;
import org.hibernate.test.annotations.Country; import org.hibernate.test.annotations.Country;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@ -261,6 +262,13 @@ public class CollectionElementTest extends BaseCoreFunctionalTestCase {
isCollectionColumnPresent( Boy.class.getName(), "hatedNames", "Boy_id" ); isCollectionColumnPresent( Boy.class.getName(), "hatedNames", "Boy_id" );
} }
@Test
public void testDefaultTableNameUsesJpaEntityName() {
final Collection collection = configuration().getCollectionMapping( Matrix.class.getName() + "." + "mvalues" );
final Table table = collection.getCollectionTable();
assertEquals( "Mtx_mvalues", table.getName() );
}
private void isLegacyValueCollectionColumnPresent(String collectionHolder, String propertyName) { private void isLegacyValueCollectionColumnPresent(String collectionHolder, String propertyName) {
} }

2
hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java
View File

@ -17,7 +17,7 @@ import org.hibernate.annotations.Type;
/** /**
* @author Emmanuel Bernard * @author Emmanuel Bernard
*/ */
@Entity @Entity(name="Mtx")
public class Matrix { public class Matrix {
@Id @Id
@GeneratedValue @GeneratedValue