Move queryPromise function

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

@@ -34,12 +34,6 @@ MapnikLayerStats.prototype.is = function (type) {
     return this._types[type] ? this._types[type] : false;
 };
 
-function queryPromise(dbConnection, query) {
-    return new Promise((resolve, reject) => {
-      dbConnection.query(query, (err, res) => err ? reject(err) : resolve(res));
-    });
-  }
-
 function columnAggregations(field) {
     if (field.type === 'number') {
         return ['min', 'max', 'avg', 'sum'];
@@ -63,7 +57,7 @@ function _getSQL(ctx, query, type='pre', zoom=0) {
 }
 
 function _estimatedFeatureCount(ctx) {
-    return queryPromise(ctx.dbConnection, _getSQL(ctx, queryUtils.getQueryRowEstimation))
+    return queryUtils.queryPromise(ctx.dbConnection, _getSQL(ctx, queryUtils.getQueryRowEstimation))
         .then(res => ({ estimatedFeatureCount: res.rows[0].rows }))
         .catch(() => ({ estimatedFeatureCount: -1 }));
 }
@@ -71,7 +65,7 @@ function _estimatedFeatureCount(ctx) {
 function _featureCount(ctx) {
     if (ctx.metaOptions.featureCount) {
         // TODO: if ctx.metaOptions.columnStats we can combine this with column stats query
-        return queryPromise(ctx.dbConnection, _getSQL(ctx, queryUtils.getQueryActualRowCount))
+        return queryUtils.queryPromise(ctx.dbConnection, _getSQL(ctx, queryUtils.getQueryActualRowCount))
             .then(res => ({ featureCount: res.rows[0].rows }));
     }
     return Promise.resolve();
@@ -82,7 +76,7 @@ function _aggrFeatureCount(ctx) {
         // We expect as zoom level as the value of aggrFeatureCount
         // TODO: it'd be nice to admit an array of zoom levels to
         // return metadata for multiple levels.
-        return queryPromise(
+        return queryUtils.queryPromise(
             ctx.dbConnection,
             _getSQL(ctx, queryUtils.getQueryActualRowCount, 'post',  ctx.metaOptions.aggrFeatureCount)
         ).then(res => ({ aggrFeatureCount: res.rows[0].rows }));
@@ -93,7 +87,7 @@ function _aggrFeatureCount(ctx) {
 function _geometryType(ctx) {
     if (ctx.metaOptions.geometryType) {
         const geometryColumn = AggregationMapConfig.getAggregationGeometryColumn();
-        return queryPromise(ctx.dbConnection, _getSQL(ctx, sql => queryUtils.getQueryGeometryType(sql, geometryColumn)))
+        return queryUtils.queryPromise(ctx.dbConnection, _getSQL(ctx, sql => queryUtils.getQueryGeometryType(sql, geometryColumn)))
             .then(res => ({ geometryType: res.rows[0].geom_type }));
     }
     return Promise.resolve();
@@ -102,7 +96,7 @@ function _geometryType(ctx) {
 function _columns(ctx) {
     if (ctx.metaOptions.columns || ctx.metaOptions.columnStats) {
         // note: post-aggregation columns are in layer.options.columns when aggregation is present
-        return queryPromise(ctx.dbConnection, _getSQL(ctx, sql => queryUtils.getQueryLimited(sql, 0)))
+        return queryUtils.queryPromise(ctx.dbConnection, _getSQL(ctx, sql => queryUtils.getQueryLimited(sql, 0)))
             .then(res => formatResultFields(ctx.dbConnection, res.fields));
     }
     return Promise.resolve();
@@ -156,7 +150,7 @@ function _sample(ctx, numRows) {
         const requestedRows = ctx.metaOptions.sample.num_rows || DEFAULT_SAMPLE_ROWS;
         const limit = Math.ceil(requestedRows * 1.5);
         let columns = ctx.metaOptions.sample.include_columns;
-        return queryPromise(ctx.dbConnection, _getSQL(
+        return queryUtils.queryPromise(ctx.dbConnection, _getSQL(
             ctx,
             sql => queryUtils.getQuerySample(sql, sampleProb, limit, SAMPLE_SEED, columns)
         )).then(res => ({ sample: res.rows }));
@@ -186,7 +180,7 @@ function _columnStats(ctx, columns) {
                 // TODO:  ctx.metaOptions.columnStats.maxCategories
                 //        => use PG stats to dismiss columns with more distinct values
                 queries.push(
-                    queryPromise(
+                    queryUtils.queryPromise(
                         ctx.dbConnection,
                         _getSQL(ctx, sql => queryUtils.getQueryTopCategories(sql, name, topN, includeNulls))
                     ).then(res => ({ [name]: { categories: res.rows } }))
@@ -194,7 +188,7 @@ function _columnStats(ctx, columns) {
             }
         });
         queries.push(
-            queryPromise(
+            queryUtils.queryPromise(
                 ctx.dbConnection,
                 _getSQL(ctx, sql => `SELECT ${aggr.join(',')} FROM (${sql}) AS __cdb_query`)
             ).then(res => {

lib/cartodb/utils/query-utils.js

@@ -170,4 +170,11 @@ function getQueryLimited(query, limit = 0) {
     `;
 }
 
+function queryPromise(dbConnection, query) {
+    return new Promise((resolve, reject) => {
+      dbConnection.query(query, (err, res) => err ? reject(err) : resolve(res));
+    });
+}
+
+module.exports.queryPromise = queryPromise;
 module.exports.getQueryLimited = getQueryLimited;