From 68dfed8b85df674685c7e3569f2d2697e2f88bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Fri, 15 Sep 2017 10:48:44 +0200
Subject: [PATCH] Use ES6 class syntax

---
 lib/cartodb/models/dataview/formula.js | 146 ++++++++++++-------------
 1 file changed, 71 insertions(+), 75 deletions(-)

diff --git a/lib/cartodb/models/dataview/formula.js b/lib/cartodb/models/dataview/formula.js
index b96e05b1..ba6725e3 100644
--- a/lib/cartodb/models/dataview/formula.js
+++ b/lib/cartodb/models/dataview/formula.js
@@ -49,93 +49,89 @@ var TYPE = 'formula';
      }
  }
  */
-function Formula(query, options = {}, queries = {}) {
-    if (typeof options.operation !== 'string') {
-        throw new Error(`Formula expects 'operation' in dataview options`);
+module.exports = class Formula extends BaseDataview {
+    constructor (query, options = {}, queries = {}) {
+        if (typeof options.operation !== 'string') {
+            throw new Error(`Formula expects 'operation' in dataview options`);
+        }
+
+        if (!VALID_OPERATIONS[options.operation]) {
+            throw new Error(`Formula does not support '${options.operation}' operation`)
+        }
+
+        if (options.operation !== 'count' && typeof options.column !== 'string') {
+            throw new Error(`Formula expects 'column' in dataview options`);
+        }
+
+        this.query = query;
+        this.queries = queries;
+        this.column = options.column || '1';
+        this.operation = options.operation;
+        this._isFloatColumn = null;
     }
 
-    if (!VALID_OPERATIONS[options.operation]) {
-        throw new Error(`Formula does not support '${options.operation}' operation`)
-    }
 
-    if (options.operation !== 'count' && typeof options.column !== 'string') {
-        throw new Error(`Formula expects 'column' in dataview options`);
-    }
+    sql (psql, override, callback) {
+        var self = this;
 
-    BaseDataview.apply(this);
+        if (!callback) {
+            callback = override;
+            override = {};
+        }
 
-    this.query = query;
-    this.queries = queries;
-    this.column = options.column || '1';
-    this.operation = options.operation;
-    this._isFloatColumn = null;
-}
+        if (this._isFloatColumn === null) {
+            this._isFloatColumn = false;
+            this.getColumnType(psql, this.column, this.queries.no_filters, function (err, type) {
+                if (!err && !!type) {
+                    self._isFloatColumn = type.float;
+                }
+                self.sql(psql, override, callback);
+            });
+            return null;
+        }
 
-Formula.prototype = new BaseDataview();
-Formula.prototype.constructor = Formula;
-
-module.exports = Formula;
-
-Formula.prototype.sql = function(psql, override, callback) {
-    var self = this;
-
-    if (!callback) {
-        callback = override;
-        override = {};
-    }
-
-    if (this._isFloatColumn === null) {
-        this._isFloatColumn = false;
-        this.getColumnType(psql, this.column, this.queries.no_filters, function (err, type) {
-            if (!err && !!type) {
-                self._isFloatColumn = type.float;
-            }
-            self.sql(psql, override, callback);
+        var formulaSql = formulaQueryTpl({
+            _isFloatColumn: this._isFloatColumn,
+            _query: this.query,
+            _operation: this.operation,
+            _column: this.column
         });
-        return null;
+
+        debug(formulaSql);
+
+        return callback(null, formulaSql);
     }
 
-    var formulaSql = formulaQueryTpl({
-        _isFloatColumn: this._isFloatColumn,
-        _query: this.query,
-        _operation: this.operation,
-        _column: this.column
-    });
+    format (result) {
+        var formattedResult = {
+            operation: this.operation,
+            result: 0,
+            nulls: 0,
+            nans: 0,
+            infinities: 0
+        };
 
-    debug(formulaSql);
+        if (result.rows.length) {
+            formattedResult.operation = this.operation;
+            formattedResult.result = result.rows[0].result;
+            formattedResult.nulls = result.rows[0].nulls_count;
+            formattedResult.nans = result.rows[0].nans_count;
+            formattedResult.infinities = result.rows[0].infinities_count;
+        }
 
-    return callback(null, formulaSql);
-};
+        return formattedResult;
+    }
 
-Formula.prototype.format = function(result) {
-    var formattedResult = {
-        operation: this.operation,
-        result: 0,
-        nulls: 0,
-        nans: 0,
-        infinities: 0
+    getType () {
+        return TYPE;
     };
 
-    if (result.rows.length) {
-        formattedResult.operation = this.operation;
-        formattedResult.result = result.rows[0].result;
-        formattedResult.nulls = result.rows[0].nulls_count;
-        formattedResult.nans = result.rows[0].nans_count;
-        formattedResult.infinities = result.rows[0].infinities_count;
+    toString () {
+        return JSON.stringify({
+            _type: TYPE,
+            _query: this.query,
+            _column: this.column,
+            _operation: this.operation
+        });
     }
-
-    return formattedResult;
-};
-
-Formula.prototype.getType = function() {
-    return TYPE;
-};
-
-Formula.prototype.toString = function() {
-    return JSON.stringify({
-        _type: TYPE,
-        _query: this.query,
-        _column: this.column,
-        _operation: this.operation
-    });
-};
+}