Merge branch 'master' into eslint

This commit is contained in:
Daniel García Aubert
2019-11-13 19:00:50 +01:00
21 changed files with 333 additions and 133 deletions
+2 -2
View File
@@ -7,8 +7,8 @@ module.exports.getQueryActualRowCount = function (query) {
return `select COUNT(*) AS rows FROM (${substituteDummyTokens(query)}) AS __cdb_query`;
};
function getQueryRowEstimation (query) {
return 'select CDB_EstimateRowCount($windshaft$' + substituteDummyTokens(query) + '$windshaft$) as rows';
function getQueryRowEstimation(query) {
return 'select cartodb.CDB_EstimateRowCount($windshaft$' + substituteDummyTokens(query) + '$windshaft$) as rows';
}
module.exports.getQueryRowEstimation = getQueryRowEstimation;