Skip to content

Commit 72687f4

Browse files
gavinkinggavinking
committed
minor code cleanups in Dialects
1 parent 33052ec commit 72687f4

39 files changed

+221
-259
lines changed

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -515,13 +515,13 @@ public int getMaxIdentifierLength() {
515515
@Override
516516
public IdentifierHelper buildIdentifierHelper(
517517
IdentifierHelperBuilder builder,
518-
DatabaseMetaData dbMetaData) throws SQLException {
518+
DatabaseMetaData metadata) throws SQLException {
519519
// Any use of keywords as identifiers will result in syntax error, so enable auto quote always
520520
builder.setAutoQuoteKeywords( true );
521521
builder.setAutoQuoteInitialUnderscore( false );
522-
builder.applyReservedWords( dbMetaData );
522+
builder.applyReservedWords( metadata );
523523

524-
return super.buildIdentifierHelper( builder, dbMetaData );
524+
return super.buildIdentifierHelper( builder, metadata );
525525
}
526526

527527
@Override

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,15 +1163,15 @@ public NameQualifierSupport getNameQualifierSupport() {
11631163
}
11641164

11651165
@Override
1166-
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
1166+
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
11671167
throws SQLException {
11681168

1169-
if ( dbMetaData == null ) {
1169+
if ( metadata == null ) {
11701170
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.LOWER );
11711171
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
11721172
}
11731173

1174-
return super.buildIdentifierHelper( builder, dbMetaData );
1174+
return super.buildIdentifierHelper( builder, metadata );
11751175
}
11761176

11771177
@Override

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,10 +1254,10 @@ public String generatedAs(String generatedAs) {
12541254
}
12551255

12561256
@Override
1257-
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
1257+
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
12581258
throws SQLException {
12591259
builder.setAutoQuoteInitialUnderscore(true);
1260-
return super.buildIdentifierHelper(builder, dbMetaData);
1260+
return super.buildIdentifierHelper(builder, metadata );
12611261
}
12621262

12631263
@Override

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,10 +1057,10 @@ public boolean supportsValuesList() {
10571057
}
10581058

10591059
@Override
1060-
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
1060+
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
10611061
throws SQLException {
10621062
builder.setAutoQuoteInitialUnderscore(true);
1063-
return super.buildIdentifierHelper(builder, dbMetaData);
1063+
return super.buildIdentifierHelper(builder, metadata );
10641064
}
10651065

10661066
@Override

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,10 +1068,10 @@ public boolean supportsValuesList() {
10681068
}
10691069

10701070
@Override
1071-
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
1071+
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
10721072
throws SQLException {
10731073
builder.setAutoQuoteInitialUnderscore(true);
1074-
return super.buildIdentifierHelper(builder, dbMetaData);
1074+
return super.buildIdentifierHelper(builder, metadata );
10751075
}
10761076

10771077
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ public int getMaxIdentifierLength() {
534534

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

559-
return super.buildIdentifierHelper( builder, dbMetaData );
559+
return super.buildIdentifierHelper( builder, metadata );
560560
}
561561

562562
@Override

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,15 +916,15 @@ public NameQualifierSupport getNameQualifierSupport() {
916916
}
917917

918918
@Override
919-
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
919+
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
920920
throws SQLException {
921921
/*
922922
* HANA-specific extensions
923923
*/
924924
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
925925
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.UPPER );
926926

927-
final IdentifierHelper identifierHelper = super.buildIdentifierHelper( builder, dbMetaData );
927+
final IdentifierHelper identifierHelper = super.buildIdentifierHelper( builder, metadata );
928928

929929
return new IdentifierHelper() {
930930

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,11 +924,11 @@ public String translateExtractField(TemporalUnit unit) {
924924
}
925925

926926
@Override
927-
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
927+
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
928928
throws SQLException {
929929
builder.setAutoQuoteInitialUnderscore(true);
930930
builder.setAutoQuoteDollar(true);
931-
return super.buildIdentifierHelper(builder, dbMetaData);
931+
return super.buildIdentifierHelper(builder, metadata );
932932
}
933933

934934
@Override

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,14 +286,14 @@ public FunctionalDependencyAnalysisSupport getFunctionalDependencyAnalysisSuppor
286286
}
287287

288288
@Override
289-
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
289+
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
290290
throws SQLException {
291291

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

296-
return super.buildIdentifierHelper( builder, dbMetaData );
296+
return super.buildIdentifierHelper( builder, metadata );
297297
}
298298

299299
@Override

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,15 +1199,15 @@ public NameQualifierSupport getNameQualifierSupport() {
11991199
}
12001200

12011201
@Override
1202-
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
1202+
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData metadata)
12031203
throws SQLException {
12041204

1205-
if ( dbMetaData == null ) {
1205+
if ( metadata == null ) {
12061206
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.MIXED );
12071207
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
12081208
}
12091209

1210-
return super.buildIdentifierHelper( builder, dbMetaData );
1210+
return super.buildIdentifierHelper( builder, metadata );
12111211
}
12121212

12131213
@Override

0 commit comments

Comments
 (0)