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

HHH-8897 : Add support for key-many-to-one on-delete="cascade"

This commit is contained in:
Gail Badner 2014-02-05 16:04:12 -08:00
parent 76a2fc4b0f
commit 1a4b43720c
31 changed files with 110 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -838,11 +838,11 @@ public class Binder implements HelperContext {
table,
joinRelationalValueBindings,
foreignKeyHelper.determineForeignKeyTargetTable( superEntityBinding, subclassEntitySource ),
targetColumns
targetColumns,
subclassEntitySource.isCascadeDeleteEnabled()
);
if ( subclassEntitySource.isCascadeDeleteEnabled() ) {
foreignKey.setDeleteRule( ForeignKey.ReferentialAction.CASCADE );
entityBinding.setCascadeDeleteEnabled( true );
}
}
@ -1256,20 +1256,19 @@ public class Binder implements HelperContext {
table,
joinRelationalValueBindings,
foreignKeyHelper.determineForeignKeyTargetTable( entityBinding, secondaryTableSource ),
targetColumns
targetColumns,
secondaryTableSource.isCascadeDeleteEnabled()
);
SecondaryTable secondaryTable = new SecondaryTable( table, foreignKey );
if(secondaryTableSource.getFetchStyle()!=null)
secondaryTable.setFetchStyle( secondaryTableSource.getFetchStyle() );
if ( secondaryTableSource.getFetchStyle()!=null ) {
secondaryTable.setFetchStyle( secondaryTableSource.getFetchStyle() );
}
secondaryTable.setInverse( secondaryTableSource.isInverse() );
secondaryTable.setOptional( secondaryTableSource.isOptional() );
secondaryTable.setCascadeDeleteEnabled( secondaryTableSource.isCascadeDeleteEnabled() );
secondaryTable.setCustomDelete( secondaryTableSource.getCustomSqlDelete() );
secondaryTable.setCustomInsert( secondaryTableSource.getCustomSqlInsert() );
secondaryTable.setCustomUpdate( secondaryTableSource.getCustomSqlUpdate() );
if ( secondaryTable.isCascadeDeleteEnabled() ) {
foreignKey.setDeleteRule( ForeignKey.ReferentialAction.CASCADE );
}
entityBinding.addSecondaryTable( secondaryTable );
metadata.addSecondaryTable( secondaryTable );
}
@ -1334,7 +1333,8 @@ public class Binder implements HelperContext {
ownerTable,
extractColumnsFromRelationalValueBindings( ownerAssociationAttributeBinding.getRelationalValueBindings() ),
entityBinding.getPrimaryTable(),
targetColumns
targetColumns,
attributeSource.isCascadeDeleteEnabled()
);
if ( foreignKey == null ) {
throw new AssertionFailure( "Foreign key not found; should have been defined by owner side of association." );
@ -1348,9 +1348,6 @@ public class Binder implements HelperContext {
secondaryTable.setCustomDelete( ownerSecondaryTable.getCustomDelete() );
secondaryTable.setCustomInsert( ownerSecondaryTable.getCustomInsert() );
secondaryTable.setCustomUpdate( ownerSecondaryTable.getCustomUpdate() );
if ( secondaryTable.isCascadeDeleteEnabled() ) {
foreignKey.setDeleteRule( ForeignKey.ReferentialAction.CASCADE );
}
entityBinding.addSecondaryTable( secondaryTable );
metadata.addSecondaryTable( secondaryTable );
}
@ -1428,13 +1425,15 @@ public class Binder implements HelperContext {
final TableSpecification sourceTable,
final List<RelationalValueBinding> sourceRelationalValueBindings,
final TableSpecification targetTable,
final List<Column> targetColumns) {
final List<Column> targetColumns,
boolean isCascadeDeleteEnabled) {
return foreignKeyHelper.locateOrCreateForeignKey(
foreignKeyName,
sourceTable,
extractColumnsFromRelationalValueBindings( sourceRelationalValueBindings ),
targetTable,
targetColumns
targetColumns,
isCascadeDeleteEnabled
);
}

6
hibernate-core/src/main/java/org/hibernate/metamodel/internal/ForeignKeyHelper.java
View File

@ -158,7 +158,8 @@ public class ForeignKeyHelper {
final TableSpecification sourceTable,
final List<Column> sourceColumns,
final TableSpecification targetTable,
final List<Column> targetColumns) {
final List<Column> targetColumns,
boolean isCascadeDeleteEnabled) {
final String foreignKeyName = helperContext.relationalIdentifierHelper().normalizeDatabaseIdentifier(
explicitForeignKeyName, new ForeignKeyNamingStrategyHelper(
sourceTable, sourceColumns, targetTable, targetColumns ) );
@ -169,6 +170,9 @@ public class ForeignKeyHelper {
foreignKey = sourceTable.createForeignKey( targetTable, foreignKeyName );
bindForeignKeyColumns( foreignKey, sourceTable, sourceColumns, targetTable, targetColumns );
}
if ( isCascadeDeleteEnabled ) {
foreignKey.setDeleteRule( ForeignKey.ReferentialAction.CASCADE );
}
return foreignKey;
}

7
hibernate-core/src/main/java/org/hibernate/metamodel/internal/resolver/MappedByAssociationRelationalBindingResolverImpl.java
View File

@ -103,7 +103,8 @@ public class MappedByAssociationRelationalBindingResolverImpl implements Associa
sourceTable,
sourceColumns,
targetTable,
targetColumns
targetColumns,
attributeSource.isCascadeDeleteEnabled()
);
}
@ -270,7 +271,9 @@ public class MappedByAssociationRelationalBindingResolverImpl implements Associa
(ManyToManyPluralAttributeElementBinding) pluralOwnerAttributeBinding.getPluralAttributeElementBinding();
foreignKey = ownerElementBinding.getForeignKey();
}
foreignKey.setDeleteRule( attributeSource.getKeySource().getOnDeleteAction() );
if ( attributeSource.getKeySource().isCascadeDeleteEnabled() ) {
foreignKey.setDeleteRule( ForeignKey.ReferentialAction.CASCADE );
}
return foreignKey;
}

10
hibernate-core/src/main/java/org/hibernate/metamodel/internal/resolver/StandardAssociationRelationalBindingResolverImpl.java
View File

@ -133,7 +133,8 @@ public class StandardAssociationRelationalBindingResolverImpl implements Associa
sourceTable,
sourceColumns,
targetTable,
targetColumns
targetColumns,
attributeSource.isCascadeDeleteEnabled()
);
}
@ -334,15 +335,13 @@ public class StandardAssociationRelationalBindingResolverImpl implements Associa
referencedEntityBinding,
keySource
);
ForeignKey foreignKey = locateOrCreateForeignKey(
return locateOrCreateForeignKey(
keySource,
referencedEntityBinding,
collectionTable,
sourceRelationalValueBindings,
targetColumns
);
foreignKey.setDeleteRule( keySource.getOnDeleteAction() );
return foreignKey;
}
@Override
@ -392,7 +391,8 @@ public class StandardAssociationRelationalBindingResolverImpl implements Associa
sourceTable,
extractColumnsFromRelationalValueBindings( sourceRelationalValueBindings ),
targetTable,
targetColumns
targetColumns,
foreignKeyContributingSource.isCascadeDeleteEnabled()
);
}

5
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/ManyToManyMappedByPluralAttributeElementSourceImpl.java
View File

@ -25,6 +25,11 @@ public class ManyToManyMappedByPluralAttributeElementSourceImpl
public String getExplicitForeignKeyName() {
throw new UnsupportedOperationException( "Not supported for attributes with mappedBy specified." ); }
@Override
public boolean isCascadeDeleteEnabled() {
return false;
}
@Override
public JoinColumnResolutionDelegate getForeignKeyTargetColumnResolutionDelegate() {
throw new UnsupportedOperationException( "Not supported for attributes with mappedBy specified." ); }

5
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/ManyToManyPluralAttributeElementSourceImpl.java
View File

@ -77,6 +77,11 @@ public class ManyToManyPluralAttributeElementSourceImpl
return pluralAssociationAttribute().getInverseForeignKeyName();
}
@Override
public boolean isCascadeDeleteEnabled() {
return false;
}
@Override
public JoinColumnResolutionDelegate getForeignKeyTargetColumnResolutionDelegate() {
boolean hasReferencedColumn = false;

10
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/PluralAttributeKeySourceImpl.java
View File

@ -31,7 +31,6 @@ import org.hibernate.annotations.OnDeleteAction;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.metamodel.internal.source.annotations.attribute.Column;
import org.hibernate.metamodel.internal.source.annotations.attribute.PluralAssociationAttribute;
import org.hibernate.metamodel.spi.relational.ForeignKey;
import org.hibernate.metamodel.spi.relational.TableSpecification;
import org.hibernate.metamodel.spi.relational.Value;
import org.hibernate.metamodel.spi.source.PluralAttributeKeySource;
@ -43,16 +42,15 @@ import org.hibernate.metamodel.spi.source.RelationalValueSource;
*/
public class PluralAttributeKeySourceImpl implements PluralAttributeKeySource {
private final PluralAssociationAttribute attribute;
private final ForeignKey.ReferentialAction deleteAction;
private final boolean isCascadeDeleteEnabled;
public PluralAttributeKeySourceImpl(PluralAssociationAttribute attribute) {
this.attribute = attribute;
this.deleteAction = attribute.getOnDeleteAction() == OnDeleteAction.CASCADE
? ForeignKey.ReferentialAction.CASCADE : ForeignKey.ReferentialAction.NO_ACTION;
this.isCascadeDeleteEnabled = attribute.getOnDeleteAction() == OnDeleteAction.CASCADE;
}
@Override
public ForeignKey.ReferentialAction getOnDeleteAction() {
return deleteAction;
public boolean isCascadeDeleteEnabled() {
return isCascadeDeleteEnabled;
}
@Override

5
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/ToOneAttributeSourceImpl.java
View File

@ -254,6 +254,11 @@ public class ToOneAttributeSourceImpl extends AbstractToOneAttributeSourceImpl i
return null;
}
@Override
public boolean isCascadeDeleteEnabled() {
return false;
}
public class AnnotationJoinColumnResolutionDelegate
implements ForeignKeyContributingSource.JoinColumnResolutionDelegate {

5
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/ToOneMappedByAttributeSourceImpl.java
View File

@ -107,6 +107,11 @@ public class ToOneMappedByAttributeSourceImpl extends AbstractToOneAttributeSour
throw new UnsupportedOperationException( "Not supported for a \"mappedBy\" association." );
}
@Override
public boolean isCascadeDeleteEnabled() {
return false;
}
@Override
public JoinColumnResolutionDelegate getForeignKeyTargetColumnResolutionDelegate() {
throw new UnsupportedOperationException( "Not supported for a \"mappedBy\" association." );

5
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/KeyManyToOneSourceImpl.java
View File

@ -197,4 +197,9 @@ class KeyManyToOneSourceImpl
public String getExplicitForeignKeyName() {
return keyManyToOneElement.getForeignKey();
}
@Override
public boolean isCascadeDeleteEnabled() {
return "cascade".equals( keyManyToOneElement.getOnDelete().value() );
}
}

5
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/ManyToManyPluralAttributeElementSourceImpl.java
View File

@ -149,6 +149,11 @@ public class ManyToManyPluralAttributeElementSourceImpl
return manyToManyElement.getForeignKey();
}
@Override
public boolean isCascadeDeleteEnabled() {
return false;
}
@Override
public JoinColumnResolutionDelegate getForeignKeyTargetColumnResolutionDelegate() {
return manyToManyElement.getPropertyRef() == null

5
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/ManyToOneAttributeSourceImpl.java
View File

@ -196,6 +196,11 @@ class ManyToOneAttributeSourceImpl extends AbstractToOneAttributeSourceImpl {
return manyToOneElement.getForeignKey();
}
@Override
public boolean isCascadeDeleteEnabled() {
return false;
}
@Override
public ForeignKeyDirection getForeignKeyDirection() {
return ForeignKeyDirection.TO_PARENT;

5
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/OneToOneAttributeSourceImpl.java
View File

@ -192,6 +192,11 @@ class OneToOneAttributeSourceImpl extends AbstractToOneAttributeSourceImpl {
return oneToOneElement.getForeignKey();
}
@Override
public boolean isCascadeDeleteEnabled() {
return false;
}
@Override
public ForeignKeyDirection getForeignKeyDirection() {
return oneToOneElement.isConstrained() ? ForeignKeyDirection.FROM_PARENT : ForeignKeyDirection.TO_PARENT;

6
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/PluralAttributeKeySourceImpl.java
View File

@ -110,10 +110,8 @@ public class PluralAttributeKeySourceImpl
}
@Override
public ForeignKey.ReferentialAction getOnDeleteAction() {
return "cascade".equals( keyElement.getOnDelete().value() )
? ForeignKey.ReferentialAction.CASCADE
: ForeignKey.ReferentialAction.NO_ACTION;
public boolean isCascadeDeleteEnabled() {
return "cascade".equals( keyElement.getOnDelete().value() );
}
@Override

8
hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/ForeignKeyContributingSource.java
View File

@ -42,6 +42,14 @@ public interface ForeignKeyContributingSource {
*/
public String getExplicitForeignKeyName();
/**
* Is "cascade delete" enabled for the foreign key? In other words, if a record in the parent (referenced)
* table is deleted, should the corresponding records in the child table automatically be deleted?
*
* @return true, if the cascade delete is enabled; false, otherwise.
*/
public boolean isCascadeDeleteEnabled();
/**
* Retrieve the delegate for resolving foreign key target columns. This corresponds directly to
* HBM {@code <property-ref/>} and JPA {@link javax.persistence.JoinColumn} mappings.

2
hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/PluralAttributeKeySource.java
View File

@ -31,5 +31,5 @@ import org.hibernate.metamodel.spi.relational.ForeignKey;
* @author Steve Ebersole
*/
public interface PluralAttributeKeySource extends ForeignKeyContributingSource, RelationalValueSourceContainer {
public ForeignKey.ReferentialAction getOnDeleteAction();
public boolean isCascadeDeleteEnabled();
}

1
hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd
View File

@ -1233,6 +1233,7 @@
<xs:attribute name="foreign-key" type="xs:string"/>
<xs:attribute name="lazy" type="lazy-attribute"/>
<xs:attribute name="name" use="required" type="xs:string"/>
<xs:attribute name="on-delete" default="noaction" type="on-delete-attribute"/>
</xs:complexType>
<xs:complexType name="key-property-element">

3
hibernate-core/src/test/java/org/hibernate/serialization/SessionFactorySerializationTest.java
View File

@ -36,6 +36,7 @@ import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
import org.hibernate.internal.SessionFactoryRegistry;
import org.hibernate.internal.util.SerializationHelper;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.type.SerializationException;
import org.junit.Test;
@ -47,6 +48,7 @@ public class SessionFactorySerializationTest extends BaseUnitTestCase {
public static final String NAME = "mySF";
@Test
@FailureExpectedWithNewMetamodel
public void testNamedSessionFactorySerialization() throws Exception {
Configuration cfg = new Configuration()
.setProperty( AvailableSettings.SESSION_FACTORY_NAME, NAME )
@ -73,6 +75,7 @@ public class SessionFactorySerializationTest extends BaseUnitTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testUnNamedSessionFactorySerialization() throws Exception {
// IMPL NOTE : this test is a control to testNamedSessionFactorySerialization
// here, the test should fail based just on attempted uuid resolution

3
hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java
View File

@ -58,7 +58,6 @@ import org.junit.Test;
*
* @author Steve Ebersole
*/
@FailureExpectedWithNewMetamodel
public class BulkManipulationTest extends BaseCoreFunctionalTestCase {
public String[] getMappings() {
return new String[] {
@ -1349,7 +1348,6 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase {
@Test
@TestForIssue( jiraKey = "HHH-8476" )
@FailureExpectedWithNewMetamodel
public void testManyToManyBulkDelete() {
Session s = openSession();
Transaction t = s.beginTransaction();
@ -1387,6 +1385,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase {
@Test
@TestForIssue( jiraKey = "HHH-1917" )
@FailureExpectedWithNewMetamodel
public void testManyToManyBulkDeleteMultiTable() {
Session s = openSession();
Transaction t = s.beginTransaction();

1
hibernate-core/src/test/java/org/hibernate/test/idprops/IdentifierPropertyReferencesTest.java
View File

@ -38,7 +38,6 @@ import static org.junit.Assert.assertEquals;
/**
* @author Steve Ebersole
*/
@FailureExpectedWithNewMetamodel
public class IdentifierPropertyReferencesTest extends BaseCoreFunctionalTestCase {
@Override
public String[] getMappings() {

24
hibernate-core/src/test/java/org/hibernate/test/immutable/ImmutableTest.java
View File

@ -52,7 +52,6 @@ import static org.junit.Assert.fail;
/**
* @author Gavin King
*/
@FailureExpectedWithNewMetamodel
public class ImmutableTest extends BaseCoreFunctionalTestCase {
private static class TextAsMaterializedClobType extends AbstractSingleColumnStandardBasicType<String> {
public final static TextAsMaterializedClobType INSTANCE = new TextAsMaterializedClobType();
@ -79,6 +78,7 @@ public class ImmutableTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testChangeImmutableEntityProxyToModifiable() {
Contract c = new Contract( null, "gavin", "phone");
ContractVariation cv1 = new ContractVariation(1, c);
@ -140,6 +140,7 @@ public class ImmutableTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testChangeImmutableEntityToModifiable() {
Contract c = new Contract( null, "gavin", "phone");
ContractVariation cv1 = new ContractVariation(1, c);
@ -931,7 +932,12 @@ public class ImmutableTest extends BaseCoreFunctionalTestCase {
t = s.beginTransaction();
c = ( Contract ) s.merge( c );
assertTrue( s.isReadOnly( c ) );
assertTrue( Hibernate.isInitialized( c.getVariations() ) );
// Contract has 2 collections (subcontracts and variations);
// only 1 will be eagerly loaded with the merge;
// the 1 that is eagerly loaded will be the one that gets bound
// first; since this is indeterminate, we cannot test if the
// collection is initialized.
assertEquals( 2, c.getVariations().size() );
Iterator it = c.getVariations().iterator();
cv1 = (ContractVariation) it.next();
cv2 = (ContractVariation) it.next();
@ -986,7 +992,12 @@ public class ImmutableTest extends BaseCoreFunctionalTestCase {
c.setCustomerName("foo bar");
c = ( Contract ) s.merge( c );
assertTrue( s.isReadOnly( c ) );
assertTrue( Hibernate.isInitialized( c.getVariations() ) );
// Contract has 2 collections (subcontracts and variations);
// only 1 will be eagerly loaded with the merge;
// the 1 that is eagerly loaded will be the one that gets bound
// first; since this is indeterminate, we cannot test if the
// collection is initialized.
assertEquals( 2, c.getVariations().size() );
Iterator it = c.getVariations().iterator();
cv1 = (ContractVariation) it.next();
cv2 = (ContractVariation) it.next();
@ -1042,7 +1053,12 @@ public class ImmutableTest extends BaseCoreFunctionalTestCase {
cv1.setText("blah blah");
c = ( Contract ) s.merge( c );
assertTrue( s.isReadOnly( c ) );
assertTrue( Hibernate.isInitialized( c.getVariations() ) );
// Contract has 2 collections (subcontracts and variations);
// only 1 will be eagerly loaded with the merge;
// the 1 that is eagerly loaded will be the one that gets bound
// first; since this is indeterminate, we cannot test if the
// collection is initialized.
assertEquals( 2, c.getVariations().size() );
Iterator it = c.getVariations().iterator();
cv1 = (ContractVariation) it.next();
cv2 = (ContractVariation) it.next();

2
hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
View File

@ -39,7 +39,6 @@ import org.hibernate.integrator.spi.Integrator;
import org.hibernate.metamodel.spi.MetadataImplementor;
import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@ -50,7 +49,6 @@ import static org.junit.Assert.fail;
* @author Steve Ebersole
*/
@SuppressWarnings( {"unchecked"})
@FailureExpectedWithNewMetamodel
public class EagerKeyManyToOneTest extends BaseCoreFunctionalTestCase {
@Override
public String[] getMappings() {

2
hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java
View File

@ -29,7 +29,6 @@ import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;
@ -37,7 +36,6 @@ import static org.junit.Assert.assertEquals;
/**
* @author Steve Ebersole
*/
@FailureExpectedWithNewMetamodel
public class LazyKeyManyToOneTest extends BaseCoreFunctionalTestCase {
@Override
public String[] getMappings() {

2
hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java
View File

@ -32,7 +32,6 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.criterion.Restrictions;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;
@ -40,7 +39,6 @@ import static org.junit.Assert.assertEquals;
/**
* @author Steve Ebersole
*/
@FailureExpectedWithNewMetamodel
public class KeyManyToOneTest extends BaseCoreFunctionalTestCase {
@Override
public String[] getMappings() {

2
hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java
View File

@ -29,7 +29,6 @@ import org.junit.Assert;
import org.junit.Test;
import org.hibernate.testing.DialectChecks;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.RequiresDialectFeature;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@ -38,7 +37,6 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
* @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
*/
@RequiresDialectFeature(DialectChecks.SupportsCascadeDeleteCheck.class)
@FailureExpectedWithNewMetamodel
public class KeyManyToOneCascadeDeleteTest extends BaseCoreFunctionalTestCase {
@Override
public String[] getMappings() {

2
hibernate-core/src/test/java/org/hibernate/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java
View File

@ -29,7 +29,6 @@ import org.junit.Assert;
import org.junit.Test;
import org.hibernate.testing.DialectChecks;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.RequiresDialectFeature;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@ -38,7 +37,6 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
* @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
*/
@RequiresDialectFeature(DialectChecks.SupportsCascadeDeleteCheck.class)
@FailureExpectedWithNewMetamodel
public class KeyManyToOneCascadeDeleteTest extends BaseCoreFunctionalTestCase {
@Override
public String[] getMappings() {

3
hibernate-core/src/test/java/org/hibernate/test/loadplans/plans/LoadPlanStructureAssertionTest.java
View File

@ -80,12 +80,9 @@ public class LoadPlanStructureAssertionTest extends BaseUnitTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testSpecialOneToOne() {
// tests the mappings defined in org.hibernate.test.onetoone.joined.JoinedSubclassOneToOneTest
// metamodel : XSD problem : key-many-to-one needs to add on-delete attribute
Configuration cfg = new Configuration();
cfg.addResource( "org/hibernate/test/onetoone/formula/Person.hbm.xml" );
SessionFactoryImplementor sf = (SessionFactoryImplementor) cfg.buildSessionFactory();

2
hibernate-core/src/test/java/org/hibernate/test/loadplans/process/NonEncapsulatedCompositeIdResultSetProcessorTest.java
View File

@ -41,7 +41,6 @@ import org.hibernate.loader.plan.exec.query.spi.NamedParameterContext;
import org.hibernate.loader.plan.exec.spi.LoadQueryDetails;
import org.hibernate.loader.plan.spi.LoadPlan;
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.type.Type;
import org.junit.Test;
@ -56,7 +55,6 @@ import static org.junit.Assert.assertNotNull;
/**
* @author Steve Ebersole
*/
@FailureExpectedWithNewMetamodel
public class NonEncapsulatedCompositeIdResultSetProcessorTest extends BaseCoreFunctionalTestCase {
@Override

2
hibernate-core/src/test/java/org/hibernate/test/loadplans/walking/KeyManyToOneWalkingTest.java
View File

@ -28,14 +28,12 @@ import org.hibernate.persister.walking.spi.MetamodelGraphWalker;
import org.junit.Test;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.test.onetoone.formula.Address;
/**
* @author Steve Ebersole
*/
@FailureExpectedWithNewMetamodel
public class KeyManyToOneWalkingTest extends BaseCoreFunctionalTestCase {
@Override
protected String[] getMappings() {

2
hibernate-core/src/test/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java
View File

@ -49,7 +49,6 @@ import static org.junit.Assert.assertTrue;
/**
* @author Gavin King
*/
@FailureExpectedWithNewMetamodel
public class OneToOneFormulaTest extends BaseCoreFunctionalTestCase {
private static class TextAsMaterializedClobType extends AbstractSingleColumnStandardBasicType<String> {
public final static TextAsMaterializedClobType INSTANCE = new TextAsMaterializedClobType();
@ -151,6 +150,7 @@ public class OneToOneFormulaTest extends BaseCoreFunctionalTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testOneToOneEmbeddedCompositeKey() {
Person p = new Person();
p.setName("Gavin King");

5
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
View File

@ -174,11 +174,8 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
}
protected void rebuildSessionFactory() {
if ( sessionFactory == null ) {
return;
}
try {
sessionFactory.close();
releaseSessionFactory();
}
catch (Exception ignore) {
}