提交 c3092ca3 authored 作者: junjie's avatar junjie

feat(数据集):sql数据集最后支持加1个分号结束

上级 4535dd2a
...@@ -60,12 +60,12 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -60,12 +60,12 @@ public class MysqlQueryProvider extends QueryProvider {
@Override @Override
public String createQueryCountSQLAsTmp(String sql) { public String createQueryCountSQLAsTmp(String sql) {
return createQueryCountSQL(" (" + sql + ") AS tmp "); return createQueryCountSQL(" (" + sqlFix(sql) + ") AS tmp ");
} }
@Override @Override
public String createSQLPreview(String sql, String orderBy) { public String createSQLPreview(String sql, String orderBy) {
return "SELECT * FROM (" + sql + ") AS tmp ORDER BY " + orderBy + " LIMIT 0,1000"; return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp ORDER BY " + orderBy + " LIMIT 0,1000";
} }
@Override @Override
...@@ -94,7 +94,7 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -94,7 +94,7 @@ public class MysqlQueryProvider extends QueryProvider {
@Override @Override
public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields) { public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
return createQuerySQL(" (" + sql + ") AS tmp ", fields); return createQuerySQL(" (" + sqlFix(sql) + ") AS tmp ", fields);
} }
@Override @Override
...@@ -228,7 +228,7 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -228,7 +228,7 @@ public class MysqlQueryProvider extends QueryProvider {
@Override @Override
public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartExtFilterRequest> extFilterRequestList) { public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartExtFilterRequest> extFilterRequestList) {
return getSQL(" (" + sql + ") AS tmp ", xAxis, yAxis, extFilterRequestList); return getSQL(" (" + sqlFix(sql) + ") AS tmp ", xAxis, yAxis, extFilterRequestList);
} }
@Override @Override
...@@ -298,4 +298,11 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -298,4 +298,11 @@ public class MysqlQueryProvider extends QueryProvider {
} }
return filter.toString(); return filter.toString();
} }
private String sqlFix(String sql) {
if (sql.lastIndexOf(";") == (sql.length() - 1)) {
sql = sql.substring(0, sql.length() - 1);
}
return sql;
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论