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

HHH-7843 : Add support for one-to-one to new metamodel

This commit is contained in:
Gail Badner 2013-03-29 02:29:37 -07:00
parent 7e1b94185d
commit e75b81a22e
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/main/java/org/hibernate/metamodel/internal/Binder.java
View File

@ -2101,12 +2101,8 @@ public class Binder {
) )
); );
if ( elementSource.isUnique() ) { if ( elementSource.isUnique() ) {
<<<<<<< HEAD
UniqueKey uk = collectionTable.getOrCreateUniqueKey( StringHelper.randomFixedLengthHex( UniqueKey uk = collectionTable.getOrCreateUniqueKey( StringHelper.randomFixedLengthHex(
UniqueKey.GENERATED_NAME_PREFIX ) ); UniqueKey.GENERATED_NAME_PREFIX ) );
=======
// TODO: this should create a unique constrraint instead of marking each individual column unique.
>>>>>>> HHH-7843 : Add support for one-to-one to new metamodel
for ( RelationalValueBinding relationalValueBinding : elementBinding.getRelationalValueBindings() ) { for ( RelationalValueBinding relationalValueBinding : elementBinding.getRelationalValueBindings() ) {
if ( ! relationalValueBinding.isDerived() ) { if ( ! relationalValueBinding.isDerived() ) {
uk.addColumn( (Column) relationalValueBinding.getValue() ); uk.addColumn( (Column) relationalValueBinding.getValue() );

3
hibernate-core/src/test/java/org/hibernate/test/constraint/ConstraintTest.java
View File

@ -25,6 +25,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import java.util.Iterator;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.Id; import javax.persistence.Id;
@ -75,7 +77,6 @@ public class ConstraintTest extends BaseCoreFunctionalTestCase {
@Test @Test
@TestForIssue( jiraKey = "HHH-1904" ) @TestForIssue( jiraKey = "HHH-1904" )
@FailureExpectedWithNewMetamodel
public void testConstraintNameLength() { public void testConstraintNameLength() {
TableSpecification table = SchemaUtil.getTable( DataPoint2.class, metadata() ); TableSpecification table = SchemaUtil.getTable( DataPoint2.class, metadata() );