From 7e159c565b61ffdb2bfdbe3e385b5d6daae8541d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 8 Aug 2017 10:03:40 +0200 Subject: [PATCH] Prefix iqr query calculation to avoid name collision --- lib/cartodb/models/dataview/histogram.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js index ec3e616e..9c63b836 100644 --- a/lib/cartodb/models/dataview/histogram.js +++ b/lib/cartodb/models/dataview/histogram.js @@ -85,8 +85,8 @@ var overrideBasicsQueryTpl = dot.template([ ].join('\n')); var iqrQueryTpl = dot.template([ - 'iqrange AS (', - ' SELECT max(quartile_max) - min(quartile_max) AS iqr', + '__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}}', @@ -100,17 +100,17 @@ var iqrQueryTpl = dot.template([ var binsQueryTpl = dot.template([ '__cdb_bins AS (', - ' SELECT CASE WHEN total_rows = 0 OR iqr = 0', + ' SELECT CASE WHEN total_rows = 0 OR __cdb_iqr = 0', ' THEN 1', ' ELSE GREATEST(', ' LEAST({{=it._minBins}}, CAST(total_rows AS INT)),', ' LEAST(', - ' CAST(((max_val - min_val) / (2 * iqr * power(total_rows, 1/3))) AS INT),', + ' CAST(((max_val - min_val) / (2 * __cdb_iqr * power(total_rows, 1/3))) AS INT),', ' {{=it._maxBins}}', ' )', ' )', ' END AS __cdb_bins_number', - ' FROM __cdb_basics, iqrange, __cdb_filtered_source', + ' FROM __cdb_basics, __cdb_iqrange, __cdb_filtered_source', ' LIMIT 1', ')' ].join('\n'));