Fixes #5 add setDataSourceProperties() method. Additionally, add setting for SQL to be executed on

new connections.
pull/6/head
Brett Wooldridge 11 years ago
parent 5b7eb914b9
commit 6a2716a1df

@ -54,17 +54,18 @@ public final class HikariConfig implements HikariConfigMBean
private String connectionTestQuery; private String connectionTestQuery;
private String dataSourceClassName; private String dataSourceClassName;
private String shadedCodexMapping; private String shadedCodexMapping;
private String connectionInitSql;
private boolean isJdbc4connectionTest; private boolean isJdbc4connectionTest;
private boolean isAutoCommit; private boolean isAutoCommit;
private boolean isUseInstrumentation; private boolean isUseInstrumentation;
private Properties driverProperties; private Properties dataSourceProperties;
/** /**
* Default constructor * Default constructor
*/ */
public HikariConfig() public HikariConfig()
{ {
driverProperties = new Properties(); dataSourceProperties = new Properties();
acquireIncrement = 5; acquireIncrement = 5;
acquireRetries = 3; acquireRetries = 3;
@ -108,16 +109,6 @@ public final class HikariConfig implements HikariConfigMBean
} }
} }
public void addDataSourceProperty(String propertyName, Object value)
{
driverProperties.put(propertyName, value);
}
public Properties getDataSourceProperties()
{
return driverProperties;
}
/** {@inheritDoc} */ /** {@inheritDoc} */
public int getAcquireIncrement() public int getAcquireIncrement()
{ {
@ -176,6 +167,16 @@ public final class HikariConfig implements HikariConfigMBean
this.connectionTestQuery = connectionTestQuery; this.connectionTestQuery = connectionTestQuery;
} }
public String getConnectionInitSql()
{
return connectionInitSql;
}
public void setConnectionInitSql(String connectionInitSql)
{
this.connectionInitSql = connectionInitSql;
}
/** {@inheritDoc} */ /** {@inheritDoc} */
public long getConnectionTimeout() public long getConnectionTimeout()
{ {
@ -206,6 +207,21 @@ public final class HikariConfig implements HikariConfigMBean
this.dataSourceClassName = className; this.dataSourceClassName = className;
} }
public void addDataSourceProperty(String propertyName, Object value)
{
dataSourceProperties.put(propertyName, value);
}
public Properties getDataSourceProperties()
{
return dataSourceProperties;
}
public void setDataSourceProperties(Properties dsProperties)
{
dataSourceProperties.putAll(dsProperties);
}
/** {@inheritDoc} */ /** {@inheritDoc} */
public long getIdleTimeout() public long getIdleTimeout()
{ {

Loading…
Cancel
Save