Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ default boolean canBeBatched(BatchKey batchKey, int batchSize) {

// This should already be guaranteed by the batchKey being null
assert !getTableDetails().isIdentifierTable()
|| !(getMutationTarget() instanceof EntityMutationTarget entityMutationTarget
|| !( getMutationTarget() instanceof EntityMutationTarget entityMutationTarget
&& entityMutationTarget.getMutationDelegate( getMutationType() ) != null );

if ( getMutationType() == MutationType.UPDATE ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,7 @@ public void setup() {

@AfterEach
public void cleanup(SessionFactoryScope scope) {
scope.inTransaction( s -> {
if ( up.getId() != null ) {
s.remove( up );
}
if ( vp.getId() != null ) {
s.remove( vp );
}
if ( c.getId() != null ) {
s.remove( c );
}
} );
scope.getSessionFactory().getSchemaManager().truncate();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ void setUp(SessionFactoryScope scope) {

@AfterEach
void tearDown(SessionFactoryScope scope) {
scope.inTransaction( session -> {
session.createMutationQuery( "delete Event" ).executeUpdate();
} );
scope.getSessionFactory().getSchemaManager().truncate();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.Date;
import java.util.EnumSet;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.TimeZone;
Expand All @@ -24,8 +23,6 @@
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.OracleDialect;
import org.hibernate.query.Query;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.schema.TargetType;
import org.hibernate.type.StandardBasicTypes;

import org.hibernate.testing.orm.junit.DomainModel;
Expand All @@ -37,7 +34,6 @@
import org.hibernate.testing.orm.junit.SkipForDialect;

import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down Expand Up @@ -435,16 +431,8 @@ public void testBasic(SessionFactoryScope scope) throws Exception {
);
}

// tests are leaving data around, so drop/recreate schema for now. this is what the old tests did

@BeforeEach
public void runCreateSchema(DomainModelScope domainModelScope) {
new SchemaExport().create( EnumSet.of( TargetType.DATABASE ), domainModelScope.getDomainModel() );
}

@AfterEach
public void runDropSchema(DomainModelScope domainModelScope) {
new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), domainModelScope.getDomainModel() );
public void runDropSchema(SessionFactoryScope scope) {
scope.getSessionFactory().getSchemaManager().truncate();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,7 @@ public void setUp(EntityManagerFactoryScope scope) {

@AfterEach
public void tearDown(EntityManagerFactoryScope scope) {
scope.inTransaction( entityManager -> {
entityManager.createQuery( "delete Customer" ).executeUpdate();
entityManager.createQuery( "delete Address" ).executeUpdate();
} );
scope.getEntityManagerFactory().getSchemaManager().truncate();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.Size;
import org.hibernate.SessionFactory;
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
import org.hibernate.testing.orm.junit.Jira;
import org.hibernate.testing.orm.junit.Jpa;
Expand Down Expand Up @@ -179,7 +178,7 @@ public void setUp(EntityManagerFactoryScope scope) {

@AfterEach
public void tearDown(EntityManagerFactoryScope scope) {
scope.getEntityManagerFactory().unwrap( SessionFactory.class ).getSchemaManager().truncateMappedObjects();
scope.getEntityManagerFactory().getSchemaManager().truncate();
}

@Entity(name = "TestEntity")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
package org.hibernate.orm.test.annotations.cascade;

import java.util.HashSet;
import java.util.List;
import java.util.Set;

import org.hibernate.testing.orm.junit.DomainModel;
Expand All @@ -28,19 +27,7 @@ public class CascadeToEmbeddedManyToOneTest {

@AfterEach
public void teaDown(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
List<CodedPairHolder> pairHolders = session.createQuery( "select p from CodedPairHolder p" ).list();
pairHolders.forEach(
pairHolder -> {
PersonPair pair = pairHolder.getPair();
session.remove( pairHolder );
session.remove(pair.getLeft());
session.remove(pair.getRight());
}
);
}
);
scope.getSessionFactory().getSchemaManager().truncate();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,44 +117,7 @@ public void setup(SessionFactoryScope scope) {

@AfterEach
public void cleanup(SessionFactoryScope scope) {
b.setC( null );
b.setD( null );
b.getGCollection().remove( g );

c.getBCollection().remove( b );
c.getDCollection().remove( d );

d.getBCollection().remove( b );
d.setC( null );
d.setE( null );
d.getFCollection().remove( f );

e.getDCollection().remove( d );
e.setF( null );

f.setD( null );
f.getECollection().remove( e );
f.setG( null );

g.setB( null );
g.getFCollection().remove( f );

scope.inTransaction(
session -> {
b = session.merge( b );
c = session.merge( c );
d = session.merge( d );
e = session.merge( e );
f = session.merge( f );
g = session.merge( g );
session.remove( f );
session.remove( g );
session.remove( b );
session.remove( d );
session.remove( e );
session.remove( c );
}
);
scope.getSessionFactory().getSchemaManager().truncate();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,44 +115,7 @@ public void setup(SessionFactoryScope scope) {

@AfterEach
public void cleanup(SessionFactoryScope scope) {
b.setC( null );
b.setD( null );
b.getGCollection().remove( g );

c.getBCollection().remove( b );
c.getDCollection().remove( d );

d.getBCollection().remove( b );
d.setC( null );
d.setE( null );
d.getFCollection().remove( f );

e.getDCollection().remove( d );
e.setF( null );

f.setD( null );
f.getECollection().remove( e );
f.setG( null );

g.setB( null );
g.getFCollection().remove( f );

scope.inTransaction(
session -> {
b = (B) session.merge( b );
c = (C) session.merge( c );
d = (D) session.merge( d );
e = (E) session.merge( e );
f = (F) session.merge( f );
g = (G) session.merge( g );
session.remove( f );
session.remove( g );
session.remove( b );
session.remove( d );
session.remove( e );
session.remove( c );
}
);
scope.getSessionFactory().getSchemaManager().truncate();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,44 +119,7 @@ public void setup(SessionFactoryScope scope) {

@AfterEach
public void cleanup(SessionFactoryScope scope) {
b.setC( null );
b.setD( null );
b.getGCollection().remove( g );

c.getBCollection().remove( b );
c.getDCollection().remove( d );

d.getBCollection().remove( b );
d.setC( null );
d.setE( null );
d.getFCollection().remove( f );

e.getDCollection().remove( d );
e.setF( null );

f.setD( null );
f.getECollection().remove( e );
f.setG( null );

g.setB( null );
g.getFCollection().remove( f );

scope.inTransaction(
session -> {
b = session.merge( b );
c = session.merge( c );
d = session.merge( d );
e = session.merge( e );
f = session.merge( f );
g = session.merge( g );
session.remove( f );
session.remove( g );
session.remove( b );
session.remove( d );
session.remove( e );
session.remove( c );
}
);
scope.getSessionFactory().getSchemaManager().truncate();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,44 +115,7 @@ public void setup(SessionFactoryScope scope) {

@AfterEach
public void cleanup(SessionFactoryScope scope) {
b.setC( null );
b.setD( null );
b.getGCollection().remove( g );

c.getBCollection().remove( b );
c.getDCollection().remove( d );

d.getBCollection().remove( b );
d.setC( null );
d.setE( null );
d.getFCollection().remove( f );

e.getDCollection().remove( d );
e.setF( null );

f.setD( null );
f.getECollection().remove( e );
f.setG( null );

g.setB( null );
g.getFCollection().remove( f );

scope.inTransaction(
session -> {
b = session.merge( b );
c = session.merge( c );
d = session.merge( d );
e = session.merge( e );
f = session.merge( f );
g = session.merge( g );
session.remove( f );
session.remove( g );
session.remove( b );
session.remove( d );
session.remove( e );
session.remove( c );
}
);
scope.getSessionFactory().getSchemaManager().truncate();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,7 @@ public class CompositeIdTest {

@AfterEach
public void tearDown(SessionFactoryScope scope){
scope.inTransaction(
session -> {
session.createQuery( "delete from LittleGenius" ).executeUpdate();
session.createQuery( "delete from Child" ).executeUpdate();
session.createQuery( "delete from Parent" ).executeUpdate();
session.createQuery( "delete from SomeEntity" ).executeUpdate();
session.createQuery( "delete from TvProgram" ).executeUpdate();
session.createQuery( "delete from TvProgramIdClass" ).executeUpdate();
session.createQuery( "delete from TvMagazin" ).executeUpdate();
session.createQuery( "delete from Presenter" ).executeUpdate();
session.createQuery( "delete from Channel" ).executeUpdate();
session.createQuery( "delete from A" ).executeUpdate();
session.createQuery( "delete from B" ).executeUpdate();
session.createQuery( "delete from C" ).executeUpdate();
session.createQuery( "delete from OrderLine" ).executeUpdate();
session.createQuery( "delete from Product" ).executeUpdate();
session.createQuery( "delete from Order" ).executeUpdate();
}
);
scope.getSessionFactory().getSchemaManager().truncate();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ public class CompositeIdWithOrderedUpdatesTest {

@AfterEach
public void tearDown(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
session.createQuery( "delete from ModelWithSelfChildren" ).executeUpdate();
}
);
scope.getSessionFactory().getSchemaManager().truncate();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,7 @@ void testFetchFlightFromFreight(EntityManagerFactoryScope scope) {

@AfterEach
void cleanUp(EntityManagerFactoryScope scope) {
scope.inTransaction(
entityManager -> {
entityManager.createQuery("delete from Freight").executeUpdate();
entityManager.createQuery("delete from FlightSegmentConfiguration").executeUpdate();
entityManager.createQuery("delete from FlightSegment").executeUpdate();
entityManager.createQuery("delete from Flight").executeUpdate();
}
);
scope.getEntityManagerFactory().getSchemaManager().truncate();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,7 @@ void testFetchFlightFromFreight(EntityManagerFactoryScope scope) {

@AfterEach
void cleanUp(EntityManagerFactoryScope scope) {
scope.inTransaction(
entityManager -> {
entityManager.createQuery("delete from Freight").executeUpdate();
entityManager.createQuery("delete from FlightSegmentConfiguration").executeUpdate();
entityManager.createQuery("delete from FlightSegment").executeUpdate();
entityManager.createQuery("delete from Flight").executeUpdate();
}
);
scope.getEntityManagerFactory().getSchemaManager().truncate();
}

}
Loading
Loading