cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use early return

Browse Source
This commit is contained in:
IagoLast 2018-06-13 09:38:24 +02:00
parent 0cf6605b8d
commit ae7e7578db
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/cartodb/utils/date-wrapper.js
View File

@ -35,19 +35,20 @@ function _castColumnToEpoch(columnName) {
}
function getColumnsWithWrappedDates(query) {
if (query) {
if (query.match(/\b_cdb_epoch_transformation\b/)) {
const columns = [];
const fieldMatcher = /\bdate_part\('epoch', "([^"]+)"\) as "([^"]+)"/gmi;
let match;
do {
match = fieldMatcher.exec(query);
if (match && match[1] === match[2]) {
columns.push(match[1]);
}
} while (match);
return columns;
}
if(!query){
return;
}
if (query.match(/\b_cdb_epoch_transformation\b/)) {
const columns = [];
const fieldMatcher = /\bdate_part\('epoch', "([^"]+)"\) as "([^"]+)"/gmi;
let match;
do {
match = fieldMatcher.exec(query);
if (match && match[1] === match[2]) {
columns.push(match[1]);
}
} while (match);
return columns;
}
}