Merge pull request #227 from domaframework/fix/jdbc-driver

Fix JDBC driver loading issues

Author: nakamura-to

codegen/src/main/java/org/seasar/doma/gradle/codegen/jdbc/SimpleDataSource.java

@@ -9,7 +9,6 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 import javax.sql.DataSource;
-import org.seasar.doma.gradle.codegen.exception.CodeGenException;
 import org.seasar.doma.gradle.codegen.message.Message;
 
 public class SimpleDataSource implements DataSource {
@@ -32,11 +31,6 @@ public Driver getDriver() {
 
   public void setDriver(Driver driver) {
     this.driver = driver;
-    try {
-      DriverManager.registerDriver(driver);
-    } catch (SQLException e) {
-      throw new CodeGenException(Message.DOMAGEN9001, e, e);
-    }
   }
 
   public String getUrl() {
@@ -108,6 +102,9 @@ protected Connection getConnectionInternal(Properties info) throws SQLException
       throw new SQLException(Message.DOMAGEN5002.getMessage());
     }
     try {
+      if (driver != null) {
+        return driver.connect(url, info);
+      }
       return DriverManager.getConnection(url, info);
     } catch (SQLException e) {
       if (UNABLE_TO_ESTABLISH_CONNECTION.equals(e.getSQLState())) {

codegen/src/main/java/org/seasar/doma/gradle/codegen/util/ClassUtil.java

@@ -94,7 +94,7 @@ public static Class<?> forName(String className, String propertyName) {
   public static Class<?> forName(String className, String propertyName, ClassLoader classLoader) {
     AssertionUtil.assertNotNull(className, propertyName, classLoader);
     try {
-      return classLoader.loadClass(className);
+      return Class.forName(className, true, classLoader);
     } catch (ClassNotFoundException e) {
       throw new CodeGenException(Message.DOMAGEN0033, propertyName, className, e);
     }