From 151bdec1fde503d8b2d8e781cec47c69ec0d93bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Tue, 5 Sep 2017 12:16:38 +0200
Subject: [PATCH] Use template string for overrideBinsQueryTpl

---
 lib/cartodb/models/dataview/histogram.js | 69 ++++++++++++------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js
index b00b1e1a..5eec9713 100644
--- a/lib/cartodb/models/dataview/histogram.js
+++ b/lib/cartodb/models/dataview/histogram.js
@@ -86,42 +86,43 @@ const overrideBasicsQueryTpl = ctx => `
     )
 `;
 
-var iqrQueryTpl = dot.template([
-    '__cdb_iqrange AS (',
-    '  SELECT max(quartile_max) - min(quartile_max) AS __cdb_iqr',
-    '  FROM (',
-    '    SELECT quartile, max(_cdb_iqr_column) AS quartile_max from (',
-    '      SELECT {{=it._column}} AS _cdb_iqr_column, ntile(4) over (order by {{=it._column}}',
-    '    ) AS quartile',
-    '    FROM __cdb_filtered_source) _cdb_quartiles',
-    '    WHERE quartile = 1 or quartile = 3',
-    '    GROUP BY quartile',
-    '  ) __cdb_iqr',
-    ')'
-].join('\n'));
+const iqrQueryTpl = ctx => `
+    __cdb_iqrange AS (
+        SELECT max(quartile_max) - min(quartile_max) AS __cdb_iqr
+        FROM (
+            SELECT quartile, max(_cdb_iqr_column) AS quartile_max from (
+                SELECT ${ctx._column} AS _cdb_iqr_column, ntile(4) over (order by ${ctx._column}
+            ) AS quartile
+            FROM __cdb_filtered_source) _cdb_quartiles
+            WHERE quartile = 1 or quartile = 3
+            GROUP BY quartile
+        ) __cdb_iqr
+    )
+`;
 
-var binsQueryTpl = dot.template([
-    '__cdb_bins AS (',
-    '  SELECT CASE WHEN __cdb_total_rows = 0 OR __cdb_iqr = 0',
-    '      THEN 1',
-    '      ELSE GREATEST(',
-    '        LEAST({{=it._minBins}}, CAST(__cdb_total_rows AS INT)),',
-    '        LEAST(',
-    '          CAST(((__cdb_max_val - __cdb_min_val) / (2 * __cdb_iqr * power(__cdb_total_rows, 1/3))) AS INT),',
-    '          {{=it._maxBins}}',
-    '        )',
-    '      )',
-    '    END AS __cdb_bins_number',
-    '  FROM __cdb_basics, __cdb_iqrange, __cdb_filtered_source',
-    '  LIMIT 1',
-    ')'
-].join('\n'));
+const binsQueryTpl = ctx => `
+    __cdb_bins AS (
+        SELECT
+            CASE WHEN __cdb_total_rows = 0 OR __cdb_iqr = 0
+            THEN 1
+            ELSE GREATEST(
+                LEAST(${ctx._minBins}, CAST(__cdb_total_rows AS INT)),
+                LEAST(
+                    CAST(((__cdb_max_val - __cdb_min_val) / (2 * __cdb_iqr * power(__cdb_total_rows, 1/3))) AS INT),
+                    ${ctx._maxBins}
+                )
+            )
+        END AS __cdb_bins_number
+        FROM __cdb_basics, __cdb_iqrange, __cdb_filtered_source
+        LIMIT 1
+    )
+`;
 
-var overrideBinsQueryTpl = dot.template([
-    '__cdb_bins AS (',
-    '  SELECT {{=it._bins}} AS __cdb_bins_number',
-    ')'
-].join('\n'));
+const overrideBinsQueryTpl = ctx => `
+    __cdb_bins AS (
+        SELECT ${ctx._bins} AS __cdb_bins_number
+    )
+`;
 
 var nullsQueryTpl = dot.template([
     '__cdb_nulls AS (',