Register driver to driver manager

Author: h3adache

src/main/java/org/apache/ibatis/migration/JdbcConnectionProvider.java

@@ -16,37 +16,62 @@
 package org.apache.ibatis.migration;
 
 import java.sql.Connection;
+import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.ibatis.migration.driver.DriverShim;
 
 public class JdbcConnectionProvider implements ConnectionProvider {
+  private static final Map<String, Driver> registeredDrivers = registeredDrivers();
+
   private final String url;
   private final String username;
   private final String password;
 
-  public JdbcConnectionProvider(String driver, String url, String username, String password) throws Exception {
+  public JdbcConnectionProvider(String driver, String url, String username, String password) {
     this(null, driver, url, username, password);
   }
 
-  public JdbcConnectionProvider(ClassLoader classLoader, String driver, String url, String username, String password)
-      throws Exception {
+  public JdbcConnectionProvider(ClassLoader classLoader, String driver, String url, String username, String password) {
     this.url = url;
     this.username = username;
     this.password = password;
-
-    loadDriver(classLoader, driver);
+    registerDriver(classLoader, driver);
   }
 
   @Override
   public Connection getConnection() throws SQLException {
     return DriverManager.getConnection(url, username, password);
   }
 
-  private static void loadDriver(ClassLoader classLoader, String driver) throws ClassNotFoundException {
-    if (classLoader != null) {
-      Class.forName(driver, true, classLoader);
-    } else {
-      Class.forName(driver);
+  private void registerDriver(ClassLoader classLoader, String driver) {
+    registeredDrivers.computeIfAbsent(driver, (d) -> createDriverClass(classLoader, d));
+  }
+
+  private Driver createDriverClass(ClassLoader classLoader, String driver) {
+    try {
+      final Class<?> driverClass = classLoader == null ? Class.forName(driver)
+          : Class.forName(driver, true, classLoader);
+      final Driver driverInstance = (Driver) driverClass.getDeclaredConstructor().newInstance();
+      final DriverShim driverShim = new DriverShim(driverInstance);
+      DriverManager.registerDriver(driverShim);
+      return driverShim;
+    } catch (final Exception e) {
+      throw new IllegalStateException("Failed to register driver " + driver, e);
+    }
+  }
+
+  private static Map<String, Driver> registeredDrivers() {
+    final Map<String, Driver> registeredDrivers = new HashMap<>();
+    final Enumeration<Driver> drivers = DriverManager.getDrivers();
+    while (drivers.hasMoreElements()) {
+      final Driver driver = drivers.nextElement();
+      registeredDrivers.put(driver.getClass().getName(), driver);
     }
+    return registeredDrivers;
   }
 }

src/main/java/org/apache/ibatis/migration/driver/DriverShim.java

@@ -0,0 +1,67 @@
+/**
+ *    Copyright 2010-2020 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.apache.ibatis.migration.driver;
+
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.Properties;
+import java.util.logging.Logger;
+
+public class DriverShim implements Driver {
+  private final Driver delegate;
+
+  public DriverShim(Driver delegate) {
+    this.delegate = delegate;
+  }
+
+  @Override
+  public Connection connect(String url, Properties info) throws SQLException {
+    return delegate.connect(url, info);
+  }
+
+  @Override
+  public boolean acceptsURL(String url) throws SQLException {
+    return delegate.acceptsURL(url);
+  }
+
+  @Override
+  public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
+    return delegate.getPropertyInfo(url, info);
+  }
+
+  @Override
+  public int getMajorVersion() {
+    return delegate.getMajorVersion();
+  }
+
+  @Override
+  public int getMinorVersion() {
+    return delegate.getMinorVersion();
+  }
+
+  @Override
+  public boolean jdbcCompliant() {
+    return delegate.jdbcCompliant();
+  }
+
+  @Override
+  public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+    return delegate.getParentLogger();
+  }
+}