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

Use object properties in class method instead of passing them as parameters

Browse Source
This commit is contained in:
Daniel García Aubert
2017-09-13 19:42:25 +02:00
parent 75645e2d7a
commit 2f4f719f55
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/models/dataview/aggregation.js
+14 -14
View File
@@ -250,34 +250,34 @@ Aggregation.prototype.sql = function(psql, override, callback) {
return callback(null, aggregationSql);
};
Aggregation.prototype.getCategoriesCTESql = function(query, column, aggregation, aggregationColumn, isFloatColumn) {
Aggregation.prototype.getCategoriesCTESql = function() {
return `
WITH
${filteredQueryTpl({
_isFloatColumn: isFloatColumn,
_isFloatColumn: this._isFloatColumn,
_query: this.query,
_column: this.column,
_aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
_aggregationColumn: this.aggregation !== 'count' ? this.aggregationColumn : null
})},
${summaryQueryTpl({
_isFloatColumn: isFloatColumn,
_query: query,
_column: column,
_aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
_isFloatColumn: this._isFloatColumn,
_query: this.query,
_column: this.column,
_aggregationColumn: this.aggregation !== 'count' ? this.aggregationColumn : null
})},
${rankedCategoriesQueryTpl({
_query: query,
_column: column,
_query: this.query,
_column: this.column,
_aggregation: this.getAggregationSql(),
_aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
_aggregationColumn: this.aggregation !== 'count' ? this.aggregationColumn : null
})},
${categoriesSummaryMinMaxQueryTpl({
_query: query,
_column: column
_query: this.query,
_column: this.column
})},
${categoriesSummaryCountQueryTpl({
_query: query,
_column: column
_query: this.query,
_column: this.column
})}
`;
};