From 3c061769c68582eb645a8e6184bbd3cedd13046e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 8 Aug 2017 10:11:35 +0200 Subject: [PATCH] Prefix basics columns to avoid name collision --- lib/cartodb/models/dataview/histogram.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js index 9c63b836..7d29d01d 100644 --- a/lib/cartodb/models/dataview/histogram.js +++ b/lib/cartodb/models/dataview/histogram.js @@ -69,8 +69,8 @@ var filteredQueryTpl = dot.template([ var basicsQueryTpl = dot.template([ '__cdb_basics AS (', ' SELECT', - ' max({{=it._column}}) AS max_val, min({{=it._column}}) AS min_val,', - ' avg({{=it._column}}) AS avg_val, count(1) AS total_rows', + ' max({{=it._column}}) AS __cdb_max_val, min({{=it._column}}) AS __cdb_min_val,', + ' avg({{=it._column}}) AS __cdb_avg_val, count(1) AS __cdb_total_rows', ' FROM __cdb_filtered_source', ')' ].join(' \n')); @@ -78,8 +78,8 @@ var basicsQueryTpl = dot.template([ var overrideBasicsQueryTpl = dot.template([ '__cdb_basics AS (', ' SELECT', - ' max({{=it._end}}) AS max_val, min({{=it._start}}) AS min_val,', - ' avg({{=it._column}}) AS avg_val, count(1) AS total_rows', + ' max({{=it._end}}) AS __cdb_max_val, min({{=it._start}}) AS __cdb_min_val,', + ' avg({{=it._column}}) AS __cdb_avg_val, count(1) AS __cdb_total_rows', ' FROM __cdb_filtered_source', ')' ].join('\n')); @@ -100,12 +100,12 @@ var iqrQueryTpl = dot.template([ var binsQueryTpl = dot.template([ '__cdb_bins AS (', - ' SELECT CASE WHEN total_rows = 0 OR __cdb_iqr = 0', + ' SELECT CASE WHEN __cdb_total_rows = 0 OR __cdb_iqr = 0', ' THEN 1', ' ELSE GREATEST(', - ' LEAST({{=it._minBins}}, CAST(total_rows AS INT)),', + ' LEAST({{=it._minBins}}, CAST(__cdb_total_rows AS INT)),', ' LEAST(', - ' CAST(((max_val - min_val) / (2 * __cdb_iqr * power(total_rows, 1/3))) AS INT),', + ' CAST(((__cdb_max_val - __cdb_min_val) / (2 * __cdb_iqr * power(__cdb_total_rows, 1/3))) AS INT),', ' {{=it._maxBins}}', ' )', ' )', @@ -153,18 +153,18 @@ var nansQueryTpl = dot.template([ var histogramQueryTpl = dot.template([ 'SELECT', - ' (max_val - min_val) / cast(__cdb_bins_number as float) AS bin_width,', + ' (__cdb_max_val - __cdb_min_val) / cast(__cdb_bins_number as float) AS bin_width,', ' __cdb_bins_number AS bins_number,', ' __cdb_nulls_count AS nulls_count,', ' {{?it._isFloatColumn}}__cdb_infinities_count AS infinities_count,', ' __cdb_nans_count AS nans_count,{{?}}', - ' avg_val,', - ' CASE WHEN min_val = max_val', + ' __cdb_avg_val AS avg_val,', + ' CASE WHEN __cdb_min_val = __cdb_max_val', ' THEN 0', ' ELSE GREATEST(', ' 1,', ' LEAST(', - ' WIDTH_BUCKET({{=it._column}}, min_val, max_val, __cdb_bins_number),', + ' WIDTH_BUCKET({{=it._column}}, __cdb_min_val, __cdb_max_val, __cdb_bins_number),', ' __cdb_bins_number', ' )', ' ) - 1',