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

HHH-13715 - working support for "multi-table" HQL/Criteria UPDATE and DELETE queries; 

tests for joined-subclass
This commit is contained in:
Steve Ebersole 2019-11-11 16:46:27 -06:00
parent ba5ef1b149
commit 82b8e77184
2 changed files with 96 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java
View File

@ -40,13 +40,10 @@ public class StandardJdbcMutationExecutor implements JdbcMutationExecutor {
.getJdbcCoordinator() .getJdbcCoordinator()
.getLogicalConnection(); .getLogicalConnection();
final JdbcServices jdbcServices = executionContext.getSession().getFactory().getServiceRegistry().getService( final JdbcServices jdbcServices = executionContext.getSession().getJdbcServices();
JdbcServices.class );
final String sql = jdbcMutation.getSql(); final String sql = jdbcMutation.getSql();
try { try {
jdbcServices.getSqlStatementLogger().logStatement( sql );
// prepare the query // prepare the query
final PreparedStatement preparedStatement = statementCreator.apply( sql ); final PreparedStatement preparedStatement = statementCreator.apply( sql );

96
hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlDeleteExecutionTests.java
View File

@ -10,6 +10,7 @@ import java.time.Instant;
import java.util.Date; import java.util.Date;
import org.hibernate.orm.test.metamodel.mapping.SecondaryTableTests; import org.hibernate.orm.test.metamodel.mapping.SecondaryTableTests;
import org.hibernate.orm.test.metamodel.mapping.inheritance.joined.JoinedInheritanceTest;
import org.hibernate.testing.orm.domain.StandardDomainModel; import org.hibernate.testing.orm.domain.StandardDomainModel;
import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModel;
@ -28,7 +29,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
@SuppressWarnings("WeakerAccess") @SuppressWarnings("WeakerAccess")
@DomainModel( @DomainModel(
standardModels = StandardDomainModel.GAMBIT, standardModels = StandardDomainModel.GAMBIT,
annotatedClasses = SecondaryTableTests.SimpleEntityWithSecondaryTables.class annotatedClasses = {
SecondaryTableTests.SimpleEntityWithSecondaryTables.class,
JoinedInheritanceTest.Customer.class,
JoinedInheritanceTest.DomesticCustomer.class,
JoinedInheritanceTest.ForeignCustomer.class
}
) )
@ServiceRegistry @ServiceRegistry
@SessionFactory( exportSchema = true ) @SessionFactory( exportSchema = true )
@ -110,4 +116,92 @@ public class HqlDeleteExecutionTests {
); );
} }
@Test
public void testJoinedSubclassRootDelete(SessionFactoryScope scope) {
scope.inTransaction(
session -> session.createQuery( "delete Customer" ).executeUpdate()
);
}
@Test
public void testJoinedSubclassRootRestrictedDelete(SessionFactoryScope scope) {
scope.inTransaction(
session -> session.createQuery( "delete Customer where name = 'abc'" ).executeUpdate()
);
}
@Test
@FailureExpected( reason = "No idea why this one fails. H2 complains inserting the temp table that one of the PK values we select is NULL" )
public void testJoinedSubclassRootRestrictedDeleteResults(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
session.save(
new JoinedInheritanceTest.ForeignCustomer( 1, "Adventures Abroad", "123" )
);
session.save(
new JoinedInheritanceTest.DomesticCustomer( 2, "Domestic Wonders", "456" )
);
}
);
scope.inTransaction(
session -> {
final int rows = session.createQuery( "delete Customer where name = 'Adventures Abroad'" ).executeUpdate();
assertThat( rows, is( 1 ) );
}
);
scope.inTransaction(
session -> {
final int rows = session.createQuery( "delete from Customer" ).executeUpdate();
assertThat( rows, is( 1 ) );
}
);
}
@Test
public void testJoinedSubclassLeafDelete(SessionFactoryScope scope) {
scope.inTransaction(
session -> session.createQuery( "delete ForeignCustomer" ).executeUpdate()
);
scope.inTransaction(
session -> session.createQuery( "delete DomesticCustomer" ).executeUpdate()
);
}
@Test
public void testJoinedSubclassLeafRestrictedDelete(SessionFactoryScope scope) {
scope.inTransaction(
session -> session.createQuery( "delete ForeignCustomer where name = 'abc'" ).executeUpdate()
);
scope.inTransaction(
session -> session.createQuery( "delete DomesticCustomer where name = 'abc'" ).executeUpdate()
);
}
@Test
@FailureExpected( reason = "No idea why this one fails. H2 complains inserting the temp table that one of the PK values we select is NULL" )
public void testJoinedSubclassLeafRestrictedDeleteResult(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
session.save(
new JoinedInheritanceTest.ForeignCustomer( 1, "Adventures Abroad", "123" )
);
session.save(
new JoinedInheritanceTest.DomesticCustomer( 2, "Domestic Wonders", "456" )
);
}
);
scope.inTransaction(
session -> session.createQuery( "delete ForeignCustomer where name = 'Adventures Abroad'" ).executeUpdate()
);
scope.inTransaction(
session -> session.createQuery( "delete DomesticCustomer where name = 'Domestic Wonders'" ).executeUpdate()
);
}
} }