From 0b79ac76dbd3566604c945c376a8e397c547b56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 6 Sep 2017 10:39:17 +0200 Subject: [PATCH] Use template string for dateBasicsQueryTpl --- lib/cartodb/models/dataview/histogram.js | 30 +++++++++++++----------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js index 7a391ecb..2adcc944 100644 --- a/lib/cartodb/models/dataview/histogram.js +++ b/lib/cartodb/models/dataview/histogram.js @@ -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 (',