Skip to content

Commit fd95df3

Browse files
committed
add some missing info to log for Hikari and C3P0
1 parent 63723f1 commit fd95df3

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.getConnectionProperties;
4646
import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationNiceName;
4747
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getCatalog;
48+
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getDriverName;
4849
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getFetchSize;
4950
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getIsolation;
5051
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getSchema;
@@ -170,13 +171,14 @@ public void configure(Map<String, Object> properties) {
170171
final boolean hasCatalog = hasCatalog( connection );
171172
final String schema = getSchema( connection );
172173
final String catalog = getCatalog( connection );
174+
final String driverName = getDriverName( connection );
173175
if ( isolation == null ) {
174176
isolation = getIsolation( connection );
175177
}
176178
dbInfoProducer = dialect -> new DatabaseConnectionInfoImpl(
177179
C3P0ConnectionProvider.class,
178180
jdbcUrl,
179-
jdbcDriverClass,
181+
driverName,
180182
dialect.getClass(),
181183
dialect.getVersion(),
182184
hasSchema,

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@
2626
import com.zaxxer.hikari.HikariDataSource;
2727

2828
import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationNiceName;
29+
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getCatalog;
2930
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getDriverName;
3031
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getFetchSize;
3132
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getIsolation;
33+
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getSchema;
3234
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.hasCatalog;
3335
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.hasSchema;
3436
import static org.hibernate.hikaricp.internal.HikariConfigurationUtil.loadConfiguration;
@@ -112,8 +114,12 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
112114
dialect.getVersion(),
113115
hasSchema( connection ),
114116
hasCatalog( connection ),
115-
hikariConfig.getSchema(),
116-
hikariConfig.getCatalog(),
117+
hikariConfig.getSchema() != null
118+
? hikariConfig.getSchema()
119+
: getSchema( connection ),
120+
hikariConfig.getCatalog() != null
121+
? hikariConfig.getCatalog()
122+
: getCatalog( connection ),
117123
Boolean.toString( hikariConfig.isAutoCommit() ),
118124
hikariConfig.getTransactionIsolation() != null
119125
? hikariConfig.getTransactionIsolation()

0 commit comments

Comments
 (0)