From 8012d76b68eafbd40d0aadb3a1b1ac79d3077fbb Mon Sep 17 00:00:00 2001
From: Raul Marin <git@rmr.ninja>
Date: Fri, 22 Dec 2017 15:58:40 +0100
Subject: [PATCH 1/2] Timeseries: Avoid collisions with columns named
 'timestamp'

---
 lib/cartodb/models/dataview/histograms/date-histogram.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cartodb/models/dataview/histograms/date-histogram.js b/lib/cartodb/models/dataview/histograms/date-histogram.js
index 8fd6ff30..4c720b3b 100644
--- a/lib/cartodb/models/dataview/histograms/date-histogram.js
+++ b/lib/cartodb/models/dataview/histograms/date-histogram.js
@@ -56,7 +56,7 @@ __wd_buckets AS
         ${ctx.query}
     ) __source, __wd_tz
     ${condition_str}
-    GROUP BY timestamp, __wd_tz.name
+    GROUP BY 1, __wd_tz.name
 ),`;
 }
 

From 031e1253ca11aa03282f612f2f2d9a4736d5b5ef Mon Sep 17 00:00:00 2001
From: Raul Marin <git@rmr.ninja>
Date: Fri, 22 Dec 2017 17:12:57 +0100
Subject: [PATCH 2/2] Numeric histograms: Avoid conflicts with 'bin' named
 columns

---
 lib/cartodb/models/dataview/histograms/numeric-histogram.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/cartodb/models/dataview/histograms/numeric-histogram.js b/lib/cartodb/models/dataview/histograms/numeric-histogram.js
index a2d5662d..d3eedad9 100644
--- a/lib/cartodb/models/dataview/histograms/numeric-histogram.js
+++ b/lib/cartodb/models/dataview/histograms/numeric-histogram.js
@@ -28,7 +28,7 @@ const binsQueryTpl = ctx => `
             ) AS quartile
             FROM __cdb_filtered_source) _cdb_quartiles
             WHERE quartile = 1 or quartile = 3
-            GROUP BY quartile
+            GROUP BY 1
         ) __cdb_iqr
     ),
     __cdb_bins AS (
@@ -137,8 +137,8 @@ FROM
 (
     ${ctx.query}
 ) __cdb_filtered_source_query${extra_tables}
-GROUP BY bin${extra_groupby}
-ORDER BY bin;`;
+GROUP BY 10${extra_groupby}
+ORDER BY 10;`;
     }
 
     _hasOverridenBins (override) {