HHH-9990 - Enabled batched updates for versioned data by default

databases/derby/resources/hibernate.properties

@@ -21,9 +21,6 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
-
 javax.persistence.validation.mode=NONE
 hibernate.service.allow_crawling=false
 hibernate.session.events.log=true

databases/mariadb/resources/hibernate.properties

@@ -21,9 +21,6 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
-
 javax.persistence.validation.mode=NONE
 hibernate.service.allow_crawling=false
 hibernate.session.events.log=true

databases/pgsql/resources/hibernate.properties

@@ -21,9 +21,6 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
-
 javax.persistence.validation.mode=NONE
 hibernate.service.allow_crawling=false
 hibernate.session.events.log=true

hibernate-c3p0/src/test/resources/hibernate.properties

@@ -24,6 +24,3 @@ hibernate.max_fetch_depth 5
 
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
-
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true

hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java

@@ -540,9 +540,9 @@ public class SessionFactoryBuilderImpl implements SessionFactoryBuilderImplement
 
 			final Map configurationSettings = new HashMap();
 			//noinspection unchecked
-			configurationSettings.putAll( cfgService.getSettings() );
-			//noinspection unchecked
 			configurationSettings.putAll( jdbcServices.getJdbcEnvironment().getDialect().getDefaultProperties() );
+			//noinspection unchecked
+			configurationSettings.putAll( cfgService.getSettings() );
 			cfgService = new ConfigurationServiceImpl( configurationSettings );
 			( (ConfigurationServiceImpl) cfgService ).injectServices( (ServiceRegistryImplementor) serviceRegistry );
 
@@ -666,7 +666,7 @@ public class SessionFactoryBuilderImpl implements SessionFactoryBuilderImplement
 				this.jdbcBatchSize = 0;
 			}
 
-			this.jdbcBatchVersionedData = ConfigurationHelper.getBoolean( BATCH_VERSIONED_DATA, configurationSettings, false );
+			this.jdbcBatchVersionedData = ConfigurationHelper.getBoolean( BATCH_VERSIONED_DATA, configurationSettings, true );
 			this.scrollableResultSetsEnabled = ConfigurationHelper.getBoolean(
 					USE_SCROLLABLE_RESULTSET,
 					configurationSettings,

hibernate-core/src/main/java/org/hibernate/dialect/Oracle12cDialect.java

@@ -18,6 +18,7 @@ import org.hibernate.dialect.pagination.SQL2008StandardLimitHandler;
 public class Oracle12cDialect extends Oracle10gDialect {
 	public Oracle12cDialect() {
 		super();
+		getDefaultProperties().setProperty( Environment.BATCH_VERSIONED_DATA, "true" );
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java

@@ -254,6 +254,7 @@ public class Oracle8iDialect extends Dialect {
 		// be returned (via its RETURNING clause).  No other driver seems to
 		// support this overloaded version.
 		getDefaultProperties().setProperty( Environment.USE_GET_GENERATED_KEYS, "false" );
+		getDefaultProperties().setProperty( Environment.BATCH_VERSIONED_DATA, "false" );
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java

@@ -81,6 +81,7 @@ public class Oracle9Dialect extends Dialect {
 		getDefaultProperties().setProperty( Environment.USE_GET_GENERATED_KEYS, "false" );
 		getDefaultProperties().setProperty( Environment.USE_STREAMS_FOR_BINARY, "true" );
 		getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, DEFAULT_BATCH_SIZE );
+		getDefaultProperties().setProperty( Environment.BATCH_VERSIONED_DATA, "false" );
 
 		registerFunction( "abs", new StandardSQLFunction( "abs" ) );
 		registerFunction( "sign", new StandardSQLFunction( "sign", StandardBasicTypes.INTEGER ) );

hibernate-core/src/test/resources/hibernate.properties

@@ -21,9 +21,6 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
-
 javax.persistence.validation.mode=NONE
 hibernate.service.allow_crawling=false
 hibernate.session.events.log=true

hibernate-ehcache/src/test/resources/hibernate.properties

@@ -13,6 +13,4 @@ hibernate.connection.pool_size 5
 
 hibernate.cache.region_prefix hibernate.test
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
 hibernate.service.allow_crawling=false

hibernate-entitymanager/src/test/resources/hibernate.properties

@@ -21,6 +21,4 @@ hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFa
 
 hibernate.jdbc.batch_size 0
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
 hibernate.service.allow_crawling=false

hibernate-envers/src/test/resources/hibernate.properties

@@ -18,6 +18,4 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
 hibernate.service.allow_crawling=false

hibernate-infinispan/src/test/resources/hibernate.properties

@@ -18,6 +18,4 @@ hibernate.max_fetch_depth 5
 
 hibernate.generate_statistics true
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
 hibernate.service.allow_crawling=false

hibernate-java8/src/test/resources/hibernate.properties

@@ -20,9 +20,6 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
-
 javax.persistence.validation.mode=NONE
 hibernate.service.allow_crawling=false
 hibernate.session.events.log=true

hibernate-proxool/src/test/resources/hibernate.properties

@@ -20,6 +20,3 @@ hibernate.max_fetch_depth 5
 
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
-
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true