[Fix][DAS] Specify the catalog and schema when check table or column exists (#6646)

choucmei · web-flow · commit 900cf3a7e333 · 2021-11-02T13:33:25.000+08:00
* Specify the catalog and schema when check table and column exsits
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
@@ -60,7 +60,7 @@ public boolean isExistsTable(String tableName) {
         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 boolean isExistsColumn(String tableName,String columnName) {
         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
@@ -89,7 +89,7 @@ public boolean isExistsTable(String tableName) {
         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 boolean isExistsColumn(String tableName,String columnName) {
         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);
