From 598a7520c6a8eca11182ecbe6c85d5fdb8b5059e Mon Sep 17 00:00:00 2001
From: alan <alan@fanruan.com>
Date: Thu, 2 Jan 2020 17:30:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/__test__/app.test.ts | 15 +++++++++++++++
 src/modules/app.service.ts       | 16 +++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/modules/__test__/app.test.ts b/src/modules/__test__/app.test.ts
index 9ea92be..e61efc5 100644
--- a/src/modules/__test__/app.test.ts
+++ b/src/modules/__test__/app.test.ts
@@ -52,6 +52,21 @@ test('解析url', () => {
         databaseName: 'database',
         urlInfo: '',
     });
+    expect(resolveUrlInfo('jdbc:sqlserver://hostname:port;databaseName=database')).toEqual({
+        host: 'hostname',
+        port: '',
+        databaseName: 'database',
+        urlInfo: '',
+    });
+});
+
+test('数据库可能为空', () => {
+    expect(resolveUrlInfo('jdbc:mysql://secure.finedevelop.com:62306/')).toEqual({
+        host: 'secure.finedevelop.com',
+        port: '62306',
+        databaseName: '',
+        urlInfo: '',
+    });
 });
 
 /**
diff --git a/src/modules/app.service.ts b/src/modules/app.service.ts
index fc18f77..c193cbe 100644
--- a/src/modules/app.service.ts
+++ b/src/modules/app.service.ts
@@ -49,7 +49,17 @@ export function getJdbcDatabaseType(database: string, driver: string): DatabaseT
 
 export function resolveUrlInfo (url: string) {
     if (BI.isNull(url)) return {};
-    const greenplumUrl = url.match(/^jdbc:(pivotal:greenplum):(thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(:|\/|;)([^]+)(.*)/i);
+    const oracleUlr = url.match(/^jdbc:(oracle):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(:)([^]+)(.*)/i);
+    if (oracleUlr) {
+        return {
+            host: oracleUlr[5],
+            port: oracleUlr[7] === 'port' ? '' : oracleUlr[7],
+            databaseName: oracleUlr[9],
+            urlInfo: oracleUlr[10],
+        };
+    }
+
+    const greenplumUrl = url.match(/^jdbc:(pivotal:greenplum):(thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;)([^]+)(.*)/i);
     if (greenplumUrl) {
         return {
             host: greenplumUrl[4],
@@ -58,12 +68,12 @@ export function resolveUrlInfo (url: string) {
             urlInfo: greenplumUrl[9],
         };
     }
-    const result = url.match(/^jdbc:(oracle|mysql|sqlserver|db2|impala|kylin|phoenix|derby|gbase|gbasedbt-sqli|informix-sqli|h2|postgresql|hive2|vertica|kingbase|presto|redshift|postgresql):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(:|\/|;DatabaseName=)([^]+)(.*)/i);
+    const result = url.match(/^jdbc:(mysql|sqlserver|db2|impala|kylin|phoenix|derby|gbase|gbasedbt-sqli|informix-sqli|h2|postgresql|hive2|vertica|kingbase|presto|redshift|postgresql):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;DatabaseName=)?([^]+)?(.*)/i);
     if (result) {
         return {
             host: result[5],
             port: result[7] === 'port' ? '' : result[7],
-            databaseName: result[9],
+            databaseName: result[9] || '',
             urlInfo: result[10],
         };
     }