From 8921bb08c86a7435b6bf21c78c9b2d470963d874 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Mon, 14 May 2018 22:53:17 +0900
Subject: [PATCH] Fixes #1137 support changing user/password at runtime for
 DriverDataSource-wrapped driver connections.

---
 src/main/java/com/zaxxer/hikari/util/DriverDataSource.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java b/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java
index 231b062c2..de78101fa 100644
--- a/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java
+++ b/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java
@@ -125,7 +125,9 @@ public Connection getConnection(final String username, final String password) th
       final Properties cloned = (Properties) driverProperties.clone();
       if (username != null) {
          cloned.put("user", username);
-         cloned.put("username", username);
+         if (cloned.containsKey("username")) {
+            cloned.put("username", username);
+         }
       }
       if (password != null) {
          cloned.put("password", password);