mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix crash when search uses no-op condition and includeParentsAndChildren

Browse source 
E.g., a nonexistent saved search
This commit is contained in:
Dan Stillman 2020-02-11 00:22:00 -05:00
parent 9e2ea008f4
commit 76081ab05f
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/data/search.js
View file

@ -1605,11 +1605,19 @@ Zotero.Search.prototype._buildQuery = Zotero.Promise.coroutine(function* () {
} }
if (includeParentsAndChildren || includeParents) { if (includeParentsAndChildren || includeParents) {
// Tweak forceNoResults expression to work with UNION
if (condSQL == '0=1') {
condSQL = 'SELECT 0=1';
}
condSQL += " UNION " + parentSQL; condSQL += " UNION " + parentSQL;
condSQLParams = condSQLParams.concat(parentSQLParams); condSQLParams = condSQLParams.concat(parentSQLParams);
} }
if (includeParentsAndChildren || includeChildren) { if (includeParentsAndChildren || includeChildren) {
// Tweak forceNoResults expression to work with UNION
if (condSQL == '0=1') {
condSQL = 'SELECT 0=1';
}
condSQL += " UNION " + childrenSQL; condSQL += " UNION " + childrenSQL;
condSQLParams = condSQLParams.concat(childSQLParams); condSQLParams = condSQLParams.concat(childSQLParams);
} }

13
test/tests/searchTest.js
View file

@ -409,6 +409,19 @@ describe("Zotero.Search", function() {
}); });
}); });
describe("includeParentsAndChildren", function () {
it("should handle ANY search with no-op condition", async function () {
var s = new Zotero.Search();
s.libraryID = userLibraryID;
s.name = "Test";
s.addCondition('joinMode', 'any');
s.addCondition('savedSearch', 'is', Zotero.Utilities.randomString());
s.addCondition('includeParentsAndChildren', 'true');
var matches = await s.search();
assert.lengthOf(matches, 0);
});
});
describe("key", function () { describe("key", function () {
it("should allow more than max bound parameters", function* () { it("should allow more than max bound parameters", function* () {
let s = new Zotero.Search(); let s = new Zotero.Search();