center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix(数据集): sql 数据集变量

Browse Source
This commit is contained in:
taojinlong 2022-08-31 16:53:16 +08:00
parent 549ee2a4ad
commit 05e96c94e2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -1032,7 +1032,7 @@ public class DataSetTableService {
} }
Expression expr = plainSelect.getWhere(); Expression expr = plainSelect.getWhere();
if (expr == null) { if (expr == null) {
return plainSelect.toString(); return handleWith(plainSelect, select);
} }
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
BinaryExpression binaryExpression = null; BinaryExpression binaryExpression = null;
@ -1046,7 +1046,10 @@ public class DataSetTableService {
expr.accept(getExpressionDeParser(stringBuilder)); expr.accept(getExpressionDeParser(stringBuilder));
} }
plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString())); plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString()));
return handleWith(plainSelect, select);
}
private String handleWith(PlainSelect plainSelect, Select select)throws Exception{
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (CollectionUtils.isNotEmpty(select.getWithItemsList())) { if (CollectionUtils.isNotEmpty(select.getWithItemsList())) {
builder.append("WITH"); builder.append("WITH");
@ -1063,7 +1066,6 @@ public class DataSetTableService {
builder.append(" " + plainSelect); builder.append(" " + plainSelect);
return builder.toString(); return builder.toString();
} }
public Map<String, Object> getSQLPreview(DataSetTableRequest dataSetTableRequest) throws Exception { public Map<String, Object> getSQLPreview(DataSetTableRequest dataSetTableRequest) throws Exception {
Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId()); Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
if (ds == null) { if (ds == null) {