Skip to content

Commit 1c840f9

Browse files
committed
HHH-12858 HHH-13432 fix Oracle failing tests
1 parent 93a0745 commit 1c840f9

File tree

1 file changed

+39
-0
lines changed

1 file changed

+39
-0
lines changed

hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,19 @@
1818
import javax.persistence.spi.PersistenceUnitInfo;
1919
import javax.sql.DataSource;
2020

21+
import org.hibernate.boot.spi.MetadataImplementor;
22+
import org.hibernate.boot.spi.SessionFactoryOptions;
2123
import org.hibernate.cache.spi.access.AccessType;
2224
import org.hibernate.cfg.AvailableSettings;
2325
import org.hibernate.dialect.Dialect;
2426
import org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl;
2527
import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
2628
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
29+
import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
30+
import org.hibernate.engine.jdbc.spi.JdbcServices;
2731
import org.hibernate.engine.spi.SessionFactoryImplementor;
32+
import org.hibernate.hql.internal.ast.HqlSqlWalker;
33+
import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
2834
import org.hibernate.jpa.HibernatePersistenceProvider;
2935
import org.hibernate.persister.entity.EntityPersister;
3036

@@ -88,6 +94,7 @@ public void testPassingIntegrationJtaDataSourceOverrideForJpaJdbcSettings() {
8894
final DataSource integrationDataSource = new DataSourceStub( "integrationDataSource" );
8995

9096
final HibernatePersistenceProvider provider = new HibernatePersistenceProvider();
97+
puInfo.getProperties().setProperty( AvailableSettings.HQL_BULK_ID_STRATEGY, MultiTableBulkIdStrategyStub.class.getName() );
9198

9299
final EntityManagerFactory emf = provider.createContainerEntityManagerFactory(
93100
puInfo,
@@ -273,6 +280,7 @@ public DataSource getJtaDataSource() {
273280
final Map integrationOverrides = new HashMap();
274281
//noinspection unchecked
275282
integrationOverrides.put( AvailableSettings.JPA_JTA_DATASOURCE, integrationDataSource );
283+
integrationOverrides.put( AvailableSettings.HQL_BULK_ID_STRATEGY, new MultiTableBulkIdStrategyStub() );
276284

277285
final EntityManagerFactory emf = provider.createContainerEntityManagerFactory(
278286
new PersistenceUnitInfoAdapter(),
@@ -318,6 +326,7 @@ public DataSource getNonJtaDataSource() {
318326
final DataSource override = new DataSourceStub( "integrationDataSource" );
319327
final Map<String,Object> integrationSettings = new HashMap<>();
320328
integrationSettings.put( AvailableSettings.JPA_NON_JTA_DATASOURCE, override );
329+
integrationSettings.put( AvailableSettings.HQL_BULK_ID_STRATEGY, new MultiTableBulkIdStrategyStub() );
321330

322331
final PersistenceProvider provider = new HibernatePersistenceProvider();
323332

@@ -502,4 +511,34 @@ public void setName(String name) {
502511
this.name = name;
503512
}
504513
}
514+
515+
public static class MultiTableBulkIdStrategyStub implements MultiTableBulkIdStrategy {
516+
517+
@Override
518+
public void prepare(
519+
JdbcServices jdbcServices,
520+
JdbcConnectionAccess connectionAccess,
521+
MetadataImplementor metadata,
522+
SessionFactoryOptions sessionFactoryOptions) {
523+
524+
}
525+
526+
@Override
527+
public void release(
528+
JdbcServices jdbcServices, JdbcConnectionAccess connectionAccess) {
529+
530+
}
531+
532+
@Override
533+
public UpdateHandler buildUpdateHandler(
534+
SessionFactoryImplementor factory, HqlSqlWalker walker) {
535+
return null;
536+
}
537+
538+
@Override
539+
public DeleteHandler buildDeleteHandler(
540+
SessionFactoryImplementor factory, HqlSqlWalker walker) {
541+
return null;
542+
}
543+
}
505544
}

0 commit comments

Comments
 (0)