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

Fix MatchingIdSelectionHelper#selectMatchingIds

This commit is contained in:
Andrea Boriero 2021-12-01 16:38:48 +01:00 committed by Christian Beikov
parent b436392167
commit 9392b94ee7
2 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java
View File

@ -315,7 +315,7 @@ public class MatchingIdSelectionHelper {
idSelectJdbcOperation, idSelectJdbcOperation,
jdbcParameterBindings, jdbcParameterBindings,
SqmJdbcExecutionContextAdapter.omittingLockingAndPaging( executionContext ), SqmJdbcExecutionContextAdapter.omittingLockingAndPaging( executionContext ),
row -> row, row -> row[0],
ListResultsConsumer.UniqueSemantic.FILTER ListResultsConsumer.UniqueSemantic.FILTER
); );
} }

77
hibernate-core/src/test/java/org/hibernate/test/inheritance/InheritanceDeleteBatchTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceDeleteBatchTest.java
View File

@ -4,7 +4,20 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later. * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/ */
package org.hibernate.test.inheritance; package org.hibernate.orm.test.inheritance;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.query.sqm.mutation.internal.inline.InlineStrategy;
import org.hibernate.stat.spi.StatisticsImplementor;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.ServiceRegistry;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.hibernate.testing.orm.junit.SettingProvider;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.Id; import jakarta.persistence.Id;
@ -13,47 +26,41 @@ import jakarta.persistence.InheritanceType;
import jakarta.persistence.Query; import jakarta.persistence.Query;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
import org.hibernate.query.sqm.mutation.internal.inline.InlineStrategy;
import org.hibernate.stat.spi.StatisticsImplementor;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
/** /**
* @author Andrea Boriero * @author Andrea Boriero
*/ */
@TestForIssue(jiraKey = "HHH-13214") @TestForIssue(jiraKey = "HHH-13214")
public class InheritanceDeleteBatchTest extends BaseCoreFunctionalTestCase { @DomainModel(
annotatedClasses = {
InheritanceDeleteBatchTest.TestEntity.class,
InheritanceDeleteBatchTest.TestEntityType1.class,
InheritanceDeleteBatchTest.TestEntityType2.class
}
)
@SessionFactory(
generateStatistics = true
)
@ServiceRegistry(
settingProviders = @SettingProvider(
settingName = AvailableSettings.QUERY_MULTI_TABLE_MUTATION_STRATEGY,
provider = InheritanceDeleteBatchTest.TableMutationStrategyProvider.class
)
)
public class InheritanceDeleteBatchTest {
@Override public static class TableMutationStrategyProvider implements SettingProvider.Provider<String> {
protected Class<?>[] getAnnotatedClasses() { @Override
return new Class[] { public String getSetting() {
TestEntity.class, return InlineStrategy.class.getName();
TestEntityType1.class, }
TestEntityType2.class
};
} }
@Override @BeforeEach
protected void configure(Configuration configuration) { public void setUp(SessionFactoryScope scope) {
configuration.setProperty( scope.inTransaction( session -> {
AvailableSettings.QUERY_MULTI_TABLE_MUTATION_STRATEGY,
InlineStrategy.class.getName()
);
configuration.setProperty( AvailableSettings.GENERATE_STATISTICS, "true" );
}
@Before
public void setUp() {
doInHibernate( this::sessionFactory, session -> {
session.persist( new TestEntity( 1 ) ); session.persist( new TestEntity( 1 ) );
session.persist( new TestEntityType1( 2 ) ); session.persist( new TestEntityType1( 2 ) );
session.persist( new TestEntityType2( 3 ) ); session.persist( new TestEntityType2( 3 ) );
@ -62,10 +69,10 @@ public class InheritanceDeleteBatchTest extends BaseCoreFunctionalTestCase {
} }
@Test @Test
public void testDelete() { public void testDelete(SessionFactoryScope scope) {
StatisticsImplementor statistics = sessionFactory().getStatistics(); StatisticsImplementor statistics = scope.getSessionFactory().getStatistics();
statistics.clear(); statistics.clear();
doInHibernate( this::sessionFactory, session -> { scope.inTransaction( session -> {
for ( int i = 1; i <= 4; i++ ) { for ( int i = 1; i <= 4; i++ ) {
Query deleteQuery = session.createQuery( "delete TestEntity e where e.id = :id" ); Query deleteQuery = session.createQuery( "delete TestEntity e where e.id = :id" );
deleteQuery.setParameter( "id", i ); deleteQuery.setParameter( "id", i );