Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions platform/ABModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -1231,8 +1231,9 @@ module.exports = class ABModel extends ABModelCore {
condition.rule != "next_days" &&
condition.rule != "is_current_date"
) {
condition.key = `DATE(${condition.key})`;
condition.key = `DATE("${condition.key}")`;
condition.value = `DATE("${condition.value}")`;
skipQuotes = true;
}

// Search string value of FK column
Expand Down Expand Up @@ -1302,7 +1303,7 @@ module.exports = class ABModel extends ABModelCore {
like: "LIKE",
};

// normal field name:
// normal field name: ... or DATE(...)
var columnName = condition.key;
if (typeof columnName == "string" && !skipQuotes) {
// make sure to ` ` columnName (if it isn't our special '1' condition )
Expand Down Expand Up @@ -1337,8 +1338,8 @@ module.exports = class ABModel extends ABModelCore {
var operator = conversionHash[condition.rule];
var value = condition.value;

// If a function, then ignore quote. like DATE('05-05-2020')
if (!RegExp("^[A-Z]+[(].*[)]$").test(value)) {
// If a function, then ignore quote. e.g. DATE('05-05-2020') or DATE(829c8d74.Ended)
if (!/^[A-Z][A-Z0-9]*\([^)]*\)$/.test(value)) {
value = quoteMe(value);
}

Expand Down
Loading