Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-22 11:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing simple BV test

Browse Source
This commit is contained in:
Strong Liu 2013-01-11 01:20:20 +08:00
parent d7246f1da2
commit ee50c8b2a4
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ddl/NotNullSchemaConstraint.java
View File

@ -69,7 +69,7 @@ public boolean applyConstraint(AttributeBinding attributeBinding, ConstraintDesc
return false; return false;
} }
EntityBinding entityBinding = (EntityBinding) attributeBinding.getContainer(); EntityBinding entityBinding = attributeBinding.getContainer().seekEntityBinding();
InheritanceType inheritanceType = entityBinding.getHierarchyDetails().getInheritanceType(); InheritanceType inheritanceType = entityBinding.getHierarchyDetails().getInheritanceType();
// properties of a single table inheritance configuration should not be forced to null // properties of a single table inheritance configuration should not be forced to null

5
hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ddl/SchemaModificationHelper.java
View File

@ -29,6 +29,7 @@
import org.hibernate.metamodel.spi.binding.AttributeBinding; import org.hibernate.metamodel.spi.binding.AttributeBinding;
import org.hibernate.metamodel.spi.binding.BasicAttributeBinding; import org.hibernate.metamodel.spi.binding.BasicAttributeBinding;
import org.hibernate.metamodel.spi.binding.RelationalValueBinding; import org.hibernate.metamodel.spi.binding.RelationalValueBinding;
import org.hibernate.metamodel.spi.binding.SingularAttributeBinding;
import org.hibernate.metamodel.spi.relational.Column; import org.hibernate.metamodel.spi.relational.Column;
import org.hibernate.metamodel.spi.relational.Value; import org.hibernate.metamodel.spi.relational.Value;
@ -55,12 +56,12 @@ public static String buildSQLCheck(String existingCheckCondition, String checkCo
} }
public static Column getSingleColumn(AttributeBinding attributeBinding) { public static Column getSingleColumn(AttributeBinding attributeBinding) {
if ( !( attributeBinding instanceof BasicAttributeBinding ) ) { if ( !( attributeBinding instanceof SingularAttributeBinding ) ) {
// TODO verify that's correct (HF) // TODO verify that's correct (HF)
return null; return null;
} }
BasicAttributeBinding basicAttributeBinding = ( BasicAttributeBinding ) attributeBinding; SingularAttributeBinding basicAttributeBinding = ( SingularAttributeBinding ) attributeBinding;
RelationalValueBinding valueBinding = basicAttributeBinding.getRelationalValueBindings().get( 0 ); RelationalValueBinding valueBinding = basicAttributeBinding.getRelationalValueBindings().get( 0 );
Value value = valueBinding.getValue(); Value value = valueBinding.getValue();

2
hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java
View File

@ -28,7 +28,6 @@
import org.hibernate.metamodel.spi.relational.Column; import org.hibernate.metamodel.spi.relational.Column;
import org.hibernate.metamodel.spi.relational.PrimaryKey; import org.hibernate.metamodel.spi.relational.PrimaryKey;
import org.hibernate.test.util.SchemaUtil; import org.hibernate.test.util.SchemaUtil;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@ -66,7 +65,6 @@ public void testLengthConstraint() throws Exception {
assertEquals( column.getSize().getLength(), 5 ); assertEquals( column.getSize().getLength(), 5 );
} }
@FailureExpectedWithNewMetamodel
@Test @Test
public void testApplyOnManyToOne() throws Exception { public void testApplyOnManyToOne() throws Exception {
Column column = SchemaUtil.getColumn( TvOwner.class, "tv_serial", metadata() ); Column column = SchemaUtil.getColumn( TvOwner.class, "tv_serial", metadata() );