Fixes #1137 support changing user/password at runtime for DriverDataSource-wrapped driver connections.

brettwooldridge · brettwooldridge · commit 851e2d4592b5 · 2018-05-14T21:13:26.000+09:00
diff --git a/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java b/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java
@@ -120,9 +120,18 @@ public Connection getConnection() throws SQLException
    }
 
    @Override
-   public Connection getConnection(String username, String password) throws SQLException
+   public Connection getConnection(final String username, final String password) throws SQLException
    {
-      return getConnection();
+      final Properties cloned = (Properties) driverProperties.clone();
+      if (username != null) {
+         cloned.put("user", username);
+         cloned.put("username", username);
+      }
+      if (password != null) {
+         cloned.put("password", password);
+      }
+
+      return driver.connect(jdbcUrl, cloned);
    }
 
    @Override

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,18 @@ public Connection getConnection() throws SQLException`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`@Override`
`123`		`- public Connection getConnection(String username, String password) throws SQLException`
	`123`	`+ public Connection getConnection(final String username, final String password) throws SQLException`
`124`	`124`	`{`
`125`		`- return getConnection();`
	`125`	`+ final Properties cloned = (Properties) driverProperties.clone();`
	`126`	`+ if (username != null) {`
	`127`	`+ cloned.put("user", username);`
	`128`	`+ cloned.put("username", username);`
	`129`	`+ }`
	`130`	`+ if (password != null) {`
	`131`	`+ cloned.put("password", password);`
	`132`	`+ }`
	`133`	`+`
	`134`	`+ return driver.connect(jdbcUrl, cloned);`
`126`	`135`	`}`
`127`	`136`
`128`	`137`	`@Override`