diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 583b3e434f..be9f847ee8 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -352,6 +352,10 @@ public final class JdbcUtils { return "com.alibaba.druid.mock.MockDriver"; } else if (rawUrl.startsWith("jdbc:postgresql:")) { return "org.postgresql.Driver"; + } else if (rawUrl.startsWith("jdbc:hsqldb:")) { + return "org.hsqldb.jdbcDriver"; + } else if (rawUrl.startsWith("jdbc:db2:")) { + return "COM.ibm.db2.jdbc.app.DB2Driver"; } else { throw new SQLException("unkow jdbc driver"); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java index 98b44e6d04..59b0724dc3 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java @@ -27,7 +27,8 @@ public class PasswordCallbackTest extends TestCase { } public static class TestPasswordCallback extends PasswordCallback { - + private static final long serialVersionUID = 1L; + private String url; private Properties properties; @@ -55,10 +56,5 @@ public class PasswordCallbackTest extends TestCase { this.properties = properties; } - /** - * - */ - private static final long serialVersionUID = 1L; - } }