self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-30 10:36:35 +02:00
Code Issues Releases Activity

Desktop, Cli; Fix notebook search filter (#3946)

Browse Source
This commit is contained in:
Naveen M V 2020-10-20 16:24:46 +05:30 committed by GitHub
parent b3e5a1e48d
commit fc2a52aa1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ReactNativeClient/lib/services/searchengine/queryBuilder.ts
View File

@ -417,7 +417,15 @@ export default function queryBuilder(terms: Term[], fuzzy: boolean) {
let query;
if (withs.length > 0) {
query = ['WITH RECURSIVE' , withs.join(',') ,queryParts.join(' ')].join(' ');
if (terms.find(x => x.name === 'notebook') && terms.find(x => x.name === 'any')) {
// The notebook filter should be independent of the any filter.
// So we're first finding the OR of other filters and then combining them with the notebook filter using AND
// in-required-notebook AND (condition #1 OR condition #2 OR ... )
const queryString = `${queryParts.slice(0, 2).join(' ')} AND ROWID IN ( SELECT ROWID FROM notes_fts WHERE 1=0 ${queryParts.slice(2).join(' ')})`;
query = ['WITH RECURSIVE' , withs.join(',') , queryString].join(' ');
} else {
query = ['WITH RECURSIVE' , withs.join(',') ,queryParts.join(' ')].join(' ');
}
} else {
query = queryParts.join(' ');
}