From b2bbc329ea9a542925644f5e3a6b540ffb6e2fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Mon, 7 Aug 2017 19:03:49 +0200
Subject: [PATCH] Apply prefix for intermediate query variables to avoid name
 colision

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

diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js
index a044bfc7..6d399d39 100644
--- a/lib/cartodb/models/dataview/histogram.js
+++ b/lib/cartodb/models/dataview/histogram.js
@@ -176,14 +176,14 @@ var histogramQueryTpl = dot.template([
 var dateBasicsQueryTpl = dot.template([
     'basics AS (',
     '    SELECT',
-    '        max(date_part(\'epoch\', {{=it._column}})) AS max_val,',
-    '        min(date_part(\'epoch\', {{=it._column}})) AS min_val,',
-    '        avg(date_part(\'epoch\', {{=it._column}})) AS avg_val,',
+    '        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 start_date,',
-    '        max({{=it._column}}::timestamp AT TIME ZONE \'{{=it._offset}}\') AS end_date,',
-    '        count(1) AS total_rows',
+    '        )) 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',
     ')'
 ].join(' \n'));
@@ -191,19 +191,19 @@ var dateBasicsQueryTpl = dot.template([
 var dateOverrideBasicsQueryTpl = dot.template([
     'basics AS (',
     '    SELECT',
-    '        max({{=it._end}}) AS max_val,',
-    '        min({{=it._start}}) AS min_val,',
-    '        avg(date_part(\'epoch\', {{=it._column}})) AS avg_val,',
+    '        max({{=it._end}}) AS __cdb_max_val,',
+    '        min({{=it._start}}) AS __cdb_min_val,',
+    '        avg(date_part(\'epoch\', {{=it._column}})) AS __cdb_avg_val,',
     '        min(',
     '           date_trunc(',
     '               \'{{=it._aggregation}}\',',
     '               TO_TIMESTAMP({{=it._start}})::timestamp AT TIME ZONE \'{{=it._offset}}\'',
     '           )',
-    '        ) AS start_date,',
+    '        ) AS __cdb_start_date,',
     '        max(',
     '           TO_TIMESTAMP({{=it._end}})::timestamp AT TIME ZONE \'{{=it._offset}}\'',
-    '        ) AS end_date,',
-    '        count(1) AS total_rows',
+    '        ) AS __cdb_end_date,',
+    '        count(1) AS __cdb_total_rows',
     '    FROM ({{=it._query}}) _cdb_basics',
     ')'
 ].join(' \n'));
@@ -217,8 +217,8 @@ var dateBinsQueryTpl = dot.template([
     '       SELECT',
     '           ARRAY(',
     '               SELECT GENERATE_SERIES(',
-    '                   start_date::timestamptz,',
-    '                   end_date::timestamptz,',
+    '                   __cdb_start_date::timestamptz,',
+    '                   __cdb_end_date::timestamptz,',
     '                   {{?it._aggregation==="quarter"}}\'3 month\'{{??}}\'1 {{=it._aggregation}}\'{{?}}::interval',
     '                )',
     '           ) AS bins_array',
@@ -229,10 +229,10 @@ var dateBinsQueryTpl = dot.template([
 
 var dateHistogramQueryTpl = dot.template([
     'SELECT',
-    '    (max_val - min_val) / cast(bins_number as float) AS bin_width,',
+    '    (__cdb_max_val - __cdb_min_val) / cast(bins_number as float) AS bin_width,',
     '    bins_number,',
     '    nulls_count,',
-    '    CASE WHEN min_val = max_val',
+    '    CASE WHEN __cdb_min_val = __cdb_max_val',
     '      THEN 0',
     '      ELSE GREATEST(1, LEAST(',
     '        WIDTH_BUCKET(',
@@ -250,14 +250,14 @@ var dateHistogramQueryTpl = dot.template([
     '           ) AT TIME ZONE \'{{=it._offset}}\'',
     '       )',
     '    )::numeric AS timestamp,',
-    '    date_part(\'epoch\', start_date)::numeric AS timestamp_start,',
+    '    date_part(\'epoch\', __cdb_start_date)::numeric AS timestamp_start,',
     '    min(date_part(\'epoch\', {{=it._column}}))::numeric AS min,',
     '    max(date_part(\'epoch\', {{=it._column}}))::numeric AS max,',
     '    avg(date_part(\'epoch\', {{=it._column}}))::numeric AS avg,',
     '    count(*) AS freq',
     'FROM ({{=it._query}}) _cdb_histogram, basics, bins, nulls',
     'WHERE date_part(\'epoch\', {{=it._column}}) IS NOT NULL',
-    'GROUP BY bin, bins_number, bin_width, nulls_count, avg_val, start_date',
+    'GROUP BY bin, bins_number, bin_width, nulls_count, __cdb_avg_val, __cdb_start_date',
     'ORDER BY bin'
 ].join('\n'));