From 49468d964d0f582d6455cdea05597d77f2461063 Mon Sep 17 00:00:00 2001
From: brmeyer <brmeyer@redhat.com>
Date: Tue, 6 Nov 2012 11:30:33 -0500
Subject: [PATCH] HHH-7760 Support multiple @Column annotations on an @Id

---
 .../spi/binding/EntityIdentifier.java         | 19 ++++++++-----------
 .../test/annotations/type/TypeTest.java       |  7 ++-----
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/binding/EntityIdentifier.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/binding/EntityIdentifier.java
index d57a9fe738..38106e9156 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/binding/EntityIdentifier.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/binding/EntityIdentifier.java
@@ -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();
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/type/TypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/TypeTest.java
index 794eef98a3..536e84f376 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/type/TypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/TypeTest.java
@@ -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 {