clean up the Dialect-specific default property handling

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java

@@ -9,7 +9,6 @@
 import java.sql.Types;
 
 import org.hibernate.HibernateException;
-import org.hibernate.cfg.Environment;
 import org.hibernate.community.dialect.identity.CUBRIDIdentityColumnSupport;
 import org.hibernate.community.dialect.sequence.CUBRIDSequenceSupport;
 import org.hibernate.community.dialect.sequence.SequenceInformationExtractorCUBRIDDatabaseImpl;
@@ -76,9 +75,10 @@ public CUBRIDDialect() {
 		registerColumnType( Types.BINARY, "bit($l)" );
 		registerColumnType( Types.VARBINARY, getMaxVarbinaryLength(), "bit varying($l)" );
 
-		getDefaultProperties().setProperty( Environment.USE_STREAMS_FOR_BINARY, "true" );
-		getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, DEFAULT_BATCH_SIZE );
+		registerCubridKeywords();
+	}
 
+	private void registerCubridKeywords() {
 		registerKeyword( "TYPE" );
 		registerKeyword( "YEAR" );
 		registerKeyword( "MONTH" );
@@ -116,6 +116,16 @@ public CUBRIDDialect(DialectResolutionInfo info) {
 		registerKeywords( info );
 	}
 
+	@Override
+	public int getDefaultStatementBatchSize() {
+		return 15;
+	}
+
+	@Override
+	public boolean getDefaultUseStreamsForBinary() {
+		return true;
+	}
+
 	@Override
 	public int getMaxVarcharLength() {
 		return 1_073_741_823;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java

@@ -71,18 +71,24 @@ public CacheDialect() {
 
 		registerColumnType( Types.BLOB, "image" );
 		registerColumnType( Types.CLOB, "text" );
-
-		getDefaultProperties().setProperty( Environment.USE_STREAMS_FOR_BINARY, "false" );
-		getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, DEFAULT_BATCH_SIZE );
-
-		getDefaultProperties().setProperty( Environment.USE_SQL_COMMENTS, "false" );
 	}
 
 	public CacheDialect(DialectResolutionInfo info) {
 		this();
 		registerKeywords( info );
 	}
 
+	@Override
+	protected void initDefaultProperties() {
+		super.initDefaultProperties();
+		getDefaultProperties().setProperty( Environment.USE_SQL_COMMENTS, "false" );
+	}
+
+	@Override
+	public int getDefaultStatementBatchSize() {
+		return 15;
+	}
+
 	private static void useJdbcEscape(QueryEngine queryEngine, String name) {
 		//Yep, this seems to be truly necessary for certain functions
 		queryEngine.getSqmFunctionRegistry().wrapInJdbcEscape(

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java

@@ -19,7 +19,6 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.NotYetImplementedFor6Exception;
-import org.hibernate.cfg.Environment;
 import org.hibernate.community.dialect.identity.FirebirdIdentityColumnSupport;
 import org.hibernate.community.dialect.pagination.SkipFirstLimitHandler;
 import org.hibernate.community.dialect.sequence.FirebirdSequenceSupport;
@@ -153,8 +152,6 @@ public FirebirdDialect(DatabaseVersion version) {
 		registerColumnType( Types.BLOB, "blob sub_type binary" );
 		registerColumnType( Types.CLOB, "blob sub_type text" );
 		registerColumnType( Types.NCLOB, "blob sub_type text" ); // Firebird doesn't have NCLOB, but Jaybird emulates NCLOB support
-
-		getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, NO_BATCH );
 	}
 
 	@Override
@@ -174,6 +171,11 @@ public DatabaseVersion getVersion() {
 		return version;
 	}
 
+	@Override
+	public int getDefaultStatementBatchSize() {
+		return 0;
+	}
+
 	@Override
 	public TimeZoneSupport getTimeZoneSupport() {
 		return getVersion().isSameOrAfter( 4, 0 ) ? TimeZoneSupport.NATIVE : TimeZoneSupport.NONE;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java

@@ -8,7 +8,6 @@
 
 import java.sql.Types;
 
-import org.hibernate.cfg.Environment;
 import org.hibernate.community.dialect.identity.Ingres10IdentityColumnSupport;
 import org.hibernate.community.dialect.identity.Ingres9IdentityColumnSupport;
 import org.hibernate.community.dialect.pagination.FirstLimitHandler;
@@ -144,6 +143,30 @@ public IngresDialect(DatabaseVersion version) {
 			registerColumnType( Types.DATE, "ansidate" );
 		}
 
+		limitHandler = getVersion().isBefore( 9, 3 ) ? FirstLimitHandler.INSTANCE : IngresLimitHandler.INSTANCE;
+
+		sequenceSupport = new ANSISequenceSupport() {
+			@Override
+			public boolean supportsPooledSequences() {
+				return getVersion().isSameOrAfter( 9, 3 );
+			}
+		};
+	}
+
+//	@Override
+//	protected void initDefaultProperties() {
+//		super.initDefaultProperties();
+//
+//		if ( getVersion().isBefore( 10 ) ) {
+//			// There is no support for a native boolean type that accepts values
+//			// of true, false or unknown. Using the tinyint type requires
+//			// substitutions of true and false.
+//			getDefaultProperties().setProperty( Environment.QUERY_SUBSTITUTIONS, "true=1,false=0" );
+//		}
+//	}
+
+	@Override
+	public boolean getDefaultUseGetGeneratedKeys() {
 		// Ingres driver supports getGeneratedKeys but only in the following
 		// form:
 		// The Ingres DBMS returns only a single table key or a single object
@@ -154,23 +177,7 @@ public IngresDialect(DatabaseVersion version) {
 		// ignored and getGeneratedKeys() returns a result-set containing no
 		// rows, a single row with one column, or a single row with two columns.
 		// Ingres JDBC Driver returns table and object keys as BINARY values.
-		getDefaultProperties().setProperty( Environment.USE_GET_GENERATED_KEYS, "false" );
-
-		if ( getVersion().isBefore( 10 ) ) {
-			// There is no support for a native boolean type that accepts values
-			// of true, false or unknown. Using the tinyint type requires
-			// substitutions of true and false.
-			getDefaultProperties().setProperty( Environment.QUERY_SUBSTITUTIONS, "true=1,false=0" );
-		}
-
-		limitHandler = getVersion().isBefore( 9, 3 ) ? FirstLimitHandler.INSTANCE : IngresLimitHandler.INSTANCE;
-
-		sequenceSupport = new ANSISequenceSupport() {
-			@Override
-			public boolean supportsPooledSequences() {
-				return getVersion().isSameOrAfter( 9, 3 );
-			}
-		};
+		return false;
 	}
 
 	@Override

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBDialect.java

@@ -10,7 +10,6 @@
 import java.sql.Types;
 
 import org.hibernate.NotYetImplementedFor6Exception;
-import org.hibernate.cfg.Environment;
 import org.hibernate.community.dialect.sequence.MaxDBSequenceSupport;
 import org.hibernate.community.dialect.sequence.SequenceInformationExtractorSAPDBDatabaseImpl;
 import org.hibernate.dialect.AbstractTransactSQLDialect;
@@ -64,8 +63,6 @@ public MaxDBDialect() {
 
 		registerColumnType( Types.CLOB, "long varchar" );
 		registerColumnType( Types.BLOB, "long byte" );
-
-		getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, DEFAULT_BATCH_SIZE );
 	}
 
 	@Override
@@ -107,6 +104,11 @@ public DatabaseVersion getVersion() {
 		return ZERO_VERSION;
 	}
 
+	@Override
+	public int getDefaultStatementBatchSize() {
+		return 15;
+	}
+
 	@Override
 	public LimitHandler getLimitHandler() {
 		return LimitOffsetLimitHandler.INSTANCE;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java

@@ -10,7 +10,6 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.NotYetImplementedFor6Exception;
-import org.hibernate.cfg.Environment;
 import org.hibernate.community.dialect.identity.MimerSQLIdentityColumnSupport;
 import org.hibernate.community.dialect.sequence.MimerSequenceSupport;
 import org.hibernate.community.dialect.sequence.SequenceInformationExtractorMimerSQLDatabaseImpl;
@@ -78,9 +77,6 @@ public MimerSQLDialect() {
 		registerColumnType( Types.NCLOB, "nclob($l)" );
 
 		registerColumnType( Types.TIMESTAMP_WITH_TIMEZONE, "timestamp($p)" );
-
-		getDefaultProperties().setProperty( Environment.USE_STREAMS_FOR_BINARY, "true" );
-		getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, "50" );
 	}
 
 	public MimerSQLDialect(DialectResolutionInfo info) {
@@ -106,6 +102,16 @@ public DatabaseVersion getVersion() {
 		return ZERO_VERSION;
 	}
 
+	@Override
+	public int getDefaultStatementBatchSize() {
+		return 50;
+	}
+
+	@Override
+	public boolean getDefaultUseStreamsForBinary() {
+		return true;
+	}
+
 	@Override
 	public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		super.initializeFunctionRegistry( queryEngine );

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereDialect.java

@@ -7,7 +7,6 @@
 package org.hibernate.community.dialect;
 
 
-import java.sql.Types;
 import java.util.Map;
 
 import org.hibernate.LockOptions;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java

@@ -115,18 +115,17 @@ public TeradataDialect(DatabaseVersion version) {
 		registerKeyword( "role" );
 		registerKeyword( "account" );
 		registerKeyword( "class" );
+	}
 
-		if ( getVersion().isBefore( 14 ) ) {
-			// use getBytes instead of getBinaryStream
-			getDefaultProperties().setProperty( Environment.USE_STREAMS_FOR_BINARY, "false" );
-			// no batch statements
-			getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, NO_BATCH );
-		}
-		else {
-			getDefaultProperties().setProperty( Environment.USE_STREAMS_FOR_BINARY, "true" );
-			getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, DEFAULT_BATCH_SIZE );
-		}
+	@Override
+	public int getDefaultStatementBatchSize() {
+		return getVersion().isBefore( 14 )
+				? 0 : 15;
+	}
 
+	@Override
+	public boolean getDefaultUseStreamsForBinary() {
+		return getVersion().isSameOrAfter( 14 );
 	}
 
 	@Override

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java

@@ -8,7 +8,6 @@
 
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
-import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.RowLockStrategy;
@@ -95,9 +94,6 @@ public TimesTenDialect() {
 		//`timestamp` has more precision than `tt_timestamp`
 //		registerColumnType(Types.TIMESTAMP, "tt_timestamp");
 		registerColumnType( Types.TIMESTAMP_WITH_TIMEZONE, "timestamp($p)" );
-
-		getDefaultProperties().setProperty( Environment.USE_STREAMS_FOR_BINARY, "true" );
-		getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, DEFAULT_BATCH_SIZE );
 	}
 
 	public TimesTenDialect(DialectResolutionInfo info) {
@@ -110,6 +106,16 @@ public DatabaseVersion getVersion() {
 		return ZERO_VERSION;
 	}
 
+	@Override
+	public int getDefaultStatementBatchSize() {
+		return 15;
+	}
+
+	@Override
+	public boolean getDefaultUseStreamsForBinary() {
+		return true;
+	}
+
 	@Override
 	public JdbcType resolveSqlTypeDescriptor(
 			String columnTypeName,

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

@@ -13,7 +13,6 @@
 import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.function.CommonFunctionFactory;
 import org.hibernate.dialect.identity.HANAIdentityColumnSupport;
 import org.hibernate.dialect.identity.IdentityColumnSupport;
@@ -215,12 +214,18 @@ public AbstractHANADialect(DatabaseVersion version) {
 		registerColumnType( SqlTypes.POINT, "st_point" );
 
 		registerHanaKeywords();
+	}
 
+	@Override
+	public boolean getDefaultNonContextualLobCreation() {
 		// createBlob() and createClob() are not supported by the HANA JDBC driver
-		getDefaultProperties().setProperty( AvailableSettings.NON_CONTEXTUAL_LOB_CREATION, "true" );
+		return true;
+	}
 
+	@Override
+	public boolean getDefaultUseGetGeneratedKeys() {
 		// getGeneratedKeys() is not supported by the HANA JDBC driver
-		getDefaultProperties().setProperty( AvailableSettings.USE_GET_GENERATED_KEYS, "false" );
+		return false;
 	}
 
 	@Override

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

@@ -51,10 +51,6 @@
  */
 public abstract class AbstractTransactSQLDialect extends Dialect {
 
-	{
-		getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, NO_BATCH );
-	}
-
 	public AbstractTransactSQLDialect(DatabaseVersion version) {
 		super(version);
 	}
@@ -96,6 +92,11 @@ protected String columnType(int jdbcTypeCode) {
 		}
 	}
 
+	@Override
+	public int getDefaultStatementBatchSize() {
+		return 0;
+	}
+
 	@Override
 	public JdbcType resolveSqlTypeDescriptor(
 			String columnTypeName,

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

@@ -82,10 +82,6 @@ public class DB2Dialect extends Dialect {
 			: DB2LimitHandler.INSTANCE;
 	private final UniqueDelegate uniqueDelegate = createUniqueDelegate();
 
-	{
-		getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, NO_BATCH );
-	}
-
 	public DB2Dialect() {
 		this( DatabaseVersion.make( 9, 0 ) );
 	}
@@ -113,6 +109,11 @@ private void registerDB2Keywords() {
 		registerKeyword( "only" );
 	}
 
+	@Override
+	public int getDefaultStatementBatchSize() {
+		return 0;
+	}
+
 	@Override
 	protected String columnType(int jdbcTypeCode) {
 		if ( getVersion().isBefore( 11 ) ) {