Merge branch 'master' into tilejson-url-apikey

lib/cartodb/backends/layer-stats/mapnik-layer-stats.js

@@ -1,27 +1,5 @@
-var queryUtils = require('../../utils/query-utils');
+const queryUtils = require('../../utils/query-utils');
 const AggregationMapConfig = require('../../models/aggregation/aggregation-mapconfig');
-var SubstitutionTokens = require('../../utils/substitution-tokens');
-
-// Instantiate a query with tokens for a given zoom level
-function queryForZoom(sql, zoom, singleTile=false) {
-    const tileRes = 256;
-    const wmSize = 6378137.0*2*Math.PI;
-    const nTiles = Math.pow(2, zoom);
-    const tileSize = wmSize / nTiles;
-    const resolution = tileSize / tileRes;
-    const scaleDenominator = resolution / 0.00028;
-    const x0 = -wmSize/2, y0 = -wmSize/2;
-    let bbox = `ST_MakeEnvelope(${x0}, ${y0}, ${x0+wmSize}, ${y0+wmSize})`;
-    if (singleTile) {
-        bbox = `ST_MakeEnvelope(${x0}, ${y0}, ${x0 + tileSize}, ${y0 + tileSize})`;
-    }
-    return SubstitutionTokens.replace(sql, {
-        bbox: bbox,
-        scale_denominator: scaleDenominator,
-        pixel_width: resolution,
-        pixel_height: resolution
-    });
-}
 
 function MapnikLayerStats () {
     this._types = {
@@ -52,7 +30,7 @@ function _getSQL(ctx, query, type='pre', zoom=0) {
     else {
         sql = ctx.aggrQuery;
     }
-    sql = queryForZoom(sql, zoom || 0);
+    sql = queryUtils.subsituteTokensForZoom(sql, zoom || 0);
     return query(sql);
 }
 

lib/cartodb/backends/overviews-metadata.js

@@ -1,4 +1,4 @@
-var SubstitutionTokens = require('../utils/substitution-tokens');
+const queryUtils = require('../utils/query-utils');
 
 function OverviewsMetadataBackend(pgQueryRunner) {
     this.pgQueryRunner = pgQueryRunner;
@@ -6,20 +6,15 @@ function OverviewsMetadataBackend(pgQueryRunner) {
 
 module.exports = OverviewsMetadataBackend;
 
-function prepareSql(sql) {
-    return sql && SubstitutionTokens.replace(sql, {
-        bbox: 'ST_MakeEnvelope(0,0,0,0)',
-        scale_denominator: '0',
-        pixel_width: '1',
-        pixel_height: '1'
-    });
-}
-
 OverviewsMetadataBackend.prototype.getOverviewsMetadata = function (username, sql, callback) {
     // FIXME: Currently using internal function _cdb_schema_name
     //        CDB_Overviews should provide the schema information directly.
-    var query = 'SELECT *, _cdb_schema_name(base_table)' +
-                '  FROM CDB_Overviews(CDB_QueryTablesText($windshaft$' + prepareSql(sql) + '$windshaft$))';
+    const query = `
+      SELECT *, _cdb_schema_name(base_table)
+        FROM CDB_Overviews(
+            CDB_QueryTablesText($windshaft$${queryUtils.substituteDummyTokens(sql)}$windshaft$)
+        );
+    `;
     this.pgQueryRunner.run(username, query, function handleOverviewsRows(err, rows) {
         if (err){
             callback(err);

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

@@ -8,19 +8,10 @@ const {
     createAggregationFiltersValidator
 } = aggregationValidator;
 
-const SubstitutionTokens = require('../../utils/substitution-tokens');
+const queryUtils = require('../../utils/query-utils');
 
 const removeDuplicates = arr => [...new Set(arr)];
 
-function prepareSql(sql) {
-    return sql && SubstitutionTokens.replace(sql, {
-        bbox: 'ST_MakeEnvelope(0,0,0,0)',
-        scale_denominator: '0',
-        pixel_width: '1',
-        pixel_height: '1'
-    });
-}
-
 module.exports = class AggregationMapConfig extends MapConfig {
     static get AGGREGATIONS () {
         return aggregationQuery.SUPPORTED_AGGREGATE_FUNCTIONS;
@@ -205,7 +196,7 @@ module.exports = class AggregationMapConfig extends MapConfig {
             }
 
             const sql = limitedQuery({
-                query: prepareSql(layer.options.sql)
+                query: queryUtils.substituteDummyTokens(layer.options.sql)
             });
 
             connection.query(sql, (err, result) => {

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

@@ -46,7 +46,7 @@ class VectorMapConfigAdapter {
                 if (err) {
                     return reject(err);
                 }
-                const query = queryUtils.getQueryLimited(originalQuery, 0);
+                const query = queryUtils.getQueryLimited(queryUtils.substituteDummyTokens(originalQuery), 0);
                 queryUtils.queryPromise(connection, query)
                     .then(resolve)
                     .catch(reject);

lib/cartodb/utils/query-utils.js

@@ -1,3 +1,5 @@
+const SubstitutionTokens = require('./substitution-tokens');
+
 function prepareQuery(sql) {
     var affectedTableRegexCache = {
         bbox: /!bbox!/g,
@@ -176,5 +178,37 @@ function queryPromise(dbConnection, query) {
     });
 }
 
+function substituteDummyTokens(sql) {
+    return sql && SubstitutionTokens.replace(sql, {
+        bbox: 'ST_MakeEnvelope(0,0,0,0)',
+        scale_denominator: '0',
+        pixel_width: '1',
+        pixel_height: '1'
+    });
+}
+
+function subsituteTokensForZoom(sql, zoom, singleTile=false) {
+    const tileRes = 256;
+    const wmSize = 6378137.0*2*Math.PI;
+    const nTiles = Math.pow(2, zoom);
+    const tileSize = wmSize / nTiles;
+    const resolution = tileSize / tileRes;
+    const scaleDenominator = resolution / 0.00028;
+    const x0 = -wmSize/2, y0 = -wmSize/2;
+    let bbox = `ST_MakeEnvelope(${x0}, ${y0}, ${x0+wmSize}, ${y0+wmSize})`;
+    if (singleTile) {
+        bbox = `ST_MakeEnvelope(${x0}, ${y0}, ${x0 + tileSize}, ${y0 + tileSize})`;
+    }
+    return SubstitutionTokens.replace(sql, {
+        bbox: bbox,
+        scale_denominator: scaleDenominator,
+        pixel_width: resolution,
+        pixel_height: resolution
+    });
+}
+
 module.exports.queryPromise = queryPromise;
-module.exports.getQueryLimited = getQueryLimited;
+module.exports.getQueryLimited = getQueryLimited;
+module.exports.substituteDummyTokens = substituteDummyTokens;
+module.exports.subsituteTokensForZoom = subsituteTokensForZoom;
+