From 6a2716a1dfd70727a9d1cbc5343ebf781f5d1808 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Thu, 5 Dec 2013 23:16:59 +0900
Subject: [PATCH] Fixes #5 add setDataSourceProperties() method.  Additionally,
 add setting for SQL to be executed on new connections.

---
 .../java/com/zaxxer/hikari/HikariConfig.java  | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/com/zaxxer/hikari/HikariConfig.java b/core/src/main/java/com/zaxxer/hikari/HikariConfig.java
index 6bdb99d3..89fce40b 100644
--- a/core/src/main/java/com/zaxxer/hikari/HikariConfig.java
+++ b/core/src/main/java/com/zaxxer/hikari/HikariConfig.java
@@ -54,17 +54,18 @@ public final class HikariConfig implements HikariConfigMBean
     private String connectionTestQuery;
     private String dataSourceClassName;
     private String shadedCodexMapping;
+    private String connectionInitSql;
     private boolean isJdbc4connectionTest;
     private boolean isAutoCommit;
     private boolean isUseInstrumentation;
-    private Properties driverProperties;
+    private Properties dataSourceProperties;
 
     /**
      * Default constructor
      */
     public HikariConfig()
     {
-        driverProperties = new Properties();
+        dataSourceProperties = new Properties();
 
         acquireIncrement = 5;
         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} */
     public int getAcquireIncrement()
     {
@@ -176,6 +167,16 @@ public final class HikariConfig implements HikariConfigMBean
         this.connectionTestQuery = connectionTestQuery;
     }
 
+    public String getConnectionInitSql()
+    {
+        return connectionInitSql;
+    }
+
+    public void setConnectionInitSql(String connectionInitSql)
+    {
+        this.connectionInitSql = connectionInitSql;
+    }
+
     /** {@inheritDoc} */
     public long getConnectionTimeout()
     {
@@ -206,6 +207,21 @@ public final class HikariConfig implements HikariConfigMBean
         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} */
     public long getIdleTimeout()
     {