cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid nested ternaries

Browse Source
This commit is contained in:
Daniel García Aubert
2017-09-06 18:33:51 +02:00
parent 1ac8455dc2
commit b63a67a5b8
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cartodb/models/dataview/histogram.js
View File

@@ -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)}` : ''}