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

HHH-10996 - The cleanupTestData utility has issues with link tables 

Use bulk delete in certain situations like when we have a @Formula annotation that takes an SQL function which is not supported by the currently running DB

(cherry picked from commit bf823d440c)

Conflicts:
	hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
This commit is contained in:
Vlad Mihalcea 2016-07-29 07:43:18 +03:00 committed by Gail Badner
parent 2bf9cadef3
commit 72f238f813
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java
View File

@ -57,10 +57,17 @@ import static org.junit.Assert.fail;
* @author Emmanuel Bernard * @author Emmanuel Bernard
*/ */
public class QueryAndSQLTest extends BaseCoreFunctionalTestCase { public class QueryAndSQLTest extends BaseCoreFunctionalTestCase {
@Override @Override
protected boolean isCleanupTestDataRequired() { protected boolean isCleanupTestDataRequired() {
return true; return true;
} }
@Override
protected boolean isCleanupTestDataUsingBulkDelete() {
return true;
}
@Test @Test
public void testNativeQueryWithFormulaAttribute() { public void testNativeQueryWithFormulaAttribute() {
SQLFunction dateFunction = getDialect().getFunctions().get( "current_date" ); SQLFunction dateFunction = getDialect().getFunctions().get( "current_date" );

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

@ -372,6 +372,10 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
return false; return false;
} }
protected boolean isCleanupTestDataUsingBulkDelete() {
return false;
}
protected void cleanupTestData() throws Exception { protected void cleanupTestData() throws Exception {
// Because of https://hibernate.atlassian.net/browse/HHH-5529, // Because of https://hibernate.atlassian.net/browse/HHH-5529,
// we can'trely on a Bulk Delete query which will not clear the link tables in @ElementCollection or unidirectional collections // we can'trely on a Bulk Delete query which will not clear the link tables in @ElementCollection or unidirectional collections
@ -379,10 +383,16 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
Transaction transaction = s.beginTransaction(); Transaction transaction = s.beginTransaction();
s.getTransaction().begin(); s.getTransaction().begin();
try { try {
if(isCleanupTestDataUsingBulkDelete()) {
s.createQuery( "delete from java.lang.Object" ).executeUpdate();
}
else {
for ( Object o : s.createQuery( "from java.lang.Object" ).list() ) { for ( Object o : s.createQuery( "from java.lang.Object" ).list() ) {
s.delete( o ); s.delete( o );
} }
} }
}
catch (Exception e) { catch (Exception e) {
if ( transaction.getStatus().canRollback() ) { if ( transaction.getStatus().canRollback() ) {
transaction.rollback(); transaction.rollback();