From 2e79781711d14627a1dba97fc87bfb7c3f5976ca Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 19 May 2016 13:32:32 +0200
Subject: [PATCH] Adds support for sql wrap in all layers

Previously it was only working for analyses ones.
---
 NEWS.md                                       |   7 +++
 lib/cartodb/controllers/map.js                |   6 ++
 .../adapter/sql-wrap-mapconfig-adapter.js     |  25 +++++++++
 .../models/mapconfig/named_map_provider.js    |   6 ++
 npm-shrinkwrap.json                           |   2 +-
 package.json                                  |   2 +-
 test/acceptance/sql-wrap.js                   |  52 ++++++++++++++++++
 test/fixtures/sql-wrap-usa-filter.png         | Bin 0 -> 4197 bytes
 8 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js
 create mode 100644 test/acceptance/sql-wrap.js
 create mode 100644 test/fixtures/sql-wrap-usa-filter.png

diff --git a/NEWS.md b/NEWS.md
index 7e495c7d..9eeb06e3 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.44.0
+
+Released 2016-mm-dd
+
+Adds support for sql wrap in all layers
+
+
 ## 2.43.1
 
 Released 2016-05-19
diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js
index feaf6fa5..1f8f25bb 100644
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -19,6 +19,7 @@ var MapConfigNamedLayersAdapter = require('../models/mapconfig_named_layers_adap
 var AnalysisMapConfigAdapter = require('../models/analysis-mapconfig-adapter');
 var NamedMapMapConfigProvider = require('../models/mapconfig/named_map_provider');
 var CreateLayergroupMapConfigProvider = require('../models/mapconfig/create_layergroup_provider');
+var SqlWrapMapConfigAdapter = require('../models/mapconfig/adapter/sql-wrap-mapconfig-adapter');
 
 /**
  * @param {AuthApi} authApi
@@ -52,6 +53,7 @@ function MapController(authApi, pgConnection, templateMaps, mapBackend, metadata
     this.analysisMapConfigAdapter = new AnalysisMapConfigAdapter(analysisBackend);
     this.namedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps);
     this.overviewsAdapter = overviewsAdapter;
+    this.sqlWrapMapConfigAdapter = new SqlWrapMapConfigAdapter();
 }
 
 util.inherits(MapController, BaseController);
@@ -139,6 +141,10 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
             self.req2params(req, this);
         },
         prepareConfigFn,
+        function prepareSqlWrap(err, requestMapConfig) {
+            assert.ifError(err);
+            self.sqlWrapMapConfigAdapter.getMapConfig(requestMapConfig, this);
+        },
         function prepareAnalysisLayers(err, requestMapConfig) {
             assert.ifError(err);
             var analysisConfiguration = {
diff --git a/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js
new file mode 100644
index 00000000..6b9a5130
--- /dev/null
+++ b/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js
@@ -0,0 +1,25 @@
+function SqlWrapMapConfigAdapter() {
+}
+
+module.exports = SqlWrapMapConfigAdapter;
+
+
+SqlWrapMapConfigAdapter.prototype.getMapConfig = function(requestMapConfig, callback) {
+    if (requestMapConfig && Array.isArray(requestMapConfig.layers)) {
+        requestMapConfig.layers = requestMapConfig.layers.map(function(layer) {
+            if (layer.options) {
+                var sqlQueryWrap = layer.options.sql_wrap;
+                if (sqlQueryWrap) {
+                    var layerSql = layer.options.sql;
+                    if (layerSql) {
+                        layer.options.sql_raw = layerSql;
+                        layer.options.sql = sqlQueryWrap.replace(/<%=\s*sql\s*%>/g, layerSql);
+                    }
+                }
+            }
+            return layer;
+        });
+    }
+
+    return callback(null, requestMapConfig);
+};
diff --git a/lib/cartodb/models/mapconfig/named_map_provider.js b/lib/cartodb/models/mapconfig/named_map_provider.js
index e285b2b7..e1ad6fea 100644
--- a/lib/cartodb/models/mapconfig/named_map_provider.js
+++ b/lib/cartodb/models/mapconfig/named_map_provider.js
@@ -6,6 +6,7 @@ var step = require('step');
 var MapConfig = require('windshaft').model.MapConfig;
 var templateName = require('../../backends/template_maps').templateName;
 var QueryTables = require('cartodb-query-tables');
+var SqlWrapMapConfigAdapter = require('./adapter/sql-wrap-mapconfig-adapter');
 
 /**
  * @constructor
@@ -22,6 +23,7 @@ function NamedMapMapConfigProvider(templateMaps, pgConnection, metadataBackend,
     this.turboCartoAdapter = turboCartoAdapter;
     this.analysisMapConfigAdapter = analysisMapConfigAdapter;
     this.overviewsAdapter = overviewsAdapter;
+    this.sqlWrapMapConfigAdapter = new SqlWrapMapConfigAdapter();
 
     this.owner = owner;
     this.templateName = templateName(templateId);
@@ -95,6 +97,10 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
             assert.ifError(err);
             return self.templateMaps.instance(self.template, templateParams);
         },
+        function prepareSqlWrap(err, requestMapConfig) {
+            assert.ifError(err);
+            self.sqlWrapMapConfigAdapter.getMapConfig(requestMapConfig, this);
+        },
         function prepareAnalysisLayers(err, requestMapConfig) {
             assert.ifError(err);
             var analysisConfiguration = {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c3b9529d..04f931c5 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.42.3",
+  "version": "2.44.0",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",
diff --git a/package.json b/package.json
index ecf28729..c426011b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "2.43.1",
+  "version": "2.44.0",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"
diff --git a/test/acceptance/sql-wrap.js b/test/acceptance/sql-wrap.js
new file mode 100644
index 00000000..7b3c25d8
--- /dev/null
+++ b/test/acceptance/sql-wrap.js
@@ -0,0 +1,52 @@
+require('../support/test_helper');
+
+var assert = require('../support/assert');
+var TestClient = require('../support/test-client');
+
+describe('sql-wrap', function() {
+
+    afterEach(function(done) {
+        if (this.testClient) {
+            this.testClient.drain(done);
+        } else {
+            return done();
+        }
+    });
+
+    it('should use sql_wrap from layer options', function(done) {
+        var mapConfig = {
+            version: '1.5.0',
+            layers: [
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "sql": "SELECT * FROM populated_places_simple_reduced",
+                        "sql_wrap": "SELECT * FROM (<%= sql %>) _w WHERE adm0_a3 = 'USA'",
+                        "cartocss": [
+                            "#points {",
+                            "  marker-fill-opacity: 1;",
+                            "  marker-line-color: #FFF;",
+                            "  marker-line-width: 0.5;",
+                            "  marker-line-opacity: 1;",
+                            "  marker-placement: point;",
+                            "  marker-type: ellipse;",
+                            "  marker-width: 8;",
+                            "  marker-fill: red;",
+                            "  marker-allow-overlap: true;",
+                            "}"
+                        ].join('\n'),
+                        "cartocss_version": "2.3.0"
+                    }
+                }
+            ]
+        };
+
+        this.testClient = new TestClient(mapConfig, 1234);
+        this.testClient.getTile(0, 0, 0, function(err, tile, img) {
+            assert.ok(!err, err);
+            var fixtureImg = './test/fixtures/sql-wrap-usa-filter.png';
+            assert.imageIsSimilarToFile(img, fixtureImg, 20, done);
+        });
+    });
+
+});
diff --git a/test/fixtures/sql-wrap-usa-filter.png b/test/fixtures/sql-wrap-usa-filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..30bd4eb341b814a73a88b99177b2f0461d811189
GIT binary patch
literal 4197
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

literal 0
HcmV?d00001