Support sql_wrap for aggregation

lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js

@@ -93,10 +93,11 @@ module.exports = class AggregationMapConfigAdapter {
                 }
 
                 if (shouldAdapt) {
-                    const aggregation = new Aggregation(mapConfig, layer.options.sql, layer.options.aggregation);
+                    const sql = layer.options.sql_raw ? layer.options.sql_raw : layer.options.sql;
+                    const aggregation = new Aggregation(mapConfig, sql, layer.options.aggregation);
                     const sqlQueryWrap = layer.options.sql_wrap;
 
-                    let aggregationSql = aggregation.sql(layer.options);
+                    let aggregationSql = aggregation.sql();
 
                     if (sqlQueryWrap) {
                         layer.options.sql_raw = aggregationSql;

test/acceptance/aggregation.js

@@ -482,6 +482,32 @@ describe('aggregation', function () {
                     done();
                 });
             });
+
+            it('when sql_wrap is provided should return a tile', function (done) {
+                this.mapConfig = createVectorMapConfig([
+                    {
+                        type: 'cartodb',
+                        options: {
+                            sql_wrap: SQL_WRAP,
+                            sql: POINTS_SQL_1,
+                            aggregation: {
+                                threshold: 1
+                            },
+                            cartocss: '#layer { marker-width: 1; }',
+                            cartocss_version: '2.3.0'
+                        }
+                    }
+                ]);
+                this.testClient = new TestClient(this.mapConfig);
+
+                this.testClient.getTile(0, 0, 0, {}, (err) => {
+                    if (err) {
+                        return done(err);
+                    }
+
+                    done();
+                });
+            });
         });
     });
 });