public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-20 19:48:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: mongo sql 拼接问题

Browse Source
This commit is contained in:
taojinlong
2021-12-31 16:34:21 +08:00
parent 0e52dd0d73
commit 927bdbdebf
4 changed files with 79 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
backend/src/main/resources/sql/sqlTemplate.stg
View File

@@ -1,4 +1,4 @@
querySql(limitFiled, groups, aggregators, filters, orders, table)
querySql(limitFiled, groups, aggregators, filters, orders, table, notUseAs)
::=<<
SELECT
<if(limitFiled)>
@@ -7,11 +7,17 @@ SELECT
<if(!groups && !aggregators)>
*
<endif>
<if(groups)>
<if(groups && notUseAs)>
<groups:{group|<if(group)><group.fieldName> <endif>}; separator=",\n">
<endif>
<if(groups && !notUseAs)>
<groups:{group|<if(group)><group.fieldName> AS <group.fieldAlias><endif>}; separator=",\n">
<endif>
<if(groups && aggregators)>,<endif>
<if(aggregators)>
<if(aggregators && notUseAs)>
<aggregators:{agg|<if(agg)><agg.fieldName> <endif>}; separator=",\n">
<endif>
<if(aggregators && !notUseAs)>
<aggregators:{agg|<if(agg)><agg.fieldName> AS <agg.fieldAlias><endif>}; separator=",\n">
<endif>
FROM
@@ -31,7 +37,7 @@ ORDER BY
>>
previewSql(limitFiled, groups, aggregators, filters, orders, table, isGroup)
previewSql(limitFiled, groups, aggregators, filters, orders, table, isGroup, notUseAs)
::=<<
SELECT
<if(limitFiled)>
@@ -40,11 +46,17 @@ SELECT
<if(!groups && !aggregators)>
*
<endif>
<if(groups)>
<if(groups && notUseAs)>
<groups:{group|<if(group)><group.fieldName> <endif>}; separator=",\n">
<endif>
<if(groups && !notUseAs)>
<groups:{group|<if(group)><group.fieldName> AS <group.fieldAlias><endif>}; separator=",\n">
<endif>
<if(groups && aggregators)>,<endif>
<if(aggregators)>
<if(aggregators && notUseAs)>
<aggregators:{agg|<if(agg)><agg.fieldName> <endif>}; separator=",\n">
<endif>
<if(aggregators && !notUseAs)>
<aggregators:{agg|<if(agg)><agg.fieldName> AS <agg.fieldAlias><endif>}; separator=",\n">
<endif>
FROM