gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix searching multi-valued attributes, closes #800

Browse Source
This commit is contained in:
zadam 2020-01-01 20:49:26 +01:00
parent 51dddb0bbb
commit 232321f3a4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/build_search_query.js
View File

@ -21,17 +21,19 @@ module.exports = function(filters, selectedColumns = 'notes.*') {
"notes": null "notes": null
}; };
let attrFilterId = 1;
function getAccessor(property) { function getAccessor(property) {
let accessor; let accessor;
if (!VIRTUAL_ATTRIBUTES.includes(property)) { if (!VIRTUAL_ATTRIBUTES.includes(property)) {
const alias = "attr_" + property; // not reusing existing filters to support multi-valued filters e.g. "@tag=christmas @tag=shopping"
// can match notes because @tag can be both "shopping" and "christmas"
const alias = "attr_" + property + "_" + attrFilterId++;
if (!(alias in joins)) {
joins[alias] = `LEFT JOIN attributes AS ${alias} ` joins[alias] = `LEFT JOIN attributes AS ${alias} `
+ `ON ${alias}.noteId = notes.noteId ` + `ON ${alias}.noteId = notes.noteId `
+ `AND ${alias}.name = '${property}' AND ${alias}.isDeleted = 0`; + `AND ${alias}.name = '${property}' AND ${alias}.isDeleted = 0`;
}
accessor = `${alias}.value`; accessor = `${alias}.value`;
} }