From 65f48022e3103e597d0f7d86c9fca86995e1a20d Mon Sep 17 00:00:00 2001
From: "Aries.lsy" <”Aries.lsy@fanruan.com“>
Date: Mon, 22 Aug 2022 11:14:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?BI-108526=20BI-111537=20feat:=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0trino=20tdsql=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/constants/constant.ts | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/modules/constants/constant.ts b/src/modules/constants/constant.ts
index f70570b..a551894 100644
--- a/src/modules/constants/constant.ts
+++ b/src/modules/constants/constant.ts
@@ -670,6 +670,29 @@ export const DATA_BASE_TYPES = [
             'org.sqlite.JDBC': 'jdbc:sqlite:[PATH_TO_DB_FILES]',
         },
     },
+    {
+        text: 'trino',
+        databaseType: 'trino',
+        driver: 'io.trino.jdbc.TrinoDriver',
+        url: 'jdbc:trino://hostname:port/database',
+        commonly: false,
+        internal: true,
+        type: 'jdbc',
+        hasSchema: true,
+        kerberos: false,
+    }, 
+    {
+        text: BI.i18nText('Dec-Dcm_Connection_TDSQL'),
+        databaseType: 'tdsql',
+        driver: 'org.postgresql.Driver',
+        url: 'jdbc:postgresql://hostname:port/database',
+        commonly: false,
+        internal: true,
+        type: 'jdbc',
+        hasSchema: true,
+        kerberos: false,
+        fetchSize: 10000,
+    }
 ];
 
 

From 10175ebf04652dce0ae923ee499bd697a4eb4dd9 Mon Sep 17 00:00:00 2001
From: "Aries.lsy" <”Aries.lsy@fanruan.com“>
Date: Tue, 30 Aug 2022 15:04:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?BI-112953=20fix:jdbcResolve=E6=AD=A3?=
 =?UTF-8?q?=E5=88=99=E5=8C=B9=E9=85=8Dtrino?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/app.provider.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/app.provider.ts b/src/modules/app.provider.ts
index 3d1a747..3ea3ab0 100644
--- a/src/modules/app.provider.ts
+++ b/src/modules/app.provider.ts
@@ -25,7 +25,7 @@ BI.provider('dec.connection.provider.datebase', function() {
                 urlInfo: greenplumUrl[9],
             };
         }
-        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|clickhouse):(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|clickhouse|trino):(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],