diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java index 5b29afd6c8..368736debd 100644 --- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java @@ -129,7 +129,7 @@ public class DorisQueryProvider extends QueryProvider { } STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE); - ST st_sql = stg.getInstanceOf("querySql"); + ST st_sql = stg.getInstanceOf("previewSql"); st_sql.add("isGroup", isGroup); if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java index 15ba601048..108d0a9fd0 100644 --- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java @@ -127,7 +127,7 @@ public class MysqlQueryProvider extends QueryProvider { } STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE); - ST st_sql = stg.getInstanceOf("querySql"); + ST st_sql = stg.getInstanceOf("previewSql"); st_sql.add("isGroup", isGroup); if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java index 87f09a021d..5b9204dee8 100644 --- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java @@ -101,7 +101,7 @@ public class OracleQueryProvider extends QueryProvider { List xFields = xFields(table, fields); STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE); - ST st_sql = stg.getInstanceOf("querySql"); + ST st_sql = stg.getInstanceOf("previewSql"); st_sql.add("isGroup", isGroup); if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); diff --git a/backend/src/main/resources/sql/sqlTemplate.stg b/backend/src/main/resources/sql/sqlTemplate.stg index 30965e3589..197e44359a 100644 --- a/backend/src/main/resources/sql/sqlTemplate.stg +++ b/backend/src/main/resources/sql/sqlTemplate.stg @@ -1,4 +1,34 @@ -querySql(groups, aggregators, filters, orders, table, isGroup) +querySql(groups, aggregators, filters, orders, table) +::=<< +SELECT + + * + + + AS }; separator=",\n"> + + , + + AS }; separator=",\n"> + +FROM + + +WHERE + }; separator="\nAND "> + + +GROUP BY + }; separator=",\n"> + + +ORDER BY + }; separator=",\n"> + +>> + + +previewSql(groups, aggregators, filters, orders, table, isGroup) ::=<< SELECT @@ -25,4 +55,4 @@ GROUP BY ORDER BY }; separator=",\n"> ->> \ No newline at end of file +>>