From 900cf3a7e33306952b24ac5ea003739863fc9996 Mon Sep 17 00:00:00 2001
From: chouc <32946731+choucmei@users.noreply.github.com>
Date: Tue, 2 Nov 2021 13:33:25 +0800
Subject: [PATCH] [Fix][DAS] Specify the catalog and schema when check table or
 column exists (#6646)

* Specify the catalog and schema when check table and column exsits
---
 .../apache/dolphinscheduler/dao/upgrade/MysqlUpgradeDao.java  | 4 ++--
 .../dolphinscheduler/dao/upgrade/PostgresqlUpgradeDao.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/MysqlUpgradeDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/MysqlUpgradeDao.java
index 255f1cf08..8d92b9070 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/MysqlUpgradeDao.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/MysqlUpgradeDao.java
@@ -60,7 +60,7 @@ public class MysqlUpgradeDao extends UpgradeDao {
         Connection conn = null;
         try {
             conn = dataSource.getConnection();
-            rs = conn.getMetaData().getTables(null, null, tableName, null);
+            rs = conn.getMetaData().getTables(conn.getCatalog(), conn.getSchema(), tableName, null);
             return rs.next();
         } catch (SQLException e) {
             logger.error(e.getMessage(),e);
@@ -82,7 +82,7 @@ public class MysqlUpgradeDao extends UpgradeDao {
         Connection conn = null;
         try {
             conn = dataSource.getConnection();
-            ResultSet rs = conn.getMetaData().getColumns(null,null,tableName,columnName);
+            ResultSet rs = conn.getMetaData().getColumns(conn.getCatalog(), conn.getSchema(),tableName,columnName);
             return rs.next();
 
         } catch (SQLException e) {
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/PostgresqlUpgradeDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/PostgresqlUpgradeDao.java
index b4049450a..2caf54b37 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/PostgresqlUpgradeDao.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/PostgresqlUpgradeDao.java
@@ -89,7 +89,7 @@ public class PostgresqlUpgradeDao extends UpgradeDao {
         try {
             conn = dataSource.getConnection();
 
-            rs = conn.getMetaData().getTables(null, SCHEMA, tableName, null);
+            rs = conn.getMetaData().getTables(conn.getCatalog(), SCHEMA, tableName, null);
 
             return rs.next();
         } catch (SQLException e) {
@@ -113,7 +113,7 @@ public class PostgresqlUpgradeDao extends UpgradeDao {
         ResultSet rs = null;
         try {
             conn = dataSource.getConnection();
-            rs = conn.getMetaData().getColumns(null, SCHEMA,tableName,columnName);
+            rs = conn.getMetaData().getColumns(conn.getCatalog(), SCHEMA,tableName,columnName);
             return rs.next();
         } catch (SQLException e) {
             logger.error(e.getMessage(),e);