提交 c76c04fe authored 作者: hs364342311's avatar hs364342311

Merge remote-tracking branch 'origin/master'

......@@ -28,16 +28,14 @@ import org.apache.commons.lang3.StringUtils;
import lombok.NonNull;
import java.sql.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkNotNull;
public class MysqlJdbcDataSourceChannel implements DataSourceChannelExt {
List<String> typeList = Arrays.asList("varchar", "char", "json");
@Override
public OptionRule getDataSourceOptions(@NonNull String pluginName) {
......@@ -60,7 +58,7 @@ public class MysqlJdbcDataSourceChannel implements DataSourceChannelExt {
ResultSet resultSet =
connection
.getMetaData()
.getTables(database, null, null, new String[] {"TABLE"})) {
.getTables(database, null, null, new String[]{"TABLE"})) {
while (resultSet.next()) {
String tableName = resultSet.getString("TABLE_NAME");
if (StringUtils.isNotBlank(tableName)) {
......@@ -114,6 +112,7 @@ public class MysqlJdbcDataSourceChannel implements DataSourceChannelExt {
try (Connection connection = getConnection(requestParams, database)) {
DatabaseMetaData metaData = connection.getMetaData();
String primaryKey = getPrimaryKey(metaData, database, table);
try (ResultSet resultSet = metaData.getColumns(database, null, table, null)) {
while (resultSet.next()) {
TableField tableField = new TableField();
......@@ -122,8 +121,16 @@ public class MysqlJdbcDataSourceChannel implements DataSourceChannelExt {
if (StringUtils.isNotBlank(primaryKey) && primaryKey.equals(columnName)) {
tableField.setPrimaryKey(true);
}
tableField.setName(columnName);
tableField.setType(resultSet.getString("TYPE_NAME"));
if (typeList.contains(tableField.getType().toLowerCase())) {
tableField.setLen(resultSet.getString("CHARACTER_MAXIMUM_LENGTH"));
} else {
tableField.setLen(resultSet.getString("NUMERIC_PRECISION"));
tableField.setScale(resultSet.getString("NUMERIC_SCALE"));
}
tableField.setName(columnName);
tableField.setComment(resultSet.getString("REMARKS"));
Object nullable = resultSet.getObject("IS_NULLABLE");
tableField.setNullable(Boolean.TRUE.toString().equals(nullable.toString()));
......@@ -187,11 +194,15 @@ public class MysqlJdbcDataSourceChannel implements DataSourceChannelExt {
String database,
Map<String, String> options) {
List<Map> tableNames = new ArrayList<>();
try (Connection connection = getConnection(requestParams);
ResultSet resultSet =
connection
.getMetaData()
.getTables(database, null, null, new String[] {"TABLE"})) {
try (Connection connection = getConnection(requestParams)) {
String sql =
"SELECT * FROM information_schema.tables WHERE table_schema='" + database + "'" ;
Statement statement = connection.createStatement();
ResultSet resultSet = statement.executeQuery(sql);
while (resultSet.next()) {
Map tables = new HashMap();
......
......@@ -28,15 +28,12 @@ import org.apache.commons.lang3.StringUtils;
import lombok.NonNull;
import java.sql.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import static com.google.common.base.Preconditions.checkNotNull;
public class OracleDataSourceChannel implements DataSourceChannelExt {
List<String> typeList = Arrays.asList("varchar","varchar2", "char", "json");
@Override
public OptionRule getDataSourceOptions(@NonNull String pluginName) {
return OracleDataSourceConfig.OPTION_RULE;
......@@ -112,7 +109,34 @@ public class OracleDataSourceChannel implements DataSourceChannelExt {
try (Connection connection = getConnection(requestParams, database)) {
DatabaseMetaData metaData = connection.getMetaData();
String primaryKey = getPrimaryKey(metaData, database, table);
try (ResultSet resultSet = metaData.getColumns(database, null, table, null)) {
String sql =
"SELECT\n" +
"\tt.TABLE_NAME,\n" +
"\tt.COLUMN_NAME,\n" +
"\tt.COMMENTS,\n" +
"\tt1.DATA_TYPE,\n" +
"\tt1.DATA_LENGTH VAR_LEN,\n" +
"\tt1.DATA_PRECISION LEN,\n" +
"\tDATA_SCALE ,\n" +
"\tCASE NULLABLE\n" +
"\tWHEN 'N' THEN\n" +
"\t\t'true'\n" +
"\tELSE\n" +
"\t\t'false'\n" +
"END IS_NULLABLE\n" +
"\n" +
"FROM\n" +
"\tall_col_comments t\n" +
"\tINNER JOIN all_tab_cols t1 ON t1.TABLE_NAME = t.table_name \n" +
"\tAND t1.COLUMN_NAME = t.column_name \n" +
"WHERE " +
"\tt.table_name = '"+table+"' and t.OWNER='"+database+"'";
Statement statement = connection.createStatement();
ResultSet resultSet = statement.executeQuery(sql);
while (resultSet.next()) {
TableField tableField = new TableField();
String columnName = resultSet.getString("COLUMN_NAME");
......@@ -120,6 +144,13 @@ public class OracleDataSourceChannel implements DataSourceChannelExt {
if (StringUtils.isNotBlank(primaryKey) && primaryKey.equals(columnName)) {
tableField.setPrimaryKey(true);
}
if (typeList.contains(tableField.getType().toLowerCase())) {
tableField.setLen(resultSet.getString("VAR_LEN"));
} else {
tableField.setLen(resultSet.getString("LEN"));
tableField.setScale(resultSet.getString("DATA_SCALE"));
}
tableField.setName(columnName);
tableField.setType(resultSet.getString("TYPE_NAME"));
tableField.setComment(resultSet.getString("REMARKS"));
......@@ -127,7 +158,7 @@ public class OracleDataSourceChannel implements DataSourceChannelExt {
tableField.setNullable(Boolean.TRUE.toString().equals(nullable.toString()));
tableFields.add(tableField);
}
}
} catch (ClassNotFoundException | SQLException e) {
throw new DataSourcePluginException("get table fields failed", e);
}
......
......@@ -28,15 +28,12 @@ import org.apache.commons.lang3.StringUtils;
import lombok.NonNull;
import java.sql.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import static com.google.common.base.Preconditions.checkNotNull;
public class PostgresqlDataSourceChannel implements DataSourceChannelExt {
List<String> typeList = Arrays.asList("varchar", "char", "json");
@Override
public OptionRule getDataSourceOptions(@NonNull String pluginName) {
return PostgresqlDataSourceConfig.OPTION_RULE;
......@@ -129,8 +126,16 @@ public class PostgresqlDataSourceChannel implements DataSourceChannelExt {
if (StringUtils.isNotBlank(primaryKey) && primaryKey.equals(columnName)) {
tableField.setPrimaryKey(true);
}
tableField.setName(columnName);
tableField.setType(resultSet.getString("TYPE_NAME"));
if (typeList.contains(tableField.getType().toLowerCase())) {
tableField.setLen(resultSet.getString("CHARACTER_MAXIMUM_LENGTH"));
} else {
tableField.setLen(resultSet.getString("NUMERIC_PRECISION"));
tableField.setScale(resultSet.getString("NUMERIC_SCALE"));
}
tableField.setName(columnName);
tableField.setComment(resultSet.getString("REMARKS"));
Object nullable = resultSet.getObject("IS_NULLABLE");
tableField.setNullable(Boolean.TRUE.toString().equals(nullable.toString()));
......@@ -188,11 +193,13 @@ public class PostgresqlDataSourceChannel implements DataSourceChannelExt {
String database,
Map<String, String> options) {
List<Map> tableNames = new ArrayList<>();
try (Connection connection = getConnection(requestParams);
ResultSet resultSet =
connection
.getMetaData()
.getTables(database, null, null, new String[] {"TABLE"})) {
try (Connection connection = getConnection(requestParams)) {
String sql =
"SELECT table_schema, table_name TABLE_NAME, table_comment TABLE_COMMENT FROM information_schema.tables";
Statement statement = connection.createStatement();
ResultSet resultSet = statement.executeQuery(sql);
while (resultSet.next()) {
Map tables = new HashMap();
......
......@@ -115,7 +115,34 @@ public class SqlServerDataSourceChannel implements DataSourceChannelExt {
try (Connection connection = getConnection(requestParams, null)) {
DatabaseMetaData metaData = connection.getMetaData();
String primaryKey = getPrimaryKey(metaData, database, table);
try (ResultSet resultSet = metaData.getColumns(database, null, table, null)) {
String sql =
"SELECT\n" +
"\tA.name AS TABLE_NAME,\n" +
"\tf.value AS TABLE_COMMENT,\n" +
"\tB.name AS COLUMN_NAME,\n" +
"\tB.max_length AS COLUMN_LENGTH,\n" +
"\tB.scale AS COLUMN_SCALE,\n" +
"\tC.value AS REMARKS,\n" +
"\tD.name AS TYPE_NAME,\n" +
"CASE\n" +
"\t\tA.type \n" +
"\t\tWHEN 'u' THEN\n" +
"\t\t'用户定义表' \n" +
"\tEND AS Type,\n" +
"\tB.is_nullable AS IS_NULLABLE \n" +
"FROM\n" +
"\tsys.tables AS A\n" +
"\tINNER JOIN sys.columns AS B ON B.object_id = A.object_id\n" +
"\tLEFT JOIN sys.extended_properties AS C ON C.major_id = B.object_id \n" +
"\tAND C.minor_id = B.column_id\n" +
"\tLEFT JOIN sys.types AS D ON D.system_type_id = B.system_type_id\n" +
"\tleft JOIN sys.extended_properties AS f ON A.object_id = f.major_id \n" +
"\tAND f.minor_id = 0 \n" +
"WHERE\n" +
"\tA.name = '"+table+"'";
Statement statement = connection.createStatement();
ResultSet resultSet = statement.executeQuery(sql);
while (resultSet.next()) {
TableField tableField = new TableField();
String columnName = resultSet.getString("COLUMN_NAME");
......@@ -123,6 +150,8 @@ public class SqlServerDataSourceChannel implements DataSourceChannelExt {
if (StringUtils.isNotBlank(primaryKey) && primaryKey.equals(columnName)) {
tableField.setPrimaryKey(true);
}
tableField.setLen(resultSet.getString("COLUMN_LENGTH"));
tableField.setScale(resultSet.getString("COLUMN_SCALE"));
tableField.setName(columnName);
tableField.setType(resultSet.getString("TYPE_NAME"));
tableField.setComment(resultSet.getString("REMARKS"));
......@@ -130,7 +159,7 @@ public class SqlServerDataSourceChannel implements DataSourceChannelExt {
tableField.setNullable(Boolean.TRUE.toString().equals(nullable.toString()));
tableFields.add(tableField);
}
}
} catch (ClassNotFoundException | SQLException e) {
throw new DataSourcePluginException("get table fields failed", e);
}
......
......@@ -28,17 +28,14 @@ import org.apache.commons.lang3.StringUtils;
import lombok.NonNull;
import java.sql.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkNotNull;
public class TidbJdbcDataSourceChannel implements DataSourceChannelExt {
List<String> typeList = Arrays.asList("varchar", "char", "json");
@Override
public OptionRule getDataSourceOptions(@NonNull String pluginName) {
return TidbDataSourceConfig.OPTION_RULE;
......@@ -122,8 +119,14 @@ public class TidbJdbcDataSourceChannel implements DataSourceChannelExt {
if (StringUtils.isNotBlank(primaryKey) && primaryKey.equals(columnName)) {
tableField.setPrimaryKey(true);
}
tableField.setName(columnName);
tableField.setType(resultSet.getString("TYPE_NAME"));
if (typeList.contains(tableField.getType().toLowerCase())) {
tableField.setLen(resultSet.getString("CHARACTER_MAXIMUM_LENGTH"));
} else {
tableField.setLen(resultSet.getString("NUMERIC_PRECISION"));
tableField.setScale(resultSet.getString("NUMERIC_SCALE"));
}
tableField.setName(columnName);
tableField.setComment(resultSet.getString("REMARKS"));
Object nullable = resultSet.getObject("IS_NULLABLE");
tableField.setNullable(Boolean.TRUE.toString().equals(nullable.toString()));
......
......@@ -41,4 +41,9 @@ public class TableField {
private Boolean unSupport;
private String outputDataType;
private String len;
private String scale;
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论