From 56008051ea40beadea828b7634c3f4cc48ab6bf9 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 20 Nov 2023 17:51:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20oracle=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=95=B0=E6=8D=AE=E5=BA=93=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E5=90=8E=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/provider/datasource/JdbcProvider.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
index ec38b0a120..ddfa03c2e8 100644
--- a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
@@ -97,7 +97,8 @@ public class JdbcProvider extends DefaultJdbcProvider {
             }
             String schemaPattern = "%";
             if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.oracle.name())) {
-                schemaPattern = databaseMetaData.getUserName();
+                OracleConfiguration oracleConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfiguration.class);
+                schemaPattern = oracleConfiguration.getSchema();
             }
             ResultSet resultSet = databaseMetaData.getColumns(null, schemaPattern, tableNamePattern, "%");
             while (resultSet.next()) {
@@ -121,9 +122,11 @@ public class JdbcProvider extends DefaultJdbcProvider {
                         list.add(tableField);
                     }
                 } else {
+                    System.out.println(database);
                     if (database != null) {
                         if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest))) {
                             TableField tableField = getTableFiled(resultSet, datasourceRequest);
+                            System.out.println(new Gson().toJson(tableField));
                             list.add(tableField);
                         }
                     } else {