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

(improvement)(Headless) fixed get group error (#1107)

Browse Source
This commit is contained in:
jipeli
2024-06-06 17:00:34 +08:00
committed by GitHub
parent 529c8dc79b
commit 96e94b3096
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectHelper.java
View File

@@ -38,6 +38,7 @@ import net.sf.jsqlparser.statement.select.Distinct;
import net.sf.jsqlparser.statement.select.GroupByElement; import net.sf.jsqlparser.statement.select.GroupByElement;
import net.sf.jsqlparser.statement.select.Join; import net.sf.jsqlparser.statement.select.Join;
import net.sf.jsqlparser.statement.select.LateralView; import net.sf.jsqlparser.statement.select.LateralView;
import net.sf.jsqlparser.statement.select.Limit;
import net.sf.jsqlparser.statement.select.OrderByElement; import net.sf.jsqlparser.statement.select.OrderByElement;
import net.sf.jsqlparser.statement.select.ParenthesedSelect; import net.sf.jsqlparser.statement.select.ParenthesedSelect;
import net.sf.jsqlparser.statement.select.PlainSelect; import net.sf.jsqlparser.statement.select.PlainSelect;
@@ -46,7 +47,6 @@ import net.sf.jsqlparser.statement.select.SelectItem;
import net.sf.jsqlparser.statement.select.SelectVisitorAdapter; import net.sf.jsqlparser.statement.select.SelectVisitorAdapter;
import net.sf.jsqlparser.statement.select.SetOperationList; import net.sf.jsqlparser.statement.select.SetOperationList;
import net.sf.jsqlparser.statement.select.WithItem; import net.sf.jsqlparser.statement.select.WithItem;
import net.sf.jsqlparser.statement.select.Limit;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
@@ -139,12 +139,21 @@ public class SqlSelectHelper {
return plainSelectList; return plainSelectList;
} }
public static void getSubPlainSelect(PlainSelect plainSelect, List<PlainSelect> plainSelectList) { public static void getSubPlainSelect(Select select, List<PlainSelect> plainSelectList) {
plainSelectList.add(plainSelect); if (select instanceof PlainSelect) {
if (plainSelect.getFromItem() instanceof ParenthesedSelect) { PlainSelect plainSelect = (PlainSelect) select;
ParenthesedSelect parenthesedSelect = (ParenthesedSelect) plainSelect.getFromItem(); plainSelectList.add(plainSelect);
PlainSelect subPlainSelect = parenthesedSelect.getPlainSelect(); if (plainSelect.getFromItem() instanceof ParenthesedSelect) {
getSubPlainSelect(subPlainSelect, plainSelectList); ParenthesedSelect parenthesedSelect = (ParenthesedSelect) plainSelect.getFromItem();
Select subSelect = parenthesedSelect.getSelect();
getSubPlainSelect(subSelect, plainSelectList);
}
}
if (select instanceof SetOperationList) {
SetOperationList setOperationList = (SetOperationList) select;
for (Select subSelect : setOperationList.getSelects()) {
getSubPlainSelect(subSelect, plainSelectList);
}
} }
} }