accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2024-11-10 07:40:55 +00:00
Code Issues Releases Activity

Support 'in' and 'not in' in db filters

Browse Source
This commit is contained in:
Faris Ansari 2018-04-18 12:18:20 +05:30
parent 66284ec5b3
commit 6fb782b300
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
backends/database.js
View File

@ -393,20 +393,36 @@ module.exports = class Database extends Observable {
let conditions = [];
let values = [];
for (let key in filters) {
let field = `ifnull(${key}, '')`;
const value = filters[key];
if (value instanceof Array) {
const condition = value[0];
let condition = value[0];
let comparisonValue = value[1];
let placeholder = '?';
// if its like, we should add the wildcard "%" if the user has not added
if (condition.toLowerCase()==='includes') {
condition = 'like';
}
if (['like', 'includes'].includes(condition.toLowerCase()) && !value[1].includes('%')) {
value[1] = `%${value[1]}%`;
if (['like', 'includes'].includes(condition.toLowerCase()) && !comparisonValue.includes('%')) {
comparisonValue = `%${comparisonValue}%`;
}
conditions.push(`ifnull(${key}, '') ${condition} ?`);
values.push(value[1]);
if (['in', 'not in'].includes(condition) && Array.isArray(comparisonValue)) {
placeholder = `(${comparisonValue.map(v => '?').join(", ")})`;
}
conditions.push(`${field} ${condition} ${placeholder}`);
if (Array.isArray(comparisonValue)) {
values = values.concat(comparisonValue);
} else {
values.push(comparisonValue);
}
} else {
conditions.push(`ifnull(${key}, '') = ?`);
conditions.push(`${field} = ?`);
values.push(value);
}
}