dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 【数据集】参数化提示异常，支持union

Browse Source
This commit is contained in:
taojinlong 2024-11-26 18:45:22 +08:00
parent 52a52dd581
commit 93f48678a3
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
View File

@ -157,10 +157,22 @@ public class SqlparserUtils {
for (Join join : joins) {
FromItem rightItem = join.getRightItem();
if (rightItem instanceof ParenthesedSelect) {
PlainSelect selectBody = ((ParenthesedSelect) rightItem).getPlainSelect();
Select subSelectTmp = (Select) CCJSqlParserUtil.parse(removeVariables(selectBody.toString(), dsType));
PlainSelect subPlainSelect = ((PlainSelect) subSelectTmp.getSelectBody());
((ParenthesedSelect) rightItem).setSelect(subPlainSelect);
try {
PlainSelect selectBody = ((ParenthesedSelect) rightItem).getPlainSelect();
Select subSelectTmp = (Select) CCJSqlParserUtil.parse(removeVariables(selectBody.toString(), dsType));
PlainSelect subPlainSelect = ((PlainSelect) subSelectTmp.getSelectBody());
((ParenthesedSelect) rightItem).setSelect(subPlainSelect);
}catch ( Exception e ){
SetOperationList select = ((ParenthesedSelect) rightItem).getSetOperationList();
SetOperationList setOperationList = new SetOperationList();
setOperationList.setSelects(new ArrayList<>());
setOperationList.setOperations(select.getOperations());
for (Select selectSelect : select.getSelects()) {
Select subSelectTmp = (Select) CCJSqlParserUtil.parse(removeVariables(selectSelect.toString(), dsType));
setOperationList.getSelects().add(subSelectTmp);
}
((ParenthesedSelect) rightItem).setSelect(setOperationList);
}
if (dsType.equals(DatasourceConfiguration.DatasourceType.oracle.getType())) {
rightItem.setAlias(new Alias(rightItem.getAlias().toString(), false));
} else {