From 256a3ab491d415092ab231cf54e262001ded9371 Mon Sep 17 00:00:00 2001
From: xiajunjie <752696511@qq.com>
Date: Wed, 28 Jul 2021 21:37:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BA=95=E5=B1=82sql=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/doris/DorisQueryProvider.java    |  2 +-
 .../provider/mysql/MysqlQueryProvider.java    |  2 +-
 .../provider/oracle/OracleQueryProvider.java  |  2 +-
 .../src/main/resources/sql/sqlTemplate.stg    | 34 +++++++++++++++++--
 4 files changed, 35 insertions(+), 5 deletions(-)

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 63a3dfb180..ec40f49712 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 e069706248..0dd9de2a3c 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 71556e43fe..8a10c62f23 100644
--- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
@@ -100,7 +100,7 @@ public class OracleQueryProvider extends QueryProvider {
         List<SQLObj> 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
+<if(!groups && !aggregators)>
+    *
+<endif>
+<if(groups)>
+    <groups:{group|<if(group)><group.fieldName> AS <group.fieldAlias><endif>}; separator=",\n">
+<endif>
+    <if(groups && aggregators)>,<endif>
+<if(aggregators)>
+    <aggregators:{agg|<if(agg)><agg.fieldName> AS <agg.fieldAlias><endif>}; separator=",\n">
+<endif>
+FROM
+    <table.tableName>   <table.tableAlias>
+<if(filters)>
+WHERE
+    <filters:{filter|<if(filter)><filter.whereField> <filter.whereTermAndValue><endif>}; separator="\nAND ">
+<endif>
+<if(groups)>
+GROUP BY
+    <groups:{group|<if(group)><group.fieldName><endif>}; separator=",\n">
+<endif>
+<if(orders)>
+ORDER BY
+    <orders:{order|<if(order)><order.orderAlias> <order.orderDirection><endif>}; separator=",\n">
+<endif>
+>>
+
+
+previewSql(groups, aggregators, filters, orders, table, isGroup)
 ::=<<
 SELECT
 <if(!groups && !aggregators)>
@@ -25,4 +55,4 @@ GROUP BY
 ORDER BY
     <orders:{order|<if(order)><order.orderAlias> <order.orderDirection><endif>}; separator=",\n">
 <endif>
->>
\ No newline at end of file
+>>