Use dataview base to get column type in formula dataviews

lib/cartodb/models/dataview/base.js

@@ -1,3 +1,6 @@
+var dot = require('dot');
+dot.templateSettings.strip = false;
+
 function BaseDataview() {}
 
 module.exports = BaseDataview;
@@ -24,3 +27,34 @@ BaseDataview.prototype.getResult = function(psql, override, callback) {
 BaseDataview.prototype.search = function(psql, userQuery, callback) {
     return callback(null, this.format({ rows: [] }));
 };
+
+var FLOAT_OIDS = {
+    700: true,
+    701: true
+};
+
+var columnTypeQueryTpl = dot.template(
+    'SELECT pg_typeof({{=it.column}})::oid FROM ({{=it.query}}) _cdb_column_type limit 1'
+);
+
+BaseDataview.prototype.getColumnType = function (psql, column, query, callback) {
+    var readOnlyTransaction = true;
+
+    var columnTypeQuery = columnTypeQueryTpl({
+        column: column, query: query
+    });
+
+    psql.query(columnTypeQuery, function(err, result) {
+        if (err) {
+            return callback(err);
+        }
+        var pgType = result.rows[0].pg_typeof;
+        callback(null, getPGTypeName(pgType));
+    }, readOnlyTransaction);
+};
+
+function getPGTypeName (pgType) {
+    return {
+        float: FLOAT_OIDS.hasOwnProperty(pgType)
+    };
+}

lib/cartodb/models/dataview/formula.js

@@ -5,10 +5,6 @@ var debug = require('debug')('windshaft:widget:formula');
 var dot = require('dot');
 dot.templateSettings.strip = false;
 
-var columnTypeQueryTpl = dot.template(
-    'SELECT pg_typeof({{=it.column}})::oid FROM ({{=it.query}}) _cdb_histogram_column_type limit 1'
-);
-
 var formulaQueryTpl = dot.template([
     'SELECT',
     '  {{=it._operation}}({{=it._column}}) AS result,',
@@ -34,11 +30,6 @@ var VALID_OPERATIONS = {
     max: true
 };
 
-var FLOAT_OIDS = {
-    700: true,
-    701: true
-};
-
 var TYPE = 'formula';
 
 /**
@@ -84,30 +75,20 @@ Formula.prototype.sql = function(psql, override, callback) {
         override = {};
     }
 
-    var _query = this.query;
-
-    var columnTypeQuery = columnTypeQueryTpl({
-        column: this.column, query: _query
-    });
-
     if (this._isFloatColumn === null) {
-        var readOnlyTransaction = true;
+        this._isFloatColumn = false;
-        psql.query(columnTypeQuery, function(err, result) {
+        this.getColumnType(psql, this.column, this.query, function (err, type) {
-            self._isFloatColumn = false;
+            if (!err && !!type) {
-            if (!err && !!result.rows[0]) {
+                self._isFloatColumn = type.float;
-                var pgType = result.rows[0].pg_typeof;
-                if (FLOAT_OIDS.hasOwnProperty(pgType)) {
-                    self._isFloatColumn = true;
-                }
             }
             self.sql(psql, override, callback);
-        }, readOnlyTransaction);
+        });
         return null;
     }
 
     var formulaSql = formulaQueryTpl({
         _isFloatColumn: this._isFloatColumn,
-        _query: _query,
+        _query: this.query,
         _operation: this.operation,
         _column: this.column
     });

lib/cartodb/models/dataview/overviews/formula.js

@@ -5,15 +5,6 @@ var debug = require('debug')('windshaft:widget:formula:overview');
 var dot = require('dot');
 dot.templateSettings.strip = false;
 
-var FLOAT_OIDS = {
-    700: true,
-    701: true
-};
-
-var columnTypeQueryTpl = dot.template(
-    'SELECT pg_typeof({{=it.column}})::oid FROM ({{=it.query}}) _cdb_histogram_column_type limit 1'
-);
-
 var formulaQueryTpls = {
     'count': dot.template([
         'SELECT',
@@ -71,29 +62,20 @@ Formula.prototype.constructor = Formula;
 
 module.exports = Formula;
 
-Formula.prototype.sql = function(psql, override, callback) {
+Formula.prototype.sql = function (psql, override, callback) {
     var self = this;
     var formulaQueryTpl = formulaQueryTpls[this.operation];
 
-    if ( formulaQueryTpl ) {
+    if (formulaQueryTpl) {
         // supported formula for use with overviews
-
-        var columnTypeQuery = columnTypeQueryTpl({
-            column: this.column, query: this.query
-        });
-
         if (this._isFloatColumn === null) {
-            var readOnlyTransaction = true;
+            this._isFloatColumn = false;
-            psql.query(columnTypeQuery, function(err, result) {
+            this.getColumnType(psql, this.column, this.query, function (err, type) {
-                self._isFloatColumn = false;
+                if (!err && !!type) {
-                if (!err && !!result.rows[0]) {
+                    self._isFloatColumn = type.float;
-                    var pgType = result.rows[0].pg_typeof;
-                    if (FLOAT_OIDS.hasOwnProperty(pgType)) {
-                        self._isFloatColumn = true;
-                    }
                 }
                 self.sql(psql, override, callback);
-            }, readOnlyTransaction);
+            });
             return null;
         }
 
@@ -103,6 +85,7 @@ Formula.prototype.sql = function(psql, override, callback) {
             _operation: this.operation,
             _column: this.column
         });
+
         callback = callback || override;
 
         debug(formulaSql);