|
26 | 26 | import com.zaxxer.hikari.HikariDataSource;
|
27 | 27 |
|
28 | 28 | import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationNiceName;
|
| 29 | +import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getCatalog; |
29 | 30 | import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getDriverName;
|
30 | 31 | import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getFetchSize;
|
31 | 32 | import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getIsolation;
|
| 33 | +import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getSchema; |
32 | 34 | import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.hasCatalog;
|
33 | 35 | import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.hasSchema;
|
34 | 36 | import static org.hibernate.hikaricp.internal.HikariConfigurationUtil.loadConfiguration;
|
@@ -112,8 +114,12 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
|
112 | 114 | dialect.getVersion(),
|
113 | 115 | hasSchema( connection ),
|
114 | 116 | 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 ), |
117 | 123 | Boolean.toString( hikariConfig.isAutoCommit() ),
|
118 | 124 | hikariConfig.getTransactionIsolation() != null
|
119 | 125 | ? hikariConfig.getTransactionIsolation()
|
|
0 commit comments