improve rendering of catalog/schema log message

gavinking · gavinking · commit a14f6c093b1f · 2025-08-04T22:09:08.000+10:00
use information about whether the database actually supports schemas
diff --git a/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java b/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java
@@ -42,6 +42,8 @@
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getFetchSize;
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getIsolation;
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getSchema;
+import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.hasCatalog;
+import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.hasSchema;
 import static org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.allowJdbcMetadataAccess;
 
 /**
@@ -179,6 +181,8 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
 						: extractDriverNameFromMetadata(),
 				dialect.getClass(),
 				dialect.getVersion(),
+				hasSchema( agroalDataSource),
+				hasCatalog( agroalDataSource),
 				getSchema( agroalDataSource ),
 				getCatalog( agroalDataSource ),
 				Boolean.toString( connectionConfig.autoCommit() ),
diff --git a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java
@@ -47,6 +47,8 @@
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getFetchSize;
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getIsolation;
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getSchema;
+import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.hasCatalog;
+import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.hasSchema;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getInteger;
 
@@ -162,6 +164,8 @@ public void configure(Map<String, Object> properties) {
 		dataSource = createDataSource( jdbcUrl, connectionProps, poolSettings );
 
 		final Integer fetchSize = getFetchSize( dataSource );
+		final boolean hasSchema = hasSchema( dataSource );
+		final boolean hasCatalog = hasCatalog( dataSource );
 		final String schema = getSchema( dataSource );
 		final String catalog = getCatalog( dataSource );
 		if ( isolation == null ) {
@@ -173,6 +177,8 @@ public void configure(Map<String, Object> properties) {
 				jdbcDriverClass,
 				dialect.getClass(),
 				dialect.getVersion(),
+				hasSchema,
+				hasCatalog,
 				schema,
 				catalog,
 				Boolean.toString( autocommit ),
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatabaseConnectionInfoImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatabaseConnectionInfoImpl.java
@@ -38,6 +38,8 @@ public class DatabaseConnectionInfoImpl implements DatabaseConnectionInfo {
 	protected final String jdbcDriver;
 	private final Class<? extends Dialect> dialectClass;
 	protected final DatabaseVersion dialectVersion;
+	private final boolean hasSchema;
+	private final boolean hasCatalog;
 	protected final String schema;
 	protected final String catalog;
 	protected final String autoCommitMode;
@@ -51,6 +53,8 @@ public DatabaseConnectionInfoImpl(
 			String jdbcUrl,
 			String jdbcDriver,
 			Class<? extends Dialect> dialectClass, DatabaseVersion dialectVersion,
+			boolean hasSchema,
+			boolean hasCatalog,
 			String schema,
 			String catalog,
 			String autoCommitMode,
@@ -62,6 +66,8 @@ public DatabaseConnectionInfoImpl(
 		this.jdbcUrl = nullIfEmpty( jdbcUrl );
 		this.jdbcDriver = nullIfEmpty( jdbcDriver );
 		this.dialectVersion = dialectVersion;
+		this.hasSchema = hasSchema;
+		this.hasCatalog = hasCatalog;
 		this.schema = schema;
 		this.catalog = catalog;
 		this.autoCommitMode = nullIfEmpty( autoCommitMode );
@@ -79,6 +85,8 @@ public DatabaseConnectionInfoImpl(Map<String, Object> settings, Dialect dialect)
 				determineDriver( settings ),
 				dialect.getClass(),
 				dialect.getVersion(),
+				true,
+				true,
 				null,
 				null,
 				determineAutoCommitMode( settings ),
@@ -91,14 +99,48 @@ public DatabaseConnectionInfoImpl(Map<String, Object> settings, Dialect dialect)
 	}
 
 	public DatabaseConnectionInfoImpl(Dialect dialect) {
-		this( null, null, null, dialect.getClass(), dialect.getVersion(), null, null, null, null, null, null, null );
+		this(
+				null,
+				null,
+				null,
+				dialect.getClass(),
+				dialect.getVersion(),
+				true,
+				true,
+				null,
+				null,
+				null,
+				null,
+				null,
+				null,
+				null
+		);
+	}
+
+	public static boolean hasSchema(DataSource dataSource) {
+		try ( var conn = dataSource.getConnection() ) {
+			return conn.getMetaData().supportsSchemasInDataManipulation();
+		}
+		catch ( SQLException ignored ) {
+			return true;
+		}
+	}
+
+	public static boolean hasCatalog(DataSource dataSource) {
+		try ( var conn = dataSource.getConnection() ) {
+			return conn.getMetaData().supportsCatalogsInDataManipulation();
+		}
+		catch ( SQLException ignored ) {
+			return true;
+		}
 	}
 
 	public static String getSchema(DataSource dataSource) {
 		try ( var conn = dataSource.getConnection() ) {
+			// method introduced in 1.7
 			return conn.getSchema();
 		}
-		catch ( SQLException ignored ) {
+		catch ( SQLException|AbstractMethodError ignored ) {
 			return null;
 		}
 	}
@@ -112,11 +154,30 @@ public static String getCatalog(DataSource dataSource) {
 		}
 	}
 
+	static boolean hasSchema(ConnectionCreator creator) {
+		try ( var conn = creator.createConnection() ) {
+			return conn.getMetaData().supportsSchemasInTableDefinitions();
+		}
+		catch ( SQLException ignored ) {
+			return true;
+		}
+	}
+
+	static boolean hasCatalog(ConnectionCreator creator) {
+		try ( var conn = creator.createConnection() ) {
+			return conn.getMetaData().supportsCatalogsInDataManipulation();
+		}
+		catch ( SQLException ignored ) {
+			return true;
+		}
+	}
+
 	static String getSchema(ConnectionCreator creator) {
 		try ( var conn = creator.createConnection() ) {
+			// method introduced in 1.7
 			return conn.getSchema();
 		}
-		catch ( SQLException ignored ) {
+		catch ( SQLException|AbstractMethodError ignored ) {
 			return null;
 		}
 	}
@@ -220,6 +281,16 @@ public Integer getPoolMaxSize() {
 		return catalog;
 	}
 
+	@Override
+	public boolean hasSchema() {
+		return hasSchema;
+	}
+
+	@Override
+	public boolean hasCatalog() {
+		return hasCatalog;
+	}
+
 	@Override
 	public String toInfoString() {
 		return """
@@ -239,8 +310,8 @@ public String toInfoString() {
 						handleEmpty( jdbcDriver ),
 						handleEmpty( dialectClass ),
 						handleEmpty( dialectVersion ),
-						handleEmpty( catalog ),
-						handleEmpty( schema ),
+						handleEmpty( catalog, hasCatalog ),
+						handleEmpty( schema, hasSchema ),
 						handleEmpty( autoCommitMode ),
 						handleEmpty( isolationLevel ),
 						handleFetchSize( fetchSize ),
@@ -254,6 +325,10 @@ private static String handleEmpty(String value) {
 		return isNotEmpty( value ) ? value : DEFAULT;
 	}
 
+	private static String handleEmpty(String value, boolean defined) {
+		return isNotEmpty( value ) ? value : (defined ? "unknown" : "undefined");
+	}
+
 	private static String handleEmpty(DatabaseVersion dialectVersion) {
 		return dialectVersion != null ? dialectVersion.toString() : ZERO_VERSION.toString();
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
@@ -163,6 +163,8 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect, Extract
 				metaData == null ? null : metaData.getDriver(),
 				dialect.getClass(),
 				dialect.getVersion(),
+				metaData == null || metaData.supportsSchemas(),
+				metaData == null || metaData.supportsCatalogs(),
 				metaData == null ? null : metaData.getConnectionSchemaName(),
 				metaData == null ? null : metaData.getConnectionCatalogName(),
 				null,
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
@@ -46,6 +46,8 @@
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getFetchSize;
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getIsolation;
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getSchema;
+import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.hasCatalog;
+import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.hasSchema;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getInt;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getLong;
@@ -167,6 +169,8 @@ private static ConnectionCreator buildCreator(
 				driverList,
 				null,
 				SimpleDatabaseVersion.ZERO_VERSION,
+				hasSchema( connectionCreator ),
+				hasCatalog( connectionCreator ),
 				getSchema( connectionCreator ),
 				getCatalog( connectionCreator ),
 				Boolean.toString( autoCommit ),
@@ -306,6 +310,8 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
 				dbInfo.getJdbcDriver(),
 				dialect.getClass(),
 				dialect.getVersion(),
+				dbInfo.hasSchema(),
+				dbInfo.hasCatalog(),
 				dbInfo.getSchema(),
 				dbInfo.getCatalog(),
 				dbInfo.getAutoCommitMode(),
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java
@@ -123,6 +123,8 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
 				null,
 				dialect.getClass(),
 				dialect.getVersion(),
+				true,
+				true,
 				null,
 				null,
 				null,
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DatabaseConnectionInfo.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DatabaseConnectionInfo.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.engine.jdbc.connections.spi;
 
+import org.hibernate.Internal;
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 
@@ -79,6 +80,12 @@ public interface DatabaseConnectionInfo {
 	@Nullable
 	Integer getJdbcFetchSize();
 
+	@Internal
+	boolean hasSchema();
+
+	@Internal
+	boolean hasCatalog();
+
 	/**
 	 * Collects the information available here as a single String with the intent of using it in logging.
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java
@@ -35,6 +35,8 @@ public class ExtractedDatabaseMetaDataImpl implements ExtractedDatabaseMetaData
 	private final JdbcEnvironment jdbcEnvironment;
 	private final JdbcConnectionAccess connectionAccess;
 
+	private final boolean supportsSchemas;
+	private final boolean supportsCatalogs;
 	private final String connectionCatalogName;
 	private final String connectionSchemaName;
 
@@ -67,6 +69,8 @@ public class ExtractedDatabaseMetaDataImpl implements ExtractedDatabaseMetaData
 		jdbcMetadataAccessible = false;
 		connectionSchemaName = null;
 		connectionCatalogName = null;
+		supportsSchemas = true;
+		supportsCatalogs = true;
 		databaseProductName = null;
 		databaseProductVersion = null;
 		supportsRefCursors = false;
@@ -94,6 +98,8 @@ public class ExtractedDatabaseMetaDataImpl implements ExtractedDatabaseMetaData
 		jdbcMetadataAccessible = true;
 		final Dialect dialect = environment.getDialect();
 		final Connection connection = metaData.getConnection();
+		supportsSchemas = metaData.supportsSchemasInDataManipulation();
+		supportsCatalogs = metaData.supportsCatalogsInDataManipulation();
 		connectionSchemaName = dialect.getSchemaNameResolver().resolveSchemaName( connection, dialect );
 		connectionCatalogName = connection.getCatalog();
 		databaseProductName = metaData.getDatabaseProductName();
@@ -123,6 +129,16 @@ public JdbcEnvironment getJdbcEnvironment() {
 		return jdbcEnvironment;
 	}
 
+	@Override
+	public boolean supportsSchemas() {
+		return supportsSchemas;
+	}
+
+	@Override
+	public boolean supportsCatalogs() {
+		return supportsCatalogs;
+	}
+
 	@Override
 	public boolean supportsNamedParameters() {
 		return supportsNamedParameters;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java
@@ -26,10 +26,34 @@ public interface ExtractedDatabaseMetaData {
 	 */
 	JdbcEnvironment getJdbcEnvironment();
 
+	/**
+	 * The name of the database, according to the JDBC driver.
+	 */
 	String getDatabaseProductName();
 
+	/**
+	 * The version of the database, according to the JDBC driver.
+	 */
 	String getDatabaseProductVersion();
 
+	/**
+	 * Does this driver support named schemas in DML?
+	 *
+	 * @return {@code false} indicates the driver reported false;
+	 * {@code true} indicates the driver reported true or that
+	 * the driver could not be asked.
+	 */
+	boolean supportsSchemas();
+
+	/**
+	 * Does this driver support named catalogs in DML?
+	 *
+	 * @return {@code false} indicates the driver reported false;
+	 * {@code true} indicates the driver reported true or that
+	 * the driver could not be asked.
+	 */
+	boolean supportsCatalogs();
+
 	/**
 	 * Retrieve the name of the catalog in effect when we connected to the database.
 	 *
@@ -59,8 +83,9 @@ public interface ExtractedDatabaseMetaData {
 	/**
 	 * Does the driver report supporting {@link java.sql.Types#REF_CURSOR}?
 	 *
-	 * @return {@code true} indicates the driver reported true; {@code false} indicates the driver reported false
-	 * or that the driver could not be asked.
+	 * @return {@code true} indicates the driver reported true;
+	 * {@code false} indicates the driver reported false or that
+	 * the driver could not be asked.
 	 *
 	 * @see java.sql.DatabaseMetaData#supportsRefCursors()
 	 * @see org.hibernate.dialect.Dialect#supportsRefCursors
diff --git a/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java b/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java
@@ -27,6 +27,8 @@
 import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationNiceName;
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getFetchSize;
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getIsolation;
+import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.hasCatalog;
+import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.hasSchema;
 import static org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.allowJdbcMetadataAccess;
 import static org.hibernate.hikaricp.internal.HikariConfigurationUtil.loadConfiguration;
 import static org.hibernate.internal.util.StringHelper.isBlank;
@@ -108,6 +110,8 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
 						: hikariConfig.getDriverClassName(),
 				dialect.getClass(),
 				dialect.getVersion(),
+				hasSchema( hikariDataSource ),
+				hasCatalog( hikariDataSource ),
 				hikariConfig.getSchema(),
 				hikariConfig.getCatalog(),
 				Boolean.toString( hikariConfig.isAutoCommit() ),
