From 2132960d7c372c3d2bbf0820dd85dc7ceb8b5c98 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Wed, 4 Apr 2018 15:25:08 +0200 Subject: [PATCH] Fix non-default aggregation columns The columns for non-default aggregations were the base columns not the resulting aggregated columns In particular this could cause invalid wrapped SQL code to be passed to ST_AsMVT when the Windshaft pg-mvt renderer was used. --- lib/cartodb/models/aggregation/aggregation-mapconfig.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/cartodb/models/aggregation/aggregation-mapconfig.js b/lib/cartodb/models/aggregation/aggregation-mapconfig.js index 9306518c..d3666897 100644 --- a/lib/cartodb/models/aggregation/aggregation-mapconfig.js +++ b/lib/cartodb/models/aggregation/aggregation-mapconfig.js @@ -173,16 +173,12 @@ module.exports = class AggregationMapConfig extends MapConfig { let aggregatedColumns = []; if (columns) { - aggregatedColumns = Object.keys(columns) - .map(key => columns[key].aggregated_column) - .filter(aggregatedColumn => typeof aggregatedColumn === 'string'); + aggregatedColumns = Object.keys(columns); } let dimensionsColumns = []; if (dimensions) { - dimensionsColumns = Object.keys(dimensions) - .map(key => dimensions[key]) - .filter(dimension => typeof dimension === 'string'); + dimensionsColumns = Object.keys(dimensions); } return removeDuplicates(aggregatedColumns.concat(dimensionsColumns));