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

Merge pull request #6934 from dataease/pr@dev@fixSql

Browse Source 
fix: SQL变量误报错 #6624
This commit is contained in:
taojinlong 2023-11-29 05:27:08 -06:00 committed by GitHub
commit 78ae088cca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/backend/src/main/java/io/dataease/controller/datasource/DriverMgmController.java
View File

@ -34,7 +34,6 @@ public class DriverMgmController {
@ApiOperation("驱动列表")
@PostMapping("/list")
public List<DriverDTO> listDeDriver() throws Exception{
checkPermission();
return driverService.list();
}

4
core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
View File

@ -344,8 +344,10 @@ public class EsQueryProvider extends QueryProvider {
} else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == DeTypeConstants.DE_TIME) {
originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
} else {
if (y.getDeType() == 2 || y.getDeType() == 3) {
if (y.getDeType() == 2) {
originField = String.format(EsSqlLConstants.CAST, String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()), "bigint");
} else if (y.getDeType() == 3) {
originField = String.format(EsSqlLConstants.CAST, String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()), "float");
} else {
originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
}

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

@ -1115,22 +1115,25 @@ public class DataSetTableService {
}
}
private void handleSelectItems(PlainSelect plainSelect, String dsType) throws Exception{
private void handleSelectItems(PlainSelect plainSelect, String dsType) throws Exception {
List<SelectItem> selectItems = new ArrayList<>();
for (SelectItem selectItem : plainSelect.getSelectItems()) {
SelectExpressionItem selectExpressionItem = (SelectExpressionItem) selectItem;
if (selectExpressionItem.getExpression() instanceof SubSelect) {
SubSelect subSelect = (SubSelect) selectExpressionItem.getExpression();
Select select = (Select) CCJSqlParserUtil.parse (removeVariables(subSelect.getSelectBody().toString(), dsType));
subSelect.setSelectBody(select.getSelectBody());
((SelectExpressionItem) selectItem).setExpression(subSelect);
try {
SelectExpressionItem selectExpressionItem = (SelectExpressionItem) selectItem;
if (selectExpressionItem.getExpression() instanceof SubSelect) {
SubSelect subSelect = (SubSelect) selectExpressionItem.getExpression();
Select select = (Select) CCJSqlParserUtil.parse(removeVariables(subSelect.getSelectBody().toString(), dsType));
subSelect.setSelectBody(select.getSelectBody());
((SelectExpressionItem) selectItem).setExpression(subSelect);
}
} catch (Exception e) {
}
selectItems.add(selectItem);
}
plainSelect.setSelectItems(selectItems);
}
private void handleFromItems(PlainSelect plainSelect, String dsType) throws Exception{
private void handleFromItems(PlainSelect plainSelect, String dsType) throws Exception {
FromItem fromItem = plainSelect.getFromItem();
if (fromItem instanceof SubSelect) {
SelectBody selectBody = ((SubSelect) fromItem).getSelectBody();
@ -1138,7 +1141,7 @@ public class DataSetTableService {
Select subSelectTmp = (Select) CCJSqlParserUtil.parse(removeVariables(selectBody.toString(), dsType));
subSelect.setSelectBody(subSelectTmp.getSelectBody());
if (dsType.equals(DatasourceTypes.oracle.getType())) {
if(fromItem.getAlias() != null){
if (fromItem.getAlias() != null) {
subSelect.setAlias(new Alias(fromItem.getAlias().toString(), false));
}
} else {
@ -1150,7 +1153,8 @@ public class DataSetTableService {
plainSelect.setFromItem(subSelect);
}
}
private void handleJoins(PlainSelect plainSelect, String dsType) throws Exception{
private void handleJoins(PlainSelect plainSelect, String dsType) throws Exception {
List<Join> joins = plainSelect.getJoins();
if (joins != null) {
List<Join> joinsList = new ArrayList<>();
@ -1177,28 +1181,29 @@ public class DataSetTableService {
plainSelect.setJoins(joinsList);
}
}
private String handleWhere(PlainSelect plainSelect, Select statementSelect, String dsType) throws Exception{
Expression expr = plainSelect.getWhere();
if (expr == null) {
return handleWith(plainSelect, statementSelect, dsType);
}
StringBuilder stringBuilder = new StringBuilder();
BinaryExpression binaryExpression = null;
try {
binaryExpression = (BinaryExpression) expr;
} catch (Exception e) {
}
if (binaryExpression != null) {
if (!(binaryExpression.getLeftExpression() instanceof BinaryExpression) && !(binaryExpression.getLeftExpression() instanceof InExpression) && hasVariable(binaryExpression.getRightExpression().toString())) {
stringBuilder.append(SubstitutedSql);
} else {
expr.accept(getExpressionDeParser(stringBuilder));
}
} else {
expr.accept(getExpressionDeParser(stringBuilder));
}
plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString()));
return handleWith(plainSelect, statementSelect, dsType);
private String handleWhere(PlainSelect plainSelect, Select statementSelect, String dsType) throws Exception {
Expression expr = plainSelect.getWhere();
if (expr == null) {
return handleWith(plainSelect, statementSelect, dsType);
}
StringBuilder stringBuilder = new StringBuilder();
BinaryExpression binaryExpression = null;
try {
binaryExpression = (BinaryExpression) expr;
} catch (Exception e) {
}
if (binaryExpression != null) {
if (!(binaryExpression.getLeftExpression() instanceof BinaryExpression) && !(binaryExpression.getLeftExpression() instanceof InExpression) && hasVariable(binaryExpression.getRightExpression().toString())) {
stringBuilder.append(SubstitutedSql);
} else {
expr.accept(getExpressionDeParser(stringBuilder));
}
} else {
expr.accept(getExpressionDeParser(stringBuilder));
}
plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString()));
return handleWith(plainSelect, statementSelect, dsType);
}
private String handleWith(PlainSelect plainSelect, Select select, String dsType) throws Exception {
@ -1227,7 +1232,6 @@ public class DataSetTableService {
}
public Map<String, Object> getDBPreview(DataSetTableRequest dataSetTableRequest) throws Exception {
Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
if (ds == null) {
@ -2783,13 +2787,13 @@ public class DataSetTableService {
if (StringUtils.isEmpty(s)) {
throw new RuntimeException(Translator.get("i18n_excel_empty_column"));
}
if(hashSet.contains(s)){
if (hashSet.contains(s)) {
repeat.add(s);
}else {
} else {
hashSet.add(s);
}
}
if(CollectionUtils.isNotEmpty(repeat)){
if (CollectionUtils.isNotEmpty(repeat)) {
DataEaseException.throwException(Translator.get("i18n_excel_field_repeat") + "" + String.valueOf(repeat));
}
}

3
core/frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -1159,8 +1159,6 @@ export default {
callback()
},
isNumber(rule, value, callback) {
console.log(value)
console.log(!value)
if (!value) {
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
return
@ -1168,7 +1166,6 @@ export default {
let isNumber = false
var reg = /^\d+$/;
isNumber = reg.test(value);
console.log(!isNumber)
if (!isNumber) {
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
return

2
core/frontend/src/views/system/datasource/DsFormContent.vue
View File

@ -946,7 +946,7 @@ export default {
this.tData.forEach((item) => {
if (item.id === this.form.type) {
item.children.forEach((child) => {
if (this.formType === 'modify' && child.id === this.form.id) {
if (child.id === this.form.id) {
return
}
const configuration = JSON.parse(child.configuration)