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

clean up JdbcEnvironmentInitiator and parse micro database version 

this resolves a spurious warning on Derby
This commit is contained in:
Gavin King 2024-02-10 11:04:43 +01:00
parent 7445554e88
commit cad2d2bc62
2 changed files with 103 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java
View File

@ -9,7 +9,6 @@ package org.hibernate.cfg;
import java.util.Calendar;
import org.hibernate.Incubating;
import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData;
import org.hibernate.query.Query;

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

@ -11,9 +11,10 @@ import java.sql.DatabaseMetaData;
import java.sql.SQLException;
import java.util.Collections;
import java.util.Map;
import java.util.StringTokenizer;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.engine.jdbc.batch.spi.BatchBuilder;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
@ -54,6 +55,10 @@ import static org.hibernate.cfg.AvailableSettings.JAKARTA_HBM2DDL_DB_MINOR_VERSI
import static org.hibernate.cfg.AvailableSettings.JAKARTA_HBM2DDL_DB_NAME;
import static org.hibernate.cfg.AvailableSettings.JTA_TRACK_BY_THREAD;
import static org.hibernate.cfg.AvailableSettings.PREFER_USER_TRANSACTION;
import static org.hibernate.cfg.JdbcSettings.CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT;
import static org.hibernate.cfg.JdbcSettings.DIALECT;
import static org.hibernate.cfg.JdbcSettings.DIALECT_DB_VERSION;
import static org.hibernate.cfg.JdbcSettings.JAKARTA_HBM2DDL_DB_VERSION;
import static org.hibernate.engine.config.spi.StandardConverters.BOOLEAN;
import static org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentImpl.isMultiTenancyEnabled;
import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER;
@ -73,6 +78,13 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
public static final JdbcEnvironmentInitiator INSTANCE = new JdbcEnvironmentInitiator();
/**
* @deprecated This setting was never a documented feature of Hibernate,
* is not supported, and will be removed.
*/
@Deprecated(since="6", forRemoval = true)
private static final String USE_JDBC_METADATA_DEFAULTS = "hibernate.temp.use_jdbc_metadata_defaults";
@Override
public Class<JdbcEnvironment> getServiceInitiated() {
return JdbcEnvironment.class;
@ -80,7 +92,7 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
@Override
public JdbcEnvironment initiateService(Map<String, Object> configurationValues, ServiceRegistryImplementor registry) {
final DialectFactory dialectFactory = registry.getService( DialectFactory.class );
final DialectFactory dialectFactory = registry.requireService( DialectFactory.class );
final String explicitDatabaseName = getExplicitDatabaseName( configurationValues );
Integer explicitDatabaseMajorVersion = getExplicitDatabaseMajorVersion( configurationValues );
@ -138,10 +150,8 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
Map<String, Object> configurationValues,
ServiceRegistryImplementor registry,
DialectFactory dialectFactory) {
return new JdbcEnvironmentImpl(
registry,
dialectFactory.buildDialect( configurationValues, null )
);
final Dialect dialect = dialectFactory.buildDialect( configurationValues, null );
return new JdbcEnvironmentImpl( registry, dialect );
}
private static JdbcEnvironmentImpl getJdbcEnvironmentWithExplicitConfiguration(
@ -158,16 +168,15 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
explicitDatabaseVersion != null ? explicitDatabaseVersion : "0",
explicitDatabaseMajorVersion != null ? explicitDatabaseMajorVersion : 0,
explicitDatabaseMinorVersion != null ? explicitDatabaseMinorVersion : 0,
0,
null,
0,
0,
null,
configurationValues
);
return new JdbcEnvironmentImpl(
registry,
dialectFactory.buildDialect( configurationValues, () -> dialectResolutionInfo )
);
final Dialect dialect = dialectFactory.buildDialect( configurationValues, () -> dialectResolutionInfo );
return new JdbcEnvironmentImpl( registry, dialect );
}
// 'hibernate.temp.use_jdbc_metadata_defaults' is a temporary magic value.
@ -178,11 +187,7 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
// certain default values; it is useful to *not* do this when the database
// may not be available (mainly in tools usage).
private static boolean useJdbcMetadata(Map<String, Object> configurationValues) {
return getBoolean(
"hibernate.temp.use_jdbc_metadata_defaults",
configurationValues,
true
);
return getBoolean(USE_JDBC_METADATA_DEFAULTS, configurationValues, true );
}
private static String getExplicitDatabaseVersion(
@ -190,14 +195,11 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
Integer configuredDatabaseMajorVersion,
Integer configuredDatabaseMinorVersion) {
return coalesceSuppliedValues(
() -> (String) configurationValues.get(AvailableSettings.JAKARTA_HBM2DDL_DB_VERSION),
() -> (String) configurationValues.get( JAKARTA_HBM2DDL_DB_VERSION ),
() -> {
final Object value = configurationValues.get(AvailableSettings.DIALECT_DB_VERSION);
final Object value = configurationValues.get( DIALECT_DB_VERSION );
if ( value != null ) {
DEPRECATION_LOGGER.deprecatedSetting(
AvailableSettings.DIALECT_DB_VERSION,
AvailableSettings.JAKARTA_HBM2DDL_DB_VERSION
);
DEPRECATION_LOGGER.deprecatedSetting( DIALECT_DB_VERSION, JAKARTA_HBM2DDL_DB_VERSION );
}
return (String) value;
}
@ -206,7 +208,7 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
if ( configuredDatabaseMajorVersion != null ) {
return configuredDatabaseMinorVersion == null
? configuredDatabaseMajorVersion.toString()
: (configuredDatabaseMajorVersion + "." + configuredDatabaseMinorVersion);
: configuredDatabaseMajorVersion + "." + configuredDatabaseMinorVersion;
}
return null;
}
@ -266,7 +268,7 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
jdbcServices,
registry
);
temporaryJdbcSessionOwner.transactionCoordinator = registry.getService( TransactionCoordinatorBuilder.class )
temporaryJdbcSessionOwner.transactionCoordinator = registry.requireService( TransactionCoordinatorBuilder.class )
.buildTransactionCoordinator(
new JdbcCoordinatorImpl( null, temporaryJdbcSessionOwner, jdbcServices ),
() -> false
@ -276,57 +278,38 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
return temporaryJdbcSessionOwner.transactionCoordinator.createIsolationDelegate().delegateWork(
new AbstractReturningWork<>() {
@Override
public JdbcEnvironmentImpl execute(Connection connection) throws SQLException {
public JdbcEnvironmentImpl execute(Connection connection) {
try {
final DatabaseMetaData dbmd = connection.getMetaData();
logDatabaseAndDriver( dbmd );
final String databaseName;
final String databaseVersion;
final int databaseMajorVersion;
final int databaseMinorVersion;
if ( explicitDatabaseName == null ) {
databaseName = dbmd.getDatabaseProductName();
}
else {
databaseName = explicitDatabaseName;
}
if ( explicitDatabaseVersion == null ) {
databaseVersion = dbmd.getDatabaseProductVersion();
}
else {
databaseVersion = explicitDatabaseVersion;
}
if ( explicitDatabaseMajorVersion == null ) {
databaseMajorVersion = dbmd.getDatabaseMajorVersion();
}
else {
databaseMajorVersion = explicitDatabaseMajorVersion;
}
if ( explicitDatabaseMinorVersion == null ) {
databaseMinorVersion = dbmd.getDatabaseMinorVersion();
}
else {
databaseMinorVersion = explicitDatabaseMinorVersion;
}
final DatabaseMetaData metadata = connection.getMetaData();
logDatabaseAndDriver( metadata );
final DialectResolutionInfo dialectResolutionInfo = new DialectResolutionInfoImpl(
dbmd,
databaseName,
databaseVersion,
databaseMajorVersion,
databaseMinorVersion,
dbmd.getDriverName(),
dbmd.getDriverMajorVersion(),
dbmd.getDriverMinorVersion(),
dbmd.getSQLKeywords(),
metadata,
explicitDatabaseName == null
? metadata.getDatabaseProductName()
: explicitDatabaseName,
explicitDatabaseVersion == null
? metadata.getDatabaseProductVersion()
: explicitDatabaseVersion,
explicitDatabaseMajorVersion == null
? metadata.getDatabaseMajorVersion()
: explicitDatabaseMajorVersion,
explicitDatabaseMinorVersion == null
? metadata.getDatabaseMinorVersion()
: explicitDatabaseMinorVersion,
explicitDatabaseMinorVersion == null
? databaseMicroVersion( metadata )
: 0,
metadata.getDriverName(),
metadata.getDriverMajorVersion(),
metadata.getDriverMinorVersion(),
metadata.getSQLKeywords(),
configurationValues
);
return new JdbcEnvironmentImpl(
registry,
dialectFactory.buildDialect( configurationValues, () -> dialectResolutionInfo ),
dbmd,
metadata,
jdbcConnectionAccess
);
}
@ -337,6 +320,25 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
// accessing the JDBC metadata failed
return getJdbcEnvironmentWithDefaults( configurationValues, registry, dialectFactory );
}
private int databaseMicroVersion(DatabaseMetaData metadata) throws SQLException {
final String version = metadata.getDatabaseProductVersion();
final String prefix =
metadata.getDatabaseMajorVersion() + "." + metadata.getDatabaseMinorVersion() + ".";
if ( version.startsWith(prefix) ) {
try {
final String substring = version.substring( prefix.length() );
final String micro = new StringTokenizer(substring," .,-:;/()[]").nextToken();
return Integer.parseInt(micro);
}
catch (NumberFormatException nfe) {
return 0;
}
}
else {
return 0;
}
}
},
false
);
@ -352,10 +354,10 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
if ( log.isDebugEnabled() ) {
log.debugf(
"Database ->\n"
+ " name : %s\n"
+ " version : %s\n"
+ " major : %s\n"
+ " minor : %s",
+ " name : %s\n"
+ " version : %s\n"
+ " major : %s\n"
+ " minor : %s",
dbmd.getDatabaseProductName(),
dbmd.getDatabaseProductVersion(),
dbmd.getDatabaseMajorVersion(),
@ -363,10 +365,10 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
);
log.debugf(
"Driver ->\n"
+ " name : %s\n"
+ " version : %s\n"
+ " major : %s\n"
+ " minor : %s",
+ " name : %s\n"
+ " version : %s\n"
+ " major : %s\n"
+ " minor : %s",
dbmd.getDriverName(),
dbmd.getDriverVersion(),
dbmd.getDriverMajorVersion(),
@ -383,7 +385,7 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
Integer explicitDatabaseMinorVersion,
String explicitDatabaseVersion) {
return ( isNotEmpty(explicitDatabaseVersion) || explicitDatabaseMajorVersion != null || explicitDatabaseMinorVersion != null )
&& ( isNotEmpty(explicitDatabaseName) || isNotNullAndNotEmpty( configurationValues.get(AvailableSettings.DIALECT) ) );
&& ( isNotEmpty(explicitDatabaseName) || isNotNullAndNotEmpty( configurationValues.get(DIALECT) ) );
}
private static boolean isNotNullAndNotEmpty(Object o) {
@ -396,7 +398,8 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
return new ConnectionProviderJdbcConnectionAccess( connectionProvider );
}
else {
final MultiTenantConnectionProvider<?> multiTenantConnectionProvider = registry.getService( MultiTenantConnectionProvider.class );
final MultiTenantConnectionProvider<?> multiTenantConnectionProvider =
registry.getService( MultiTenantConnectionProvider.class );
return new MultiTenantConnectionProviderJdbcConnectionAccess( multiTenantConnectionProvider );
}
}
@ -407,7 +410,8 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
return new ConnectionProviderJdbcConnectionAccess( connectionProvider );
}
else {
final MultiTenantConnectionProvider<?> multiTenantConnectionProvider = registry.getService( MultiTenantConnectionProvider.class );
final MultiTenantConnectionProvider<?> multiTenantConnectionProvider =
registry.getService( MultiTenantConnectionProvider.class );
return new MultiTenantConnectionProviderJdbcConnectionAccess( multiTenantConnectionProvider );
}
}
@ -472,6 +476,7 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
private final String databaseVersion;
private final int databaseMajorVersion;
private final int databaseMinorVersion;
private final int databaseMicroVersion;
private final String driverName;
private final int driverMajorVersion;
private final int driverMinorVersion;
@ -483,7 +488,8 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
String databaseName,
String databaseVersion,
int databaseMajorVersion,
int databaseMinorVersion,
int databaseMinorVersion,
int databaseMicroVersion,
String driverName,
int driverMajorVersion,
int driverMinorVersion,
@ -494,6 +500,7 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
this.databaseVersion = databaseVersion;
this.databaseMajorVersion = databaseMajorVersion;
this.databaseMinorVersion = databaseMinorVersion;
this.databaseMicroVersion = databaseMicroVersion;
this.driverName = driverName;
this.driverMajorVersion = driverMajorVersion;
this.driverMinorVersion = driverMinorVersion;
@ -525,6 +532,11 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
return databaseMinorVersion;
}
@Override
public int getDatabaseMicroVersion() {
return databaseMicroVersion;
}
@Override
public String getDriverName() {
return driverName;
@ -580,26 +592,19 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
this.jdbcConnectionAccess = jdbcConnectionAccess;
this.jdbcServices = jdbcServices;
this.serviceRegistry = serviceRegistry;
final ConfigurationService configurationService = serviceRegistry.getService( ConfigurationService.class );
this.jtaTrackByThread = configurationService.getSetting( JTA_TRACK_BY_THREAD, BOOLEAN, true );
this.preferUserTransaction = getBoolean( PREFER_USER_TRANSACTION, configurationService.getSettings() );
this.connectionProviderDisablesAutoCommit = getBoolean(
AvailableSettings.CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT,
configurationService.getSettings(),
false
);
final ConfigurationService configuration = serviceRegistry.requireService( ConfigurationService.class );
this.jtaTrackByThread = configuration.getSetting( JTA_TRACK_BY_THREAD, BOOLEAN, true );
this.preferUserTransaction = getBoolean( PREFER_USER_TRANSACTION, configuration.getSettings() );
this.connectionProviderDisablesAutoCommit =
getBoolean( CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT, configuration.getSettings() );
final PhysicalConnectionHandlingMode specifiedHandlingMode = PhysicalConnectionHandlingMode.interpret(
configurationService.getSettings().get( CONNECTION_HANDLING )
);
final PhysicalConnectionHandlingMode specifiedHandlingMode =
PhysicalConnectionHandlingMode.interpret( configuration.getSettings().get( CONNECTION_HANDLING ) );
this.connectionHandlingMode = specifiedHandlingMode != null
? specifiedHandlingMode
: serviceRegistry.requireService(TransactionCoordinatorBuilder.class)
.getDefaultConnectionHandlingMode();
if ( specifiedHandlingMode != null ) {
this.connectionHandlingMode = specifiedHandlingMode;
}
else {
this.connectionHandlingMode = serviceRegistry.getService( TransactionCoordinatorBuilder.class )
.getDefaultConnectionHandlingMode();
}
this.jpaCompliance = new MutableJpaComplianceImpl( Collections.emptyMap(), false );
this.eventManager = new EmptyEventManager();
}
@ -669,7 +674,7 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
return null;
}
@Override
@Override @Deprecated
public int getFetchSize() {
return 0;
}
@ -709,7 +714,7 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
return null;
}
@Override
@Override @Deprecated
public JdbcObserver getObserver() {
return EMPTY_JDBC_OBSERVER;
}