From 166e29e8ce9d95aac099df5282ff750d6314e077 Mon Sep 17 00:00:00 2001
From: Javier Goizueta <jgoizueta@gmail.com>
Date: Fri, 23 Jun 2017 16:53:16 +0200
Subject: [PATCH] Forward queries parameter from overview dataviews to base
 dataviews

---
 lib/cartodb/models/dataview/overviews/aggregation.js | 2 +-
 lib/cartodb/models/dataview/overviews/base.js        | 5 +++--
 lib/cartodb/models/dataview/overviews/formula.js     | 4 ++--
 lib/cartodb/models/dataview/overviews/histogram.js   | 2 +-
 lib/cartodb/models/dataview/overviews/list.js        | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/cartodb/models/dataview/overviews/aggregation.js b/lib/cartodb/models/dataview/overviews/aggregation.js
index 730ba822..5df092f4 100644
--- a/lib/cartodb/models/dataview/overviews/aggregation.js
+++ b/lib/cartodb/models/dataview/overviews/aggregation.js
@@ -90,7 +90,7 @@ var aggregationQueryTpl = dot.template([
 var CATEGORIES_LIMIT = 6;
 
  function Aggregation(query, options, queryRewriter, queryRewriteData, params, queries) {
-    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);
+    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params, queries);
 
     this.query = query;
     this.queries = queries;
diff --git a/lib/cartodb/models/dataview/overviews/base.js b/lib/cartodb/models/dataview/overviews/base.js
index 1425e2d1..38b2c119 100644
--- a/lib/cartodb/models/dataview/overviews/base.js
+++ b/lib/cartodb/models/dataview/overviews/base.js
@@ -1,14 +1,15 @@
 var _ = require('underscore');
 var BaseDataview = require('../base');
 
-function BaseOverviewsDataview(query, queryOptions, BaseDataview, queryRewriter, queryRewriteData, options) {
+function BaseOverviewsDataview(query, queryOptions, BaseDataview, queryRewriter, queryRewriteData, options, queries) {
   this.BaseDataview = BaseDataview;
   this.query = query;
   this.queryOptions = queryOptions;
   this.queryRewriter = queryRewriter;
   this.queryRewriteData = queryRewriteData;
   this.options = options;
-  this.baseDataview = new this.BaseDataview(this.query, this.queryOptions);
+  this.queries = queries;
+  this.baseDataview = new this.BaseDataview(this.query, this.queryOptions, this.queries);
 }
 
 module.exports = BaseOverviewsDataview;
diff --git a/lib/cartodb/models/dataview/overviews/formula.js b/lib/cartodb/models/dataview/overviews/formula.js
index 533dd921..a30bc783 100644
--- a/lib/cartodb/models/dataview/overviews/formula.js
+++ b/lib/cartodb/models/dataview/overviews/formula.js
@@ -50,8 +50,8 @@ var formulaQueryTpls = {
     ].join('\n')),
 };
 
-function Formula(query, options, queryRewriter, queryRewriteData, params) {
-    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);
+function Formula(query, options, queryRewriter, queryRewriteData, params, queries) {
+    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params, queries);
     this.column = options.column || '1';
     this.operation = options.operation;
     this._isFloatColumn = null;
diff --git a/lib/cartodb/models/dataview/overviews/histogram.js b/lib/cartodb/models/dataview/overviews/histogram.js
index 361cc8f2..6674f6a0 100644
--- a/lib/cartodb/models/dataview/overviews/histogram.js
+++ b/lib/cartodb/models/dataview/overviews/histogram.js
@@ -132,7 +132,7 @@ var histogramQueryTpl = dot.template([
 ].join('\n'));
 
 function Histogram(query, options, queryRewriter, queryRewriteData, params, queries) {
-    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);
+    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params, queries);
 
     this.query = query;
     this.queries = queries;
diff --git a/lib/cartodb/models/dataview/overviews/list.js b/lib/cartodb/models/dataview/overviews/list.js
index 7e3b3161..6ec731f4 100644
--- a/lib/cartodb/models/dataview/overviews/list.js
+++ b/lib/cartodb/models/dataview/overviews/list.js
@@ -1,8 +1,8 @@
 var BaseOverviewsDataview = require('./base');
 var BaseDataview = require('../list');
 
-function List(query, options, queryRewriter, queryRewriteData, params) {
-    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);
+function List(query, options, queryRewriter, queryRewriteData, params, queries) {
+    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params, queries);
 }
 
 List.prototype = Object.create(BaseOverviewsDataview.prototype);