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

HHH-7760 Support multiple @Column annotations on an @Id

This commit is contained in:
brmeyer 2012-11-06 11:30:33 -05:00
parent 8f93b41da7
commit 49468d964d
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hibernate-core/src/main/java/org/hibernate/metamodel/spi/binding/EntityIdentifier.java
View File

@ -23,6 +23,10 @@
*/
package org.hibernate.metamodel.spi.binding;
import static org.hibernate.id.EntityIdentifierNature.AGGREGATED_COMPOSITE;
import static org.hibernate.id.EntityIdentifierNature.NON_AGGREGATED_COMPOSITE;
import static org.hibernate.id.EntityIdentifierNature.SIMPLE;
import java.io.Serializable;
import java.util.List;
import java.util.Properties;
@ -37,11 +41,6 @@ import org.hibernate.id.factory.IdentifierGeneratorFactory;
import org.hibernate.metamodel.spi.relational.Column;
import org.hibernate.metamodel.spi.relational.Schema;
import org.hibernate.metamodel.spi.relational.TableSpecification;
import org.hibernate.type.ComponentType;
import static org.hibernate.id.EntityIdentifierNature.AGGREGATED_COMPOSITE;
import static org.hibernate.id.EntityIdentifierNature.NON_AGGREGATED_COMPOSITE;
import static org.hibernate.id.EntityIdentifierNature.SIMPLE;
/**
* Hold information about the entity identifier. At a high-level, can be one of 2-types:<ul>
@ -264,12 +263,10 @@ public class EntityIdentifier {
Properties properties) {
final List<RelationalValueBinding> relationalValueBindings =
getAttributeBinding().getRelationalValueBindings();
if ( relationalValueBindings.size() > 1 ) {
throw new MappingException(
"A SimpleAttributeBinding used for an identifier has more than 1 Value: " +
getAttributeBinding().getAttribute().getName()
);
}
// TODO: If multiple @Column annotations exist within an id's
// @Columns, we need a more solid solution than simply grabbing
// the first one to get the TableSpecification.
final RelationalValueBinding relationalValueBinding = relationalValueBindings.get( 0 );
final TableSpecification table = relationalValueBinding.getValue().getTable();

7
hibernate-core/src/test/java/org/hibernate/test/annotations/type/TypeTest.java
View File

@ -23,19 +23,16 @@
*/
package org.hibernate.test.annotations.type;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
/**
* @author Emmanuel Bernard
*/
@FailureExpectedWithNewMetamodel
public class TypeTest extends BaseCoreFunctionalTestCase {
@Test
public void testIdWithMulticolumns() throws Exception {