From ffcd04a6261634fb7a529070aeabf397dde45079 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Sat, 22 Oct 2016 10:23:53 +0800
Subject: [PATCH]

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

diff --git a/src/META-INF/persistence-template.xml b/src/META-INF/persistence-template.xml
index 1e0045f62..574c54a18 100644
--- a/src/META-INF/persistence-template.xml
+++ b/src/META-INF/persistence-template.xml
@@ -10,8 +10,9 @@
             <!-- 
                 javax.persistence.jdbc.driver在JPA的值是JDBC驱动，Redkale有所不同，值应该是javax.sql.DataSource的子类。 
                 为了兼容用户习惯，Redkale内置常见JDBC驱动到javax.sql.DataSource的映射关系：
-                                       com.mysql.jdbc.Driver  ——————  com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource
                                      org.mariadb.jdbc.Driver  ——————  org.mariadb.jdbc.MySQLDataSource
+                                       org.postgresql.Driver  ——————  org.postgresql.ds.PGConnectionPoolDataSource
+                                       com.mysql.jdbc.Driver  ——————  com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource
                              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
diff --git a/src/org/redkale/source/DataDefaultSource.java b/src/org/redkale/source/DataDefaultSource.java
index cf0a3b678..e260cc1fd 100644
--- a/src/org/redkale/source/DataDefaultSource.java
+++ b/src/org/redkale/source/DataDefaultSource.java
@@ -204,6 +204,9 @@ public final class DataDefaultSource implements DataSource, Function<Class, Enti
                 case "oracle.jdbc.driver.OracleDriver":
                     source = "oracle.jdbc.pool.OracleConnectionPoolDataSource";
                     break;
+                case "org.postgresql.Driver":
+                    source = "org.postgresql.ds.PGConnectionPoolDataSource";
+                    break;
                 case "com.microsoft.sqlserver.jdbc.SQLServerDriver":
                     source = "com.microsoft.sqlserver.jdbc.SQLServerConnectionPoolDataSource";
                     break;
@@ -211,13 +214,21 @@ public final class DataDefaultSource implements DataSource, Function<Class, Enti
         }
         final Class clazz = Class.forName(source);
         Object pdsource = clazz.newInstance();
-        Method seturlm;
-        try {
-            seturlm = clazz.getMethod("setUrl", String.class);
-        } catch (Exception e) {
-            seturlm = clazz.getMethod("setURL", String.class);
+        if (source.contains(".postgresql.")) {
+            Class driver = Class.forName("org.postgresql.Driver");
+            Properties properties = (Properties) driver.getMethod("parseURL", String.class, Properties.class).invoke(null, url, new Properties());
+            clazz.getMethod("setServerName", String.class).invoke(pdsource, properties.getProperty("PGHOST"));
+            clazz.getMethod("setDatabaseName", String.class).invoke(pdsource, properties.getProperty("PGDBNAME"));
+            clazz.getMethod("setPortNumber", int.class).invoke(pdsource, Integer.parseInt(properties.getProperty("PGPORT", "5432")));
+        } else {
+            Method seturlm;
+            try {
+                seturlm = clazz.getMethod("setUrl", String.class);
+            } catch (Exception e) {
+                seturlm = clazz.getMethod("setURL", String.class);
+            }
+            seturlm.invoke(pdsource, url);
         }
-        seturlm.invoke(pdsource, url);
         clazz.getMethod("setUser", String.class).invoke(pdsource, user);
         clazz.getMethod("setPassword", String.class).invoke(pdsource, password);
         return (ConnectionPoolDataSource) pdsource;
diff --git a/src/org/redkale/source/JDBCPoolSource.java b/src/org/redkale/source/JDBCPoolSource.java
index 351b71da0..9ec7bd52d 100644
--- a/src/org/redkale/source/JDBCPoolSource.java
+++ b/src/org/redkale/source/JDBCPoolSource.java
@@ -109,6 +109,10 @@ public class JDBCPoolSource {
         return source != null && source.getClass().getName().contains(".sqlserver.");
     }
 
+    final boolean isPostgresql () {
+        return source != null && source.getClass().getName().contains(".postgresql.");
+    }
+    
     private void watch() throws IOException {
         if (dataSource.conf == null || dataSource.name == null) return;
         final String file = dataSource.conf.getFile();