cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use template string for dateBasicsQueryTpl

Browse Source
This commit is contained in:
Daniel García Aubert
2017-09-06 10:39:17 +02:00
parent 2739364193
commit 0b79ac76db
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/models/dataview/histogram.js
+16 -14
View File
@@ -193,20 +193,22 @@ const histogramQueryTpl = ctx => `
ORDER BY bin
`;
var dateBasicsQueryTpl = dot.template([
'__cdb_basics AS (',
' SELECT',
' max(date_part(\'epoch\', {{=it._column}})) AS __cdb_max_val,',
' min(date_part(\'epoch\', {{=it._column}})) AS __cdb_min_val,',
' avg(date_part(\'epoch\', {{=it._column}})) AS __cdb_avg_val,',
' min(date_trunc(',
' \'{{=it._aggregation}}\', {{=it._column}}::timestamp AT TIME ZONE \'{{=it._offset}}\'',
' )) AS __cdb_start_date,',
' max({{=it._column}}::timestamp AT TIME ZONE \'{{=it._offset}}\') AS __cdb_end_date,',
' count(1) AS __cdb_total_rows',
' FROM ({{=it._query}}) __cdb_basics_query',
')'
].join(' \n'));
const dateBasicsQueryTpl = ctx => `
__cdb_basics AS (
SELECT
max(date_part('epoch', ${ctx._column})) AS __cdb_max_val,
min(date_part('epoch', ${ctx._column})) AS __cdb_min_val,
avg(date_part('epoch', ${ctx._column})) AS __cdb_avg_val,
min(
date_trunc(
'${ctx._aggregation}', ${ctx._column}::timestamp AT TIME ZONE '${ctx._offset}'
)
) AS __cdb_start_date,
max(${ctx._column}::timestamp AT TIME ZONE '${ctx._offset}') AS __cdb_end_date,
count(1) AS __cdb_total_rows
FROM (${ctx._query}) __cdb_basics_query
)
`;
var dateOverrideBasicsQueryTpl = dot.template([
'__cdb_basics AS (',