From 988064dd8902b4ed7c0d7cfa7cec39b4b1135a94 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 1 Jul 2021 15:08:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=98=BE=E7=A4=BA=20oracle=20=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/datasource/provider/JdbcProvider.java | 2 --
 frontend/src/views/dataset/common/DatasetChartDetail.vue        | 1 +
 frontend/src/views/system/datasource/DsTree.vue                 | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java
index 55574da8a6..fa8ab84c91 100644
--- a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java
+++ b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java
@@ -100,9 +100,7 @@ public class JdbcProvider extends DatasourceProvider {
     private List<String[]> fetchResult(ResultSet rs) throws Exception {
         List<String[]> list = new LinkedList<>();
         ResultSetMetaData metaData = rs.getMetaData();
-        System.out.println(metaData.getColumnName(1));
         int columnCount = metaData.getColumnCount();
-        System.out.println(columnCount);
         while (rs.next()) {
             String[] row = new String[columnCount];
             for (int j = 0; j < columnCount; j++) {
diff --git a/frontend/src/views/dataset/common/DatasetChartDetail.vue b/frontend/src/views/dataset/common/DatasetChartDetail.vue
index dba44ef9ba..e9ff1644ba 100644
--- a/frontend/src/views/dataset/common/DatasetChartDetail.vue
+++ b/frontend/src/views/dataset/common/DatasetChartDetail.vue
@@ -68,6 +68,7 @@
             <p class="info-title">{{ $t('datasource.type') }}</p>
             <p v-if="detail.datasource.type === 'mysql'" class="info-content">MySQL</p>
             <p v-if="detail.datasource.type === 'sqlServer'" class="info-content">SQL Server</p>
+            <p v-if="detail.datasource.type === 'oracle'" class="info-content">Oracle</p>
           </el-col>
           <el-col class="info-item">
             <p class="info-title">{{ $t('dataset.create_time') }}</p>
diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index 599d3fee78..2f3681cf7e 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -154,6 +154,8 @@ export default {
         return 'MySQL'
       } else if (type === 'sqlServer') {
         return 'SQL Server'
+      }else if (type === 'oracle') {
+        return 'Oracle'
       }
     },