From 8f9bfc3f287c71a4140e6b88b366531cc92cb509 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Thu, 23 Feb 2017 20:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9javax.persistence.jdbc.driver?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/META-INF/persistence-template.xml         |  1 +
 src/org/redkale/source/DataDefaultSource.java | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/META-INF/persistence-template.xml b/src/META-INF/persistence-template.xml
index 574c54a18..fb4385d20 100644
--- a/src/META-INF/persistence-template.xml
+++ b/src/META-INF/persistence-template.xml
@@ -16,6 +16,7 @@
                              oracle.jdbc.driver.OracleDriver  ——————  oracle.jdbc.pool.OracleConnectionPoolDataSource
                 com.microsoft.sqlserver.jdbc.SQLServerDriver  ——————  com.microsoft.sqlserver.jdbc.SQLServerConnectionPoolDataSource
                 因此 com.mysql.jdbc.Driver 会被自动转换成 com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource
+                并且如果JDBC驱动是以上几个版本，javax.persistence.jdbc.driver属性都可以省略，Redkale会根据javax.persistence.jdbc.url的值来识别驱动
             -->
             <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
             <property name="javax.persistence.jdbc.user" value="root"/>
diff --git a/src/org/redkale/source/DataDefaultSource.java b/src/org/redkale/source/DataDefaultSource.java
index cc78bbc67..c21516bca 100644
--- a/src/org/redkale/source/DataDefaultSource.java
+++ b/src/org/redkale/source/DataDefaultSource.java
@@ -191,15 +191,34 @@ public final class DataDefaultSource implements DataSource, Function<Class, Enti
         }
     }
 
-    static ConnectionPoolDataSource createDataSource(final String source0, String url, String user, String password) throws Exception {
+    static ConnectionPoolDataSource createDataSource(String source0, String url, String user, String password) throws Exception {
         String source = source0;
-        if (source0.contains("Driver")) {  //为了兼容JPA的配置文件
+        if (source0 == null || source0.isEmpty()) {
+            if (url.startsWith("jdbc:mysql:")) {
+                source0 = "com.mysql.jdbc.Driver";
+            } else if (url.startsWith("jdbc:mariadb:")) {
+                source0 = "org.mariadb.jdbc.Driver";
+            } else if (url.startsWith("jdbc:oracle:")) {
+                source0 = "oracle.jdbc.driver.OracleDriver";
+            } else if (url.startsWith("jdbc:postgresql:")) {
+                source0 = "org.postgresql.Driver";
+            } else if (url.startsWith("jdbc:microsoft:sqlserver:")) {
+                source0 = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+            }
+        }
+        if (source0 != null && source0.contains("Driver")) {  //为了兼容JPA的配置文件
             switch (source0) {
                 case "org.mariadb.jdbc.Driver":
                     source = "org.mariadb.jdbc.MySQLDataSource";
                     break;
+                case "com.mysql.cj.jdbc.Driver":
                 case "com.mysql.jdbc.Driver":
-                    source = "com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource";
+                    try {
+                        Class.forName("com.mysql.cj.jdbc.MysqlConnectionPoolDataSource");
+                        source = "com.mysql.cj.jdbc.MysqlConnectionPoolDataSource";
+                    } catch (Exception e) {
+                        source = "com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource";
+                    }
                     break;
                 case "oracle.jdbc.driver.OracleDriver":
                     source = "oracle.jdbc.pool.OracleConnectionPoolDataSource";