HHH-18538 fix startup logging for DatasourceConnectionProviderImpl and multi-tenant version

Signed-off-by: Gavin King <[email protected]>

Author: gavinking

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

@@ -139,13 +139,20 @@ public boolean supportsAggressiveRelease() {
 	@Override
 	public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
 		return new DatabaseConnectionInfoImpl(
-				"Connecting through datasource '" + (dataSourceJndiName != null ? dataSourceJndiName : dataSource) + "'",
+				null,
 				null,
 				dialect.getVersion(),
 				null,
 				null,
 				null,
 				null
-		);
+		) {
+			@Override
+			public String toInfoString() {
+				return dataSourceJndiName != null
+						? "\tDatasource JND name [" + dataSourceJndiName + "]"
+						: "\tProvided DataSource";
+			}
+		};
 	}
 }

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

@@ -125,14 +125,19 @@ public void stop() {
 	@Override
 	public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
 		return new DatabaseConnectionInfoImpl(
-				"Multi-tenant - " + tenantIdentifierForAny,
+				null,
 				null,
 				dialect.getVersion(),
 				null,
 				null,
 				null,
 				null
-		);
+		) {
+			@Override
+			public String toInfoString() {
+				return "\tMulti-tenant datasource JNDI name [" + jndiName + ']';
+			}
+		};
 	}
 
 }