public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 05:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: sql变量支持写在 join on 条件

Browse Source
This commit is contained in:
taojinlong
2025-01-13 17:39:41 +08:00
committed by taojinlong
parent 41ba9d6ab3
commit 6ba6471173
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,6 +280,28 @@ public class SqlparserUtils {
List<Join> joinsList = new ArrayList<>();
for (Join join : joins) {
FromItem rightItem = join.getRightItem();
Collection<Expression> exprs = join.getOnExpressions();
Collection<Expression> exprs2 = new ArrayList<>();
for (Expression expr : exprs) {
StringBuilder stringBuilder = new StringBuilder();
BinaryExpression binaryExpression = null;
try {
binaryExpression = (BinaryExpression) expr;
} catch (Exception e) {
}
if (binaryExpression != null) {
boolean hasSubBinaryExpression = binaryExpression instanceof AndExpression || binaryExpression instanceof OrExpression;
if (!hasSubBinaryExpression && !(binaryExpression.getLeftExpression() instanceof BinaryExpression) && !(binaryExpression.getLeftExpression() instanceof InExpression) && (hasVariable(binaryExpression.getLeftExpression().toString()) || hasVariable(binaryExpression.getRightExpression().toString()))) {
stringBuilder.append(handleSubstitutedSql(binaryExpression.toString()));
} else {
expr.accept(getExpressionDeParser(stringBuilder));
}
} else {
expr.accept(getExpressionDeParser(stringBuilder));
}
exprs2.add(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString())) ;
}
join.setOnExpressions(exprs2);
if (rightItem instanceof ParenthesedSelect) {
try {
PlainSelect selectBody = ((ParenthesedSelect) rightItem).getPlainSelect();