HHH-19653 log dialect

Author: gavinking

hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java

@@ -29,8 +29,6 @@
 import org.hibernate.service.spi.Stoppable;
 
 import io.agroal.api.AgroalDataSource;
-import io.agroal.api.configuration.AgroalConnectionFactoryConfiguration;
-import io.agroal.api.configuration.AgroalConnectionPoolConfiguration;
 import io.agroal.api.configuration.supplier.AgroalConnectionFactoryConfigurationSupplier;
 import io.agroal.api.configuration.supplier.AgroalPropertiesReader;
 import io.agroal.api.security.NamePrincipal;
@@ -179,6 +177,7 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
 				connectionConfig.connectionProviderClass() != null
 						? connectionConfig.connectionProviderClass().toString()
 						: extractDriverNameFromMetadata(),
+				dialect.getClass(),
 				dialect.getVersion(),
 				getSchema( agroalDataSource ),
 				getCatalog( agroalDataSource ),

hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java

@@ -171,6 +171,7 @@ public void configure(Map<String, Object> properties) {
 				C3P0ConnectionProvider.class,
 				jdbcUrl,
 				jdbcDriverClass,
+				dialect.getClass(),
 				dialect.getVersion(),
 				schema,
 				catalog,

hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatabaseConnectionInfoImpl.java

@@ -36,6 +36,7 @@ public class DatabaseConnectionInfoImpl implements DatabaseConnectionInfo {
 	private final Class<?> connectionProviderClass;
 	protected final String jdbcUrl;
 	protected final String jdbcDriver;
+	private final Class<? extends Dialect> dialectClass;
 	protected final DatabaseVersion dialectVersion;
 	protected final String schema;
 	protected final String catalog;
@@ -49,7 +50,7 @@ public DatabaseConnectionInfoImpl(
 			Class<? extends ConnectionProvider> connectionProviderClass,
 			String jdbcUrl,
 			String jdbcDriver,
-			DatabaseVersion dialectVersion,
+			Class<? extends Dialect> dialectClass, DatabaseVersion dialectVersion,
 			String schema,
 			String catalog,
 			String autoCommitMode,
@@ -68,13 +69,15 @@ public DatabaseConnectionInfoImpl(
 		this.poolMinSize = poolMinSize;
 		this.poolMaxSize = poolMaxSize;
 		this.fetchSize = fetchSize;
+		this.dialectClass = dialectClass;
 	}
 
 	public DatabaseConnectionInfoImpl(Map<String, Object> settings, Dialect dialect) {
 		this(
 				null,
 				determineUrl( settings ),
 				determineDriver( settings ),
+				dialect.getClass(),
 				dialect.getVersion(),
 				null,
 				null,
@@ -88,7 +91,7 @@ public DatabaseConnectionInfoImpl(Map<String, Object> settings, Dialect dialect)
 	}
 
 	public DatabaseConnectionInfoImpl(Dialect dialect) {
-		this( null, null, null, dialect.getVersion(), null, null, null, null, null, null, null );
+		this( null, null, null, dialect.getClass(), dialect.getVersion(), null, null, null, null, null, null, null );
 	}
 
 	public static String getSchema(DataSource dataSource) {
@@ -222,6 +225,7 @@ public String toInfoString() {
 		return """
 				\tDatabase JDBC URL [%s]
 				\tDatabase driver: %s
+				\tDatabase dialect: %s
 				\tDatabase version: %s
 				\tDefault catalog/schema: %s/%s
 				\tAutocommit mode: %s
@@ -233,12 +237,13 @@ public String toInfoString() {
 				.formatted(
 						handleEmpty( jdbcUrl ),
 						handleEmpty( jdbcDriver ),
+						handleEmpty( dialectClass ),
 						handleEmpty( dialectVersion ),
 						handleEmpty( catalog ),
 						handleEmpty( schema ),
 						handleEmpty( autoCommitMode ),
 						handleEmpty( isolationLevel ),
-						handleEmpty( fetchSize ),
+						handleFetchSize( fetchSize ),
 						handleEmpty( connectionProviderClass ),
 						handleEmpty( poolMinSize ),
 						handleEmpty( poolMaxSize )
@@ -254,11 +259,11 @@ private static String handleEmpty(DatabaseVersion dialectVersion) {
 	}
 
 	private static String handleEmpty(Integer value) {
-		return value != null ? ( value == 0 ? "none" : value.toString() ) : DEFAULT;
+		return value != null ? value.toString() : DEFAULT;
 	}
 
 	private static String handleFetchSize(Integer value) {
-		return value != null ? value.toString() : DEFAULT;
+		return value != null ? ( value == 0 ? "none" : value.toString() ) : DEFAULT;
 	}
 
 	private static String handleEmpty(Class<?> value) {

hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java

@@ -161,6 +161,7 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect, Extract
 				DatasourceConnectionProviderImpl.class,
 				metaData == null ? null : metaData.getUrl(),
 				metaData == null ? null : metaData.getDriver(),
+				dialect.getClass(),
 				dialect.getVersion(),
 				metaData == null ? null : metaData.getConnectionSchemaName(),
 				metaData == null ? null : metaData.getConnectionCatalogName(),

hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java

@@ -20,7 +20,6 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.Database;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.SimpleDatabaseVersion;
@@ -35,8 +34,11 @@
 import org.hibernate.service.spi.Stoppable;
 import org.hibernate.internal.log.ConnectionInfoLogger;
 
+import static org.hibernate.cfg.JdbcSettings.AUTOCOMMIT;
+import static org.hibernate.cfg.JdbcSettings.DRIVER;
 import static org.hibernate.cfg.JdbcSettings.JAKARTA_JDBC_URL;
 import static org.hibernate.cfg.JdbcSettings.POOL_SIZE;
+import static org.hibernate.cfg.JdbcSettings.URL;
 import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.extractIsolation;
 import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.getConnectionProperties;
 import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationNiceName;
@@ -93,7 +95,7 @@ public void configure(Map<String, Object> configurationValues) {
 	}
 
 	private PooledConnections buildPool(Map<String,Object> configurationValues, ServiceRegistryImplementor serviceRegistry) {
-		final boolean autoCommit = getBoolean( AvailableSettings.AUTOCOMMIT, configurationValues ); // default to false
+		final boolean autoCommit = getBoolean( AUTOCOMMIT, configurationValues ); // default to false
 		final int minSize = getInt( MIN_SIZE, configurationValues, 1 );
 		final int maxSize = getInt( POOL_SIZE, configurationValues, 20 );
 		final int initialSize = getInt( INITIAL_SIZE, configurationValues, minSize );
@@ -111,7 +113,7 @@ private static ConnectionCreator buildCreator(
 			Map<String,Object> configurationValues, ServiceRegistryImplementor serviceRegistry) {
 		final String url = jdbcUrl( configurationValues );
 
-		String driverClassName = (String) configurationValues.get( AvailableSettings.DRIVER );
+		String driverClassName = (String) configurationValues.get( DRIVER );
 		boolean success = false;
 		Driver driver = null;
 		if ( driverClassName != null ) {
@@ -142,7 +144,7 @@ private static ConnectionCreator buildCreator(
 
 		final Properties connectionProps = getConnectionProperties( configurationValues );
 
-		final boolean autoCommit = getBoolean( AvailableSettings.AUTOCOMMIT, configurationValues );
+		final boolean autoCommit = getBoolean( AUTOCOMMIT, configurationValues );
 		final Integer isolation = extractIsolation( configurationValues );
 		final String initSql = (String) configurationValues.get( INIT_SQL );
 
@@ -159,12 +161,11 @@ private static ConnectionCreator buildCreator(
 								configurationValues
 						);
 
-		;
-
 		dbInfo = new DatabaseConnectionInfoImpl(
 				DriverManagerConnectionProviderImpl.class,
 				url,
 				driverList,
+				null,
 				SimpleDatabaseVersion.ZERO_VERSION,
 				getSchema( connectionCreator ),
 				getCatalog( connectionCreator ),
@@ -195,7 +196,7 @@ private static String driverList() {
 	}
 
 	private static String jdbcUrl(Map<String, Object> configurationValues) {
-		final String url = (String) configurationValues.get( AvailableSettings.URL );
+		final String url = (String) configurationValues.get( URL );
 		if ( url == null ) {
 			throw new ConnectionProviderConfigurationException( "No JDBC URL specified by property '" + JAKARTA_JDBC_URL + "'" );
 		}
@@ -303,6 +304,7 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
 				DriverManagerConnectionProviderImpl.class,
 				dbInfo.getJdbcUrl(),
 				dbInfo.getJdbcDriver(),
+				dialect.getClass(),
 				dialect.getVersion(),
 				dbInfo.getSchema(),
 				dbInfo.getCatalog(),
@@ -400,7 +402,7 @@ private void validate() {
 			final int size = size();
 
 			if ( !primed && size >= minSize ) {
-				// IMPL NOTE : the purpose of primed is to allow the pool to lazily reach its
+				// IMPL NOTE: the purpose of primed is to allow the pool to lazily reach its
 				// defined min-size.
 				ConnectionInfoLogger.INSTANCE.debug( "Connection pool now considered primed; min-size will be maintained" );
 				primed = true;

hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java

@@ -121,6 +121,7 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
 				null,
 				null,
 				null,
+				dialect.getClass(),
 				dialect.getVersion(),
 				null,
 				null,

hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java

@@ -106,6 +106,7 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
 				isBlank( hikariConfig.getDriverClassName() )
 						? extractDriverNameFromMetadata()
 						: hikariConfig.getDriverClassName(),
+				dialect.getClass(),
 				dialect.getVersion(),
 				hikariConfig.getSchema(),
 				hikariConfig.getCatalog(),