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

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

Browse Source 
Pr@dev@fix sql
This commit is contained in:
fit2cloudrd 2024-01-25 18:17:49 +08:00 committed by GitHub
commit cf630c5677
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
View File

@ -73,6 +73,7 @@ public class SqlserverQueryProvider extends QueryProvider {
case "DATETIME":
case "DATETIME2":
case "DATETIMEOFFSET":
case "SMALLDATATIME":
return DeTypeConstants.DE_TIME;// 时间
case "INT":
case "MEDIUMINT":
@ -84,6 +85,7 @@ public class SqlserverQueryProvider extends QueryProvider {
case "DOUBLE":
case "DECIMAL":
case "MONEY":
case "REAL":
case "NUMERIC":
return DeTypeConstants.DE_FLOAT;// 浮点
case "BIT":

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

@ -2759,7 +2759,7 @@ public class DataSetTableService {
@Override
public void visit(InExpression inExpression) {
if (inExpression.getRightExpression() != null && hasVariable(inExpression.getRightExpression().toString()) && inExpression.getRightExpression() instanceof ParenthesedExpressionList) {
if (inExpression.getRightExpression() != null && hasVariable(inExpression.getRightExpression().toString()) && !(inExpression.getRightExpression() instanceof ParenthesedSelect)) {
stringBuilder.append(SubstitutedSql);
return;
}