2.0.0项目初始化

datax-common/datax-common-database/src/main/java/cn/datax/common/database/DbDialect.java

@@ -16,10 +16,11 @@ public interface DbDialect {
     /**
      * 获取指定表的所有列
      *
+     * @param dbName
      * @param tableName
      * @return
      */
-    String columns(String tableName);
+    String columns(String dbName, String tableName);
 
     /**
      * 获取数据库下的 所有表

datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/AbstractDbDialect.java

@@ -11,7 +11,7 @@ import cn.datax.common.database.DbDialect;
 public abstract class AbstractDbDialect implements DbDialect {
 
     @Override
-    public String columns(String tableName) {
+    public String columns(String dbName, String tableName) {
         return "show columns from `" + tableName + "`;";
     }
 

datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/OracleDialect.java

@@ -14,7 +14,7 @@ import java.sql.ResultSet;
 public class OracleDialect extends AbstractDbDialect {
 
     @Override
-    public String columns(String tableName) {
+    public String columns(String dbName, String tableName) {
         return "select * from user_tab_columns where table_name = '" + tableName + "' ";
     }
 

datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/PostgreDialect.java

@@ -14,7 +14,7 @@ import java.sql.ResultSet;
 public class PostgreDialect extends AbstractDbDialect {
 
     @Override
-    public String columns(String tableName) {
+    public String columns(String dbName, String tableName) {
         String sql = "SELECT a.attnum,\n" +
                 "a.attname AS field,\n" +
                 "t.typname AS type,\n" +

datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/SQLServer2008Dialect.java

@@ -15,7 +15,7 @@ import java.sql.ResultSet;
 public class SQLServer2008Dialect extends AbstractDbDialect {
 
     @Override
-    public String columns(String tableName) {
+    public String columns(String dbName, String tableName) {
         return "sp_columns " + tableName + ";";
     }
 

datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/UnknownDialect.java

@@ -13,7 +13,7 @@ import org.springframework.jdbc.core.RowMapper;
 public class UnknownDialect extends AbstractDbDialect {
 
     @Override
-    public String columns(String tableName) {
+    public String columns(String dbName, String tableName) {
         throw new DataQueryException("不支持的数据库类型");
     }
 

datax-common/datax-common-database/src/main/java/cn/datax/common/database/query/AbstractDbQuery.java

@@ -45,7 +45,7 @@ public abstract class AbstractDbQuery implements DbQuery {
 
     @Override
     public List<DbColumn> getTableColumns(String dbName, String tableName) {
-        String sql = dbDialect.columns(tableName);
+        String sql = dbDialect.columns(dbName, tableName);
         return jdbcTemplate.query(sql, dbDialect.rowMapper());
     }