From 324d4bd94e19f9f265cfe7cecbead62238344f14 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Sun, 20 May 2018 13:14:41 +0800
Subject: [PATCH]

---
 src/org/redkale/source/DataSources.java    |  4 ++++
 src/org/redkale/source/PoolJdbcSource.java | 16 ----------------
 src/org/redkale/source/PoolSource.java     |  4 ++++
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/org/redkale/source/DataSources.java b/src/org/redkale/source/DataSources.java
index 24237aae4..5b5d5adbd 100644
--- a/src/org/redkale/source/DataSources.java
+++ b/src/org/redkale/source/DataSources.java
@@ -116,6 +116,10 @@ public final class DataSources {
                         String url0 = url.substring(0, pos);
                         pos = url0.lastIndexOf(':');
                         if (pos > 0) dbtype = url0.substring(pos + 1);
+                    } else { //jdbc:oracle:thin:@localhost:1521
+                        String url0 = url.substring(url.indexOf(":") + 1);
+                        pos = url0.indexOf(':');
+                        if (pos > 0) dbtype = url0.substring(0, pos);
                     }
                 }
                 if (dbtype == null) throw re;
diff --git a/src/org/redkale/source/PoolJdbcSource.java b/src/org/redkale/source/PoolJdbcSource.java
index 5be61b432..62f5d5778 100644
--- a/src/org/redkale/source/PoolJdbcSource.java
+++ b/src/org/redkale/source/PoolJdbcSource.java
@@ -152,22 +152,6 @@ public class PoolJdbcSource extends PoolSource<Connection> {
         return 0;
     }
 
-    final boolean isMysql2() {
-        return source != null && source.getClass().getName().contains(".mysql.");
-    }
-
-    final boolean isOracle2() {
-        return source != null && source.getClass().getName().contains("oracle.");
-    }
-
-    final boolean isSqlserver2() {
-        return source != null && source.getClass().getName().contains(".sqlserver.");
-    }
-
-    final boolean isPostgresql2() {
-        return source != null && source.getClass().getName().contains(".postgresql.");
-    }
-
     private void watch() throws IOException {
         if (persistxml == null || unitName == null) return;
         final String file = persistxml.getFile();
diff --git a/src/org/redkale/source/PoolSource.java b/src/org/redkale/source/PoolSource.java
index 1b38ba735..7cba80f59 100644
--- a/src/org/redkale/source/PoolSource.java
+++ b/src/org/redkale/source/PoolSource.java
@@ -78,6 +78,10 @@ public abstract class PoolSource<DBChannel> {
                 String url0 = this.url.substring(0, pos);
                 pos = url0.lastIndexOf(':');
                 if (pos > 0) dbtype0 = url0.substring(pos + 1);
+            } else { //jdbc:oracle:thin:@localhost:1521
+                String url0 = url.substring(url.indexOf(":") + 1);
+                pos = url0.indexOf(':');
+                if (pos > 0) dbtype0 = url0.substring(0, pos);
             }
         }
         this.dbtype = dbtype0.toLowerCase();