topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-13 13:07:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[improvement](chat) Fix the issue of having empty elements in addFieldsToSelect. (#545)

Browse Source
This commit is contained in:
lexluo09
2023-12-19 11:54:28 +08:00
committed by GitHub
parent 7a1cfbcef8
commit bb1001677d
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserAddHelper.java
View File

@@ -42,7 +42,7 @@ public class SqlParserAddHelper {
SelectBody selectBody = selectStatement.getSelectBody(); SelectBody selectBody = selectStatement.getSelectBody();
if (selectBody instanceof PlainSelect) { if (selectBody instanceof PlainSelect) {
PlainSelect plainSelect = (PlainSelect) selectBody; PlainSelect plainSelect = (PlainSelect) selectBody;
fields.stream().forEach(field -> { fields.stream().filter(Objects::nonNull).forEach(field -> {
SelectExpressionItem selectExpressionItem = new SelectExpressionItem(new Column(field)); SelectExpressionItem selectExpressionItem = new SelectExpressionItem(new Column(field));
plainSelect.addSelectItems(selectExpressionItem); plainSelect.addSelectItems(selectExpressionItem);
}); });
@@ -59,9 +59,6 @@ public class SqlParserAddHelper {
}); });
} }
} }
//for (String field : fields) {
// SelectUtils.addExpression(selectStatement, new Column(field));
//}
return selectStatement.toString(); return selectStatement.toString();
} }

10
common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserAddHelperTest.java
View File

@@ -387,4 +387,14 @@ class SqlParserAddHelperTest {
replaceSql); replaceSql);
} }
@Test
void addFieldsToSelect() {
String correctS2SQL = "SELECT 用户, 页面 FROM 超音数用户部门 GROUP BY 用户, 页面 ORDER BY count(*) DESC";
String replaceFields = SqlParserAddHelper.addFieldsToSelect(correctS2SQL,
SqlParserSelectHelper.getOrderByFields(correctS2SQL));
Assert.assertEquals(
"SELECT 用户, 页面 FROM 超音数用户部门 GROUP BY 用户, 页面 ORDER BY count(*) DESC", replaceFields);
}
} }