From fb7f16956bc1b6acaae480143ef1ce0a6ca3f6fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=7B=E6=9D=8E=E5=BD=A6=E6=85=A7=7D=28=7B026834=7D=29?=
 <yanhui.liyh@alibaba-inc.com>
Date: Thu, 5 Feb 2015 15:21:50 +0800
Subject: [PATCH] fix #778

---
 .../com/alibaba/druid/util/JdbcUtils.java     | 27 ++++++++++---------
 .../com/alibaba/druid/util/JdbcUtilsTest.java |  6 +++++
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java
index d1f3238462..b963faa74e 100644
--- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java
+++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java
@@ -426,31 +426,30 @@ public final class JdbcUtils implements JdbcConstants {
             return null;
         }
 
-        if (rawUrl.startsWith("jdbc:derby:")) {
+        if (rawUrl.startsWith("jdbc:derby:") || rawUrl.startsWith("jdbc:log4jdbc:derby:")) {
             return DERBY;
-        } else if (rawUrl.startsWith("jdbc:mysql:") || rawUrl.startsWith("jdbc:cobar:")) {
+        } else if (rawUrl.startsWith("jdbc:mysql:") || rawUrl.startsWith("jdbc:cobar:")
+                   || rawUrl.startsWith("jdbc:log4jdbc:mysql:")) {
             return MYSQL;
-        } else if (rawUrl.startsWith("jdbc:log4jdbc:")) {
-            return LOG4JDBC;
         } else if (rawUrl.startsWith("jdbc:mariadb:")) {
             return MARIADB;
-        } else if (rawUrl.startsWith("jdbc:oracle:")) {
+        } else if (rawUrl.startsWith("jdbc:oracle:") || rawUrl.startsWith("jdbc:log4jdbc:oracle:")) {
             return ORACLE;
         } else if (rawUrl.startsWith("jdbc:alibaba:oracle:")) {
             return ALI_ORACLE;
-        } else if (rawUrl.startsWith("jdbc:microsoft:")) {
+        } else if (rawUrl.startsWith("jdbc:microsoft:") || rawUrl.startsWith("jdbc:log4jdbc:microsoft:")) {
             return SQL_SERVER;
-        } else if (rawUrl.startsWith("jdbc:sqlserver:")) {
+        } else if (rawUrl.startsWith("jdbc:sqlserver:") || rawUrl.startsWith("jdbc:log4jdbc:sqlserver:")) {
             return SQL_SERVER;
-        } else if (rawUrl.startsWith("jdbc:sybase:Tds:")) {
+        } else if (rawUrl.startsWith("jdbc:sybase:Tds:") || rawUrl.startsWith("jdbc:log4jdbc:sybase:")) {
             return SYBASE;
-        } else if (rawUrl.startsWith("jdbc:jtds:")) {
+        } else if (rawUrl.startsWith("jdbc:jtds:") || rawUrl.startsWith("jdbc:log4jdbc:jtds:")) {
             return JTDS;
         } else if (rawUrl.startsWith("jdbc:fake:") || rawUrl.startsWith("jdbc:mock:")) {
             return MOCK;
-        } else if (rawUrl.startsWith("jdbc:postgresql:")) {
+        } else if (rawUrl.startsWith("jdbc:postgresql:") || rawUrl.startsWith("jdbc:log4jdbc:postgresql:")) {
             return POSTGRESQL;
-        } else if (rawUrl.startsWith("jdbc:hsqldb:")) {
+        } else if (rawUrl.startsWith("jdbc:hsqldb:") || rawUrl.startsWith("jdbc:log4jdbc:hsqldb:")) {
             return HSQL;
         } else if (rawUrl.startsWith("jdbc:db2:")) {
             return DB2;
@@ -458,13 +457,13 @@ public final class JdbcUtils implements JdbcConstants {
             return "sqlite";
         } else if (rawUrl.startsWith("jdbc:ingres:")) {
             return "ingres";
-        } else if (rawUrl.startsWith("jdbc:h2:")) {
+        } else if (rawUrl.startsWith("jdbc:h2:") || rawUrl.startsWith("jdbc:log4jdbc:h2:")) {
             return H2;
         } else if (rawUrl.startsWith("jdbc:mckoi:")) {
             return "mckoi";
         } else if (rawUrl.startsWith("jdbc:cloudscape:")) {
             return "cloudscape";
-        } else if (rawUrl.startsWith("jdbc:informix-sqli:")) {
+        } else if (rawUrl.startsWith("jdbc:informix-sqli:") || rawUrl.startsWith("jdbc:log4jdbc:informix-sqli:")) {
             return "informix";
         } else if (rawUrl.startsWith("jdbc:timesten:")) {
             return "timesten";
@@ -490,6 +489,8 @@ public final class JdbcUtils implements JdbcConstants {
             return JdbcConstants.DM;
         } else if (rawUrl.startsWith("jdbc:kingbase:")) {
             return JdbcConstants.KINGBASE;
+        } else if (rawUrl.startsWith("jdbc:log4jdbc:")) {
+            return LOG4JDBC;
         } else {
             return null;
         }
diff --git a/src/test/java/com/alibaba/druid/util/JdbcUtilsTest.java b/src/test/java/com/alibaba/druid/util/JdbcUtilsTest.java
index 518f09ed9d..5d8ff06313 100644
--- a/src/test/java/com/alibaba/druid/util/JdbcUtilsTest.java
+++ b/src/test/java/com/alibaba/druid/util/JdbcUtilsTest.java
@@ -32,5 +32,11 @@ public class JdbcUtilsTest extends TestCase {
         String dbType = JdbcUtils.getDbType(jdbcUrl, null);
         assertEquals("not support cobar driver, url like jdbc:cobar:...", JdbcConstants.MYSQL, dbType);
     }
+    
+    public void test_log4jdbc_mysql() {
+        String jdbcUrl = "jdbc:log4jdbc:mysql://localhost:8066/test";
+        String dbType = JdbcUtils.getDbType(jdbcUrl, null);
+        assertEquals("not support log4jdbc mysql, url like jdbc:log4jdbc:mysql:...", JdbcConstants.MYSQL, dbType);
+    }
 
 }