diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js index 4af16d65..dce22bb0 100644 --- a/lib/cartodb/models/dataview/histogram.js +++ b/lib/cartodb/models/dataview/histogram.js @@ -109,7 +109,7 @@ var binsQueryTpl = dot.template([ ' {{=it._maxBins}}', ' )', ' )', - ' END AS bins_number', + ' END AS __cdb_bins_number', ' FROM basics, iqrange, filtered_source', ' LIMIT 1', ')' @@ -117,14 +117,14 @@ var binsQueryTpl = dot.template([ var overrideBinsQueryTpl = dot.template([ 'bins AS (', - ' SELECT {{=it._bins}} AS bins_number', + ' SELECT {{=it._bins}} AS __cdb_bins_number', ')' ].join('\n')); var nullsQueryTpl = dot.template([ 'nulls AS (', ' SELECT', - ' count(*) AS nulls_count', + ' count(*) AS __cdb_nulls_count', ' FROM ({{=it._query}}) _cdb_histogram_nulls', ' WHERE {{=it._column}} IS NULL', ')' @@ -153,22 +153,22 @@ var nansQueryTpl = dot.template([ var histogramQueryTpl = dot.template([ 'SELECT', - ' (max_val - min_val) / cast(bins_number as float) AS bin_width,', - ' bins_number,', - ' nulls_count,', + ' (max_val - 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}}infinities_count,', ' nans_count,{{?}}', ' avg_val,', ' CASE WHEN min_val = max_val', ' THEN 0', - ' ELSE GREATEST(1, LEAST(WIDTH_BUCKET({{=it._column}}, min_val, max_val, bins_number), bins_number)) - 1', + ' ELSE GREATEST(1, LEAST(WIDTH_BUCKET({{=it._column}}, min_val, max_val, __cdb_bins_number), __cdb_bins_number)) - 1', ' END AS bin,', ' min({{=it._column}})::numeric AS min,', ' max({{=it._column}})::numeric AS max,', ' avg({{=it._column}})::numeric AS avg,', ' count(*) AS freq', 'FROM filtered_source, basics, nulls, bins{{?it._isFloatColumn}}, infinities, nans{{?}}', - 'GROUP BY bin, bins_number, bin_width, nulls_count,', + 'GROUP BY bin, __cdb_bins_number, bin_width, __cdb_nulls_count,', ' avg_val{{?it._isFloatColumn}}, infinities_count, nans_count{{?}}', 'ORDER BY bin' ].join('\n')); @@ -212,7 +212,7 @@ var dateBinsQueryTpl = dot.template([ 'bins AS (', ' SELECT', ' bins_array,', - ' ARRAY_LENGTH(bins_array, 1) AS bins_number', + ' ARRAY_LENGTH(bins_array, 1) AS __cdb_bins_number', ' FROM (', ' SELECT', ' ARRAY(', @@ -229,9 +229,9 @@ var dateBinsQueryTpl = dot.template([ var dateHistogramQueryTpl = dot.template([ 'SELECT', - ' (__cdb_max_val - __cdb_min_val) / cast(bins_number as float) AS bin_width,', - ' bins_number,', - ' nulls_count,', + ' (__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,', ' CASE WHEN __cdb_min_val = __cdb_max_val', ' THEN 0', ' ELSE GREATEST(1, LEAST(', @@ -239,7 +239,7 @@ var dateHistogramQueryTpl = dot.template([ ' {{=it._column}}::timestamp AT TIME ZONE \'{{=it._offset}}\',', ' bins_array', ' ),', - ' bins_number', + ' __cdb_bins_number', ' )) - 1', ' END AS bin,', ' min(', @@ -257,7 +257,7 @@ var dateHistogramQueryTpl = dot.template([ ' 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, __cdb_avg_val, __cdb_start_date', + 'GROUP BY bin, __cdb_bins_number, bin_width, __cdb_nulls_count, __cdb_avg_val, __cdb_start_date', 'ORDER BY bin' ].join('\n'));