Prefix bins query to avoid name collision

This commit is contained in:
Daniel García Aubert
2017-08-08 09:12:52 +02:00
parent 0f8de9e74b
commit f3ababffc1
+5 -5
View File
@@ -99,7 +99,7 @@ var iqrQueryTpl = dot.template([
].join('\n'));
var binsQueryTpl = dot.template([
'bins AS (',
'__cdb_bins AS (',
' SELECT CASE WHEN total_rows = 0 OR iqr = 0',
' THEN 1',
' ELSE GREATEST(',
@@ -116,7 +116,7 @@ var binsQueryTpl = dot.template([
].join('\n'));
var overrideBinsQueryTpl = dot.template([
'bins AS (',
'__cdb_bins AS (',
' SELECT {{=it._bins}} AS __cdb_bins_number',
')'
].join('\n'));
@@ -173,7 +173,7 @@ var histogramQueryTpl = dot.template([
' max({{=it._column}})::numeric AS max,',
' avg({{=it._column}})::numeric AS avg,',
' count(*) AS freq',
'FROM filtered_source, __cdb_basics, nulls, bins{{?it._isFloatColumn}}, infinities, nans{{?}}',
'FROM filtered_source, __cdb_basics, nulls, __cdb_bins{{?it._isFloatColumn}}, infinities, nans{{?}}',
'GROUP BY bin, __cdb_bins_number, bin_width, __cdb_nulls_count,',
' avg_val{{?it._isFloatColumn}}, infinities_count, nans_count{{?}}',
'ORDER BY bin'
@@ -215,7 +215,7 @@ var dateOverrideBasicsQueryTpl = dot.template([
].join(' \n'));
var dateBinsQueryTpl = dot.template([
'bins AS (',
'__cdb_bins AS (',
' SELECT',
' __cdb_bins_array,',
' ARRAY_LENGTH(__cdb_bins_array, 1) AS __cdb_bins_number',
@@ -261,7 +261,7 @@ var dateHistogramQueryTpl = dot.template([
' 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, __cdb_basics, bins, nulls',
'FROM ({{=it._query}}) __cdb_histogram, __cdb_basics, __cdb_bins, nulls',
'WHERE date_part(\'epoch\', {{=it._column}}) IS NOT NULL',
'GROUP BY bin, bins_number, bin_width, nulls_count, timestamp_start',
'ORDER BY bin'