From b63a67a5b89b0d4843636be2e5b1526b558fc49d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Wed, 6 Sep 2017 18:33:51 +0200
Subject: [PATCH] Avoid nested ternaries

---
 lib/cartodb/models/dataview/histogram.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js
index 60d6cd36..3ca87bb7 100644
--- a/lib/cartodb/models/dataview/histogram.js
+++ b/lib/cartodb/models/dataview/histogram.js
@@ -112,7 +112,7 @@ const binsQueryTpl = ctx => `
 
 const overrideBinsQueryTpl = ctx => `
     __cdb_bins AS (
-        SELECT ${ctx._bins} AS __cdb_bins_number
+        SELECT ${ctx._override.bins} AS __cdb_bins_number
     )
 `;
 
@@ -380,7 +380,6 @@ module.exports = class Histogram extends BaseDataview {
             _end: this.getBinEnd(override),
             _minBins: BIN_MIN_NUMBER,
             _maxBins: BIN_MAX_NUMBER,
-            _bins: override.bins
         });
 
         debug(histogramSql);
@@ -393,11 +392,9 @@ module.exports = class Histogram extends BaseDataview {
             WITH
                 ${filteredQueryTpl(ctx)},
                 ${this._shouldOverride(ctx._override) ? overrideBasicsQueryTpl(ctx) : basicsQueryTpl(ctx)},
-                ${this._shouldOverride(ctx._override) ?
+                ${this._shouldOverride(ctx._override) || this._shouldOverrideBins(ctx._override) ?
                     overrideBinsQueryTpl(ctx) :
-                    this._shouldOverrideBins(ctx._override) ?
-                        overrideBinsQueryTpl(ctx) :
-                        `${iqrQueryTpl(ctx)}, ${binsQueryTpl(ctx)}`
+                    `${iqrQueryTpl(ctx)}, ${binsQueryTpl(ctx)}`
                 },
                 ${nullsQueryTpl(ctx)}
                 ${ctx._isFloatColumn ? `,${infinitiesQueryTpl(ctx)}, ${nansQueryTpl(ctx)}` : ''}