Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-14667 Remove also ExtractedDatabaseMetaData#getExtraKeywords() as it's unused as well

This commit is contained in:
Sanne Grinovero 2021-06-09 22:56:29 +01:00 committed by Sanne Grinovero
parent 8f765eeff8
commit ab8c81482c
3 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java vendored
View File

@ -10,7 +10,6 @@ import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@ -41,14 +40,12 @@ public class ExtractedDatabaseMetaDataImpl implements ExtractedDatabaseMetaData
private final boolean doesDataDefinitionCauseTransactionCommit;
private final SQLStateType sqlStateType;
private final Set<String> extraKeywords;
private final List<SequenceInformation> sequenceInformationList;
private ExtractedDatabaseMetaDataImpl(
JdbcEnvironment jdbcEnvironment,
String connectionCatalogName,
String connectionSchemaName,
Set<String> extraKeywords,
boolean supportsRefCursors,
boolean supportsNamedParameters,
boolean supportsScrollableResults,
@ -59,14 +56,8 @@ public class ExtractedDatabaseMetaDataImpl implements ExtractedDatabaseMetaData
SQLStateType sqlStateType,
List<SequenceInformation> sequenceInformationList) {
this.jdbcEnvironment = jdbcEnvironment;
this.connectionCatalogName = connectionCatalogName;
this.connectionSchemaName = connectionSchemaName;
this.extraKeywords = extraKeywords != null
? extraKeywords
: Collections.<String>emptySet();
this.supportsRefCursors = supportsRefCursors;
this.supportsNamedParameters = supportsNamedParameters;
this.supportsScrollableResults = supportsScrollableResults;
@ -118,11 +109,6 @@ public class ExtractedDatabaseMetaDataImpl implements ExtractedDatabaseMetaData
return doesDataDefinitionCauseTransactionCommit;
}
@Override
public Set<String> getExtraKeywords() {
return extraKeywords;
}
@Override
public SQLStateType getSqlStateType() {
return sqlStateType;
@ -149,8 +135,6 @@ public class ExtractedDatabaseMetaDataImpl implements ExtractedDatabaseMetaData
private String connectionSchemaName;
private String connectionCatalogName;
private Set<String> extraKeywords;
private boolean supportsRefCursors;
private boolean supportsNamedParameters;
private boolean supportsScrollableResults;
@ -175,7 +159,6 @@ public class ExtractedDatabaseMetaDataImpl implements ExtractedDatabaseMetaData
supportsBatchUpdates = databaseMetaData.supportsBatchUpdates();
supportsDataDefinitionInTransaction = !databaseMetaData.dataDefinitionIgnoredInTransactions();
doesDataDefinitionCauseTransactionCommit = databaseMetaData.dataDefinitionCausesTransactionCommit();
extraKeywords = parseKeywords( databaseMetaData.getSQLKeywords() );
sqlStateType = SQLStateType.interpretReportedSQLStateType( databaseMetaData.getSQLStateType() );
return this;
}
@ -194,24 +177,6 @@ public class ExtractedDatabaseMetaDataImpl implements ExtractedDatabaseMetaData
return this;
}
public Builder setExtraKeywords(Set<String> extraKeywords) {
if ( this.extraKeywords == null ) {
this.extraKeywords = extraKeywords;
}
else {
this.extraKeywords.addAll( extraKeywords );
}
return this;
}
public Builder addExtraKeyword(String keyword) {
if ( this.extraKeywords == null ) {
this.extraKeywords = new HashSet<String>();
}
this.extraKeywords.add( keyword );
return this;
}
public Builder setSupportsRefCursors(boolean supportsRefCursors) {
this.supportsRefCursors = supportsRefCursors;
return this;
@ -262,7 +227,6 @@ public class ExtractedDatabaseMetaDataImpl implements ExtractedDatabaseMetaData
jdbcEnvironment,
connectionCatalogName,
connectionSchemaName,
extraKeywords,
supportsRefCursors,
supportsNamedParameters,
supportsScrollableResults,

9
hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java vendored
View File

@ -45,15 +45,6 @@ public interface ExtractedDatabaseMetaData {
*/
String getConnectionSchemaName();
/**
* Get the list of extra keywords (beyond standard SQL92 keywords) reported by the driver.
*
* @return The extra keywords used by this database.
*
* @see java.sql.DatabaseMetaData#getSQLKeywords()
*/
Set<String> getExtraKeywords();
/**
* Does the driver report supporting named parameters?
*

2
hibernate-core/src/test/java/org/hibernate/test/jdbc/env/NoDatabaseMetaDataTest.java vendored
View File

@ -38,7 +38,6 @@ public class NoDatabaseMetaDataTest extends BaseUnitTestCase {
assertNull( extractedDatabaseMetaData.getConnectionCatalogName() );
assertNull( extractedDatabaseMetaData.getConnectionSchemaName() );
assertTrue( extractedDatabaseMetaData.getExtraKeywords().isEmpty() );
assertFalse( extractedDatabaseMetaData.supportsNamedParameters() );
assertFalse( extractedDatabaseMetaData.supportsRefCursors() );
assertFalse( extractedDatabaseMetaData.supportsScrollableResults() );
@ -63,7 +62,6 @@ public class NoDatabaseMetaDataTest extends BaseUnitTestCase {
assertNull( extractedDatabaseMetaData.getConnectionCatalogName() );
assertNull( extractedDatabaseMetaData.getConnectionSchemaName() );
assertTrue( extractedDatabaseMetaData.getExtraKeywords().isEmpty() );
assertTrue( extractedDatabaseMetaData.supportsNamedParameters() );
assertFalse( extractedDatabaseMetaData.supportsRefCursors() );
assertFalse( extractedDatabaseMetaData.supportsScrollableResults() );