Skip to content

fix: 修复采集数据源时，表字段有sql保留字冲突的名称报错问题 #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wangjie-zzz wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: 修复采集数据源时，表字段有sql保留字冲突的名称报错问题 #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53c6f7f
初始化数据源时，数据字段名和sql保留字冲突时，初始化异常
wangjie-zzz Jun 4, 2026
617bd9c
初始化数据源时，数据字段名和sql保留字冲突时，初始化异常
wangjie-zzz Jun 4, 2026
abe862d
初始化数据源时，数据字段名和sql保留字冲突时，初始化异常
wangjie-zzz Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...-management/src/main/java/com/alibaba/cloud/ai/dataagent/enums/BizDataSourceTypeEnum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ public static boolean isOracleDialect(String typeName) {
return isDialect(typeName, DatabaseDialectEnum.ORACLE.getCode());
}

public static boolean isHiveDialect(String typeName) {
return isDialect(typeName, DatabaseDialectEnum.HIVE.getCode());
}

public static boolean isAdbPg(String typeName) {
BizDataSourceTypeEnum te = fromTypeName(typeName);
if (te == null) {
Expand Down
2 changes: 1 addition & 1 deletion ...ent/src/main/java/com/alibaba/cloud/ai/dataagent/service/schema/TableMetadataService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ private Map<String, List<String>> fetchTableSampleData(DbConfigBO dbConfig, Acce

try {
// 构建批量查询SQL，一次查询多个列的样本数据
String columnNames = columns.stream().map(ColumnInfoBO::getName).collect(Collectors.joining(", "));
String columnNames = SqlUtil.buildColumnsSql(dbConfig.getDialectType(), columns);
String sql = SqlUtil.buildSelectSql(dbConfig.getDialectType(), tableName, columnNames, 5);

DbQueryParameter batchParam = new DbQueryParameter();
Expand Down
21 changes: 21 additions & 0 deletions data-agent-management/src/main/java/com/alibaba/cloud/ai/dataagent/util/SqlUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@
*/
package com.alibaba.cloud.ai.dataagent.util;

import com.alibaba.cloud.ai.dataagent.bo.schema.ColumnInfoBO;
import com.alibaba.cloud.ai.dataagent.enums.BizDataSourceTypeEnum;
import lombok.experimental.UtilityClass;
import org.apache.commons.collections.CollectionUtils;

import java.util.List;
import java.util.stream.Collectors;

/**
* SQL 工具类
Expand All @@ -27,6 +32,22 @@
@UtilityClass
public class SqlUtil {

/**
* 构建Columns SQL块
* @param typeName 数据源类型
* @param columnInfoBOs 列名
* @return Columns SQL块
Comment thread
wangjie-zzz marked this conversation as resolved.
*/
public static String buildColumnsSql(String typeName, List<ColumnInfoBO> columnInfoBOs) {
if (CollectionUtils.isEmpty(columnInfoBOs)) {
return "*";
}
if (BizDataSourceTypeEnum.isMysqlDialect(typeName) || BizDataSourceTypeEnum.isHiveDialect(typeName)) {
// mysql/hive使用``标识对象
return columnInfoBOs.stream().map(ColumnInfoBO::getName).map(name -> String.format("`%s`", name)).collect(Collectors.joining(", "));
}
return columnInfoBOs.stream().map(ColumnInfoBO::getName).map(name -> String.format("\"%s\"", name)).collect(Collectors.joining(", "));
}
Comment thread
wangjie-zzz marked this conversation as resolved.
/**
* 构建SELECT SQL语句
* @param typeName 数据源类型
Expand Down
10 changes: 10 additions & 0 deletions ...agement/src/test/java/com/alibaba/cloud/ai/dataagent/enums/BizDataSourceTypeEnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,16 @@ void isOracleDialect_falseForOthers() {
assertFalse(BizDataSourceTypeEnum.isOracleDialect("mysql"));
}

@Test
void isHiveDialect_trueForHive() {
assertTrue(BizDataSourceTypeEnum.isHiveDialect("hive"));
}

@Test
void isHiveDialect_falseForOthers() {
assertFalse(BizDataSourceTypeEnum.isHiveDialect("mysql"));
}

@Test
void isAdbPg_trueForAdgPg() {
assertTrue(BizDataSourceTypeEnum.isAdbPg("adg_pg"));
Expand Down
81 changes: 81 additions & 0 deletions data-agent-management/src/test/java/com/alibaba/cloud/ai/dataagent/util/SqlUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@
*/
package com.alibaba.cloud.ai.dataagent.util;

import com.alibaba.cloud.ai.dataagent.bo.schema.ColumnInfoBO;
import org.junit.jupiter.api.Test;

import java.util.Arrays;
import java.util.List;

import static org.junit.jupiter.api.Assertions.*;

class SqlUtilTest {
Expand Down Expand Up @@ -73,4 +77,81 @@ void buildSelectSql_emptyTableName_throwsException() {
assertThrows(IllegalArgumentException.class, () -> SqlUtil.buildSelectSql("mysql", "", "*", 10));
}

@Test
void buildColumnsSql_mysql_appendsLimit() {
List<ColumnInfoBO> columnInfoBOS = Arrays.asList(
new ColumnInfoBO("id", "users", "id", "int", true, true, null),
new ColumnInfoBO("name", "users", "name", "varchar", false, false, null),
new ColumnInfoBO("desc", "users", "desc", "varchar", false, false, null)
);
String sql = SqlUtil.buildColumnsSql("mysql", columnInfoBOS);
assertEquals("`id`, `name`, `desc`", sql);
}
@Test
void buildColumnsSql_hive_appendsLimit() {
List<ColumnInfoBO> columnInfoBOS = Arrays.asList(
new ColumnInfoBO("id", "users", "id", "int", true, true, null),
new ColumnInfoBO("name", "users", "name", "varchar", false, false, null),
new ColumnInfoBO("desc", "users", "desc", "varchar", false, false, null)
);
String sql = SqlUtil.buildColumnsSql("hive", columnInfoBOS);
assertEquals("`id`, `name`, `desc`", sql);
}

@Test
void buildColumnsSql_postgresql_appendsLimit() {
List<ColumnInfoBO> columnInfoBOS = Arrays.asList(
new ColumnInfoBO("id", "users", "id", "int", true, true, null),
new ColumnInfoBO("name", "users", "name", "varchar", false, false, null),
new ColumnInfoBO("desc", "users", "desc", "varchar", false, false, null)
);
String sql = SqlUtil.buildColumnsSql("postgresql", columnInfoBOS);
assertEquals("\"id\", \"name\", \"desc\"", sql);
}

@Test
void buildColumnsSql_h2_appendsLimit() {
List<ColumnInfoBO> columnInfoBOS = Arrays.asList(
new ColumnInfoBO("id", "users", "id", "int", true, true, null),
new ColumnInfoBO("name", "users", "name", "varchar", false, false, null),
new ColumnInfoBO("desc", "users", "desc", "varchar", false, false, null)
);
String sql = SqlUtil.buildColumnsSql("h2", columnInfoBOS);
assertEquals("\"id\", \"name\", \"desc\"", sql);
}

@Test
void buildColumnsSql_sqlserver_prependsTop() {
List<ColumnInfoBO> columnInfoBOS = Arrays.asList(
new ColumnInfoBO("id", "users", "id", "int", true, true, null),
new ColumnInfoBO("name", "users", "name", "varchar", false, false, null),
new ColumnInfoBO("desc", "users", "desc", "varchar", false, false, null)
);
String sql = SqlUtil.buildColumnsSql("sqlserver", columnInfoBOS);
assertEquals("\"id\", \"name\", \"desc\"", sql);
}

@Test
void buildColumnsSql_oracle_appendsFetchFirst() {
List<ColumnInfoBO> columnInfoBOS = Arrays.asList(
new ColumnInfoBO("id", "users", "id", "int", true, true, null),
new ColumnInfoBO("name", "users", "name", "varchar", false, false, null),
new ColumnInfoBO("desc", "users", "desc", "varchar", false, false, null)
);
String sql = SqlUtil.buildColumnsSql("oracle", columnInfoBOS);
assertEquals("\"id\", \"name\", \"desc\"", sql);
}

@Test
void buildColumnsSql_nullColumnNames_defaultsToStar() {
String sql = SqlUtil.buildColumnsSql("mysql", null);
assertEquals("*", sql);
}

@Test
void buildColumnsSql_emptyColumnNames_defaultsToStar() {
String sql = SqlUtil.buildColumnsSql("mysql", Arrays.asList());
assertEquals("*", sql);
}

}
Loading