From 5ce419d86392ec9f4cdb736d18cea6c8ac90437c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Mon, 4 Sep 2017 18:42:30 +0200
Subject: [PATCH] Use template string for dateIntervalQueryTpl

---
 lib/cartodb/models/dataview/histogram.js | 78 ++++++++++++------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js
index c27c696f..1a526637 100644
--- a/lib/cartodb/models/dataview/histogram.js
+++ b/lib/cartodb/models/dataview/histogram.js
@@ -7,45 +7,45 @@ dot.templateSettings.strip = false;
 
 var columnCastTpl = dot.template("date_part('epoch', {{=it.column}})");
 
-var dateIntervalQueryTpl = dot.template([
-    'WITH',
-    '__cdb_dates AS (',
-    '    SELECT',
-    '        MAX({{=it.column}}::timestamp) AS __cdb_end,',
-    '        MIN({{=it.column}}::timestamp) AS __cdb_start',
-    '    FROM ({{=it.query}}) __cdb_source',
-    '),',
-    '__cdb_interval_in_days AS (',
-    '    SELECT' ,
-    '        DATE_PART(\'day\', __cdb_end - __cdb_start) AS __cdb_days',
-    '    FROM __cdb_dates',
-    '),',
-    '__cdb_interval_in_hours AS (',
-    '    SELECT',
-    '        __cdb_days * 24 + DATE_PART(\'hour\', __cdb_end - __cdb_start) AS __cdb_hours',
-    '    FROM __cdb_interval_in_days, __cdb_dates',
-    '),',
-    '__cdb_interval_in_minutes AS (',
-    '    SELECT',
-    '        __cdb_hours * 60 + DATE_PART(\'minute\', __cdb_end - __cdb_start) AS __cdb_minutes',
-    '    FROM __cdb_interval_in_hours, __cdb_dates',
-    '),',
-    '__cdb_interval_in_seconds AS (',
-    '    SELECT',
-    '        __cdb_minutes * 60 + DATE_PART(\'second\', __cdb_end - __cdb_start) AS __cdb_seconds',
-    '    FROM __cdb_interval_in_minutes, __cdb_dates',
-    ')',
-    'SELECT',
-    '    ROUND(__cdb_days / 365) AS year,',
-    '    ROUND(__cdb_days / 90) AS quarter,',
-    '    ROUND(__cdb_days / 30) AS month,',
-    '    ROUND(__cdb_days / 7) AS week,',
-    '    __cdb_days AS day,',
-    '    __cdb_hours AS hour,',
-    '    __cdb_minutes AS minute,',
-    '    __cdb_seconds AS second',
-    'FROM __cdb_interval_in_days, __cdb_interval_in_hours, __cdb_interval_in_minutes, __cdb_interval_in_seconds'
-].join('\n'));
+const dateIntervalQueryTpl = ctx => `
+    WITH
+    __cdb_dates AS (
+        SELECT
+            MAX(${ctx.column}::timestamp) AS __cdb_end
+            MIN(${ctx.column}::timestamp) AS __cdb_start
+        FROM (${ctx.query}) __cdb_source
+    ),
+    __cdb_interval_in_days AS (
+        SELECT
+            DATE_PART(\day\ __cdb_end - __cdb_start) AS __cdb_days
+        FROM __cdb_dates
+    ),
+    __cdb_interval_in_hours AS (
+        SELECT
+            __cdb_days * 24 + DATE_PART(\hour\ __cdb_end - __cdb_start) AS __cdb_hours
+        FROM __cdb_interval_in_days __cdb_dates
+    ),
+    __cdb_interval_in_minutes AS (
+        SELECT
+            __cdb_hours * 60 + DATE_PART(\minute\ __cdb_end - __cdb_start) AS __cdb_minutes
+        FROM __cdb_interval_in_hours __cdb_dates
+    ),
+    __cdb_interval_in_seconds AS (
+        SELECT
+            __cdb_minutes * 60 + DATE_PART(\second\ __cdb_end - __cdb_start) AS __cdb_seconds
+        FROM __cdb_interval_in_minutes __cdb_dates
+    ),
+    SELECT
+        ROUND(__cdb_days / 365) AS year
+        ROUND(__cdb_days / 90) AS quarter
+        ROUND(__cdb_days / 30) AS month
+        ROUND(__cdb_days / 7) AS week
+        __cdb_days AS day
+        __cdb_hours AS hour
+        __cdb_minutes AS minute
+        __cdb_seconds AS second
+    FROM __cdb_interval_in_days __cdb_interval_in_hours __cdb_interval_in_minutes __cdb_interval_in_seconds
+`;
 
 var MAX_INTERVAL_VALUE = 366;
 var BIN_MIN_NUMBER = 6;