Skip to content

minor code cleanups in Dialects #10262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 1, 2025
Merged

minor code cleanups in Dialects #10262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
976840d
mention legal values for hibernate.dialect.storage_engine
gavinking Jun 1, 2025
3766b32
minor code cleanups in Dialects
gavinking May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,13 +515,13 @@ public int getMaxIdentifierLength() {
@Override
public IdentifierHelper buildIdentifierHelper(
IdentifierHelperBuilder builder,
DatabaseMetaData dbMetaData) throws SQLException {
DatabaseMetaData metadata) throws SQLException {
// Any use of keywords as identifiers will result in syntax error, so enable auto quote always
builder.setAutoQuoteKeywords( true );
builder.setAutoQuoteInitialUnderscore( false );
builder.applyReservedWords( dbMetaData );
builder.applyReservedWords( metadata );

return super.buildIdentifierHelper( builder, dbMetaData );
return super.buildIdentifierHelper( builder, metadata );
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...munity-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,15 +1163,15 @@ public NameQualifierSupport getNameQualifierSupport() {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {

if ( dbMetaData == null ) {
if ( metadata == null ) {
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.LOWER );
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
}

return super.buildIdentifierHelper( builder, dbMetaData );
return super.buildIdentifierHelper( builder, metadata );
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...te-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,10 +1254,10 @@ public String generatedAs(String generatedAs) {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {
builder.setAutoQuoteInitialUnderscore(true);
return super.buildIdentifierHelper(builder, dbMetaData);
return super.buildIdentifierHelper(builder, metadata );
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,10 +1057,10 @@ public boolean supportsValuesList() {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {
builder.setAutoQuoteInitialUnderscore(true);
return super.buildIdentifierHelper(builder, dbMetaData);
return super.buildIdentifierHelper(builder, metadata );
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,10 +1068,10 @@ public boolean supportsValuesList() {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {
builder.setAutoQuoteInitialUnderscore(true);
return super.buildIdentifierHelper(builder, dbMetaData);
return super.buildIdentifierHelper(builder, metadata );
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...ate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ public int getMaxIdentifierLength() {

public IdentifierHelper buildIdentifierHelper(
IdentifierHelperBuilder builder,
DatabaseMetaData dbMetaData) throws SQLException {
DatabaseMetaData metadata) throws SQLException {
// Any use of keywords as identifiers will result in token unknown error, so enable auto quote always
builder.setAutoQuoteKeywords( true );
builder.setAutoQuoteInitialUnderscore( true );
Expand All @@ -556,7 +556,7 @@ public IdentifierHelper buildIdentifierHelper(
"POSITION", "SUM", "TRIM", "UPPER" );
}

return super.buildIdentifierHelper( builder, dbMetaData );
return super.buildIdentifierHelper( builder, metadata );
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...e-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,15 +916,15 @@ public NameQualifierSupport getNameQualifierSupport() {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {
/*
* HANA-specific extensions
*/
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.UPPER );

final IdentifierHelper identifierHelper = super.buildIdentifierHelper( builder, dbMetaData );
final IdentifierHelper identifierHelper = super.buildIdentifierHelper( builder, metadata );

return new IdentifierHelper() {

Expand Down
4 changes: 2 additions & 2 deletions ...e-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,11 +924,11 @@ public String translateExtractField(TemporalUnit unit) {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {
builder.setAutoQuoteInitialUnderscore(true);
builder.setAutoQuoteDollar(true);
return super.buildIdentifierHelper(builder, dbMetaData);
return super.buildIdentifierHelper(builder, metadata );
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...ommunity-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,14 +286,14 @@ public FunctionalDependencyAnalysisSupport getFunctionalDependencyAnalysisSuppor
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {

// some MariaDB drivers does not return case strategy info
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.MIXED );
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );

return super.buildIdentifierHelper( builder, dbMetaData );
return super.buildIdentifierHelper( builder, metadata );
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,15 +1199,15 @@ public NameQualifierSupport getNameQualifierSupport() {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {

if ( dbMetaData == null ) {
if ( metadata == null ) {
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.MIXED );
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
}

return super.buildIdentifierHelper( builder, dbMetaData );
return super.buildIdentifierHelper( builder, metadata );
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,10 +1610,10 @@ public String generatedAs(String generatedAs) {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {
builder.setAutoQuoteInitialUnderscore(true);
return super.buildIdentifierHelper(builder, dbMetaData);
return super.buildIdentifierHelper(builder, metadata );
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...unity-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,15 +992,15 @@ public void appendBooleanValueString(SqlAppender appender, boolean bool) {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {

if ( dbMetaData == null ) {
if ( metadata == null ) {
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.LOWER );
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
}

return super.buildIdentifierHelper( builder, dbMetaData );
return super.buildIdentifierHelper( builder, metadata );
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...munity-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,16 +553,16 @@ public String currentTimestamp() {

@Override
public IdentifierHelper buildIdentifierHelper(
IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData) throws SQLException {
IdentifierHelperBuilder builder, DatabaseMetaData metadata) throws SQLException {

if ( dbMetaData == null ) {
if ( metadata == null ) {
// TODO: if DatabaseMetaData != null, unquoted case strategy is set to IdentifierCaseStrategy.UPPER
// Check to see if this setting is correct.
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.MIXED );
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
}

return super.buildIdentifierHelper( builder, dbMetaData );
return super.buildIdentifierHelper( builder, metadata );
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,11 +1197,11 @@ public NameQualifierSupport getNameQualifierSupport() {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.MIXED );
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
return super.buildIdentifierHelper( builder, dbMetaData );
return super.buildIdentifierHelper( builder, metadata );
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,14 +487,14 @@ public boolean supportsStandardCurrentTimestampFunction() {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {
if ( dbMetaData == null ) {
if ( metadata == null ) {
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.MIXED );
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
}

return super.buildIdentifierHelper( builder, dbMetaData );
return super.buildIdentifierHelper( builder, metadata );
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/cfg/SchemaToolingSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,10 +293,12 @@ public interface SchemaToolingSettings {
String HBM2DDL_DEFAULT_CONSTRAINT_MODE = "hibernate.hbm2ddl.default_constraint_mode";

/**
* Specifies the default storage engine for a relational databases that supports
* Specifies the default storage engine for a relational database that supports
* multiple storage engines. This property must be set either as an {@link Environment}
* variable or JVM System Property, since the {@link org.hibernate.dialect.Dialect} is
* instantiated before Hibernate property resolution.
* <p>
* For MySQL, the legal values are {@code innodb} (the default) and {@code myisam}.
*
* @since 5.2.9
*/
Expand Down
5 changes: 3 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,10 @@ public int getPreferredSqlTypeCodeForBoolean() {

@Override
public void initializeFunctionRegistry(FunctionContributions functionContributions) {
super.initializeFunctionRegistry(functionContributions);
super.initializeFunctionRegistry( functionContributions );

final var functionFactory = new CommonFunctionFactory( functionContributions );

CommonFunctionFactory functionFactory = new CommonFunctionFactory(functionContributions);
functionFactory.cot();
functionFactory.ln_log();
functionFactory.log_loglog();
Expand Down
26 changes: 15 additions & 11 deletions hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ public CockroachDialect(DialectResolutionInfo info) {

public CockroachDialect(DialectResolutionInfo info, String versionString) {
this(
versionString != null ? parseVersion( versionString ) : info.makeCopyOrDefault( MINIMUM_VERSION ),
versionString == null
? info.makeCopyOrDefault( MINIMUM_VERSION )
: parseVersion( versionString ),
PostgreSQLDriverKind.determineKind( info )
);
registerKeywords( info );
Expand All @@ -179,11 +181,12 @@ public DatabaseVersion determineDatabaseVersion(DialectResolutionInfo info) {

protected static DatabaseVersion fetchDataBaseVersion(DialectResolutionInfo info) {
String versionString = null;
if ( info.getDatabaseMetadata() != null ) {
try ( java.sql.Statement s = info.getDatabaseMetadata().getConnection().createStatement() ) {
final ResultSet rs = s.executeQuery( "SELECT version()" );
if ( rs.next() ) {
versionString = rs.getString( 1 );
final DatabaseMetaData databaseMetadata = info.getDatabaseMetadata();
if ( databaseMetadata != null ) {
try ( var statement = databaseMetadata.getConnection().createStatement() ) {
final ResultSet resultSet = statement.executeQuery( "SELECT version()" );
if ( resultSet.next() ) {
versionString = resultSet.getString( 1 );
}
}
catch (SQLException ex) {
Expand Down Expand Up @@ -400,9 +403,10 @@ protected void contributeCockroachTypes(TypeContributions typeContributions, Ser

@Override
public void initializeFunctionRegistry(FunctionContributions functionContributions) {
super.initializeFunctionRegistry(functionContributions);
super.initializeFunctionRegistry( functionContributions );

final var functionFactory = new CommonFunctionFactory( functionContributions );

final CommonFunctionFactory functionFactory = new CommonFunctionFactory(functionContributions);
functionFactory.ascii();
functionFactory.char_chr();
functionFactory.overlay();
Expand Down Expand Up @@ -1075,15 +1079,15 @@ public NameQualifierSupport getNameQualifierSupport() {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData databaseMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {

if ( databaseMetaData == null ) {
if ( metadata == null ) {
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.LOWER );
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
}

return super.buildIdentifierHelper( builder, databaseMetaData );
return super.buildIdentifierHelper( builder, metadata );
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,10 @@ public boolean supportsDistinctFromPredicate() {

@Override
public void initializeFunctionRegistry(FunctionContributions functionContributions) {
super.initializeFunctionRegistry(functionContributions);
super.initializeFunctionRegistry( functionContributions );

final DdlTypeRegistry ddlTypeRegistry = functionContributions.getTypeConfiguration().getDdlTypeRegistry();
final CommonFunctionFactory functionFactory = new CommonFunctionFactory(functionContributions);
final var functionFactory = new CommonFunctionFactory( functionContributions );
// AVG by default uses the input type, so we possibly need to cast the argument type, hence a special function
functionFactory.avg_castingNonDoubleArguments( this, SqlAstNodeRenderingMode.DEFAULT );

Expand Down Expand Up @@ -1349,10 +1349,10 @@ public String generatedAs(String generatedAs) {
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
throws SQLException {
builder.setAutoQuoteInitialUnderscore( true );
return super.buildIdentifierHelper( builder, dbMetaData );
return super.buildIdentifierHelper( builder, metadata );
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ protected DatabaseVersion getMinimumSupportedVersion() {

@Override
public void initializeFunctionRegistry(FunctionContributions functionContributions) {
super.initializeFunctionRegistry(functionContributions);
super.initializeFunctionRegistry( functionContributions );
if ( getVersion().isSameOrAfter( 7, 2 ) ) {
CommonFunctionFactory functionFactory = new CommonFunctionFactory(functionContributions);
final var functionFactory = new CommonFunctionFactory( functionContributions );
functionFactory.listagg( null );
functionFactory.inverseDistributionOrderedSetAggregates();
functionFactory.hypotheticalOrderedSetAggregates_windowEmulation();
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ protected DatabaseVersion getMinimumSupportedVersion() {

@Override
public void initializeFunctionRegistry(FunctionContributions functionContributions) {
super.initializeFunctionRegistry(functionContributions);
super.initializeFunctionRegistry( functionContributions );
if ( getVersion().isSameOrAfter( 12 ) ) {
CommonFunctionFactory functionFactory = new CommonFunctionFactory(functionContributions);
final var functionFactory = new CommonFunctionFactory( functionContributions );
functionFactory.listagg( null );
functionFactory.inverseDistributionOrderedSetAggregates();
functionFactory.hypotheticalOrderedSetAggregates_windowEmulation();
Expand Down
Loading