joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #799 from carmenlau/query-fix

Browse Source 
Fix using query.notContainedIn and query.doesNotMatchQuery at the same time, notContainedIn will be ignored problem
This commit is contained in:
Drew
2016-03-03 09:50:06 -08:00
parent 187f29c2a6 6973de7910
commit 3b4faaaf95
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/RestQuery.js
View File

@@ -214,7 +214,11 @@ RestQuery.prototype.replaceInQuery = function() {
}); });
} }
delete inQueryObject['$inQuery']; delete inQueryObject['$inQuery'];
inQueryObject['$in'] = values; if (Array.isArray(inQueryObject['$in'])) {
inQueryObject['$in'] = inQueryObject['$in'].concat(values);
} else {
inQueryObject['$in'] = values;
}
// Recurse to repeat // Recurse to repeat
return this.replaceInQuery(); return this.replaceInQuery();
@@ -251,7 +255,11 @@ RestQuery.prototype.replaceNotInQuery = function() {
}); });
} }
delete notInQueryObject['$notInQuery']; delete notInQueryObject['$notInQuery'];
notInQueryObject['$nin'] = values; if (Array.isArray(notInQueryObject['$nin'])) {
notInQueryObject['$nin'] = notInQueryObject['$nin'].concat(values);
} else {
notInQueryObject['$nin'] = values;
}
// Recurse to repeat // Recurse to repeat
return this.replaceNotInQuery(); return this.replaceNotInQuery();
@@ -290,7 +298,11 @@ RestQuery.prototype.replaceSelect = function() {
values.push(result[selectValue.key]); values.push(result[selectValue.key]);
} }
delete selectObject['$select']; delete selectObject['$select'];
selectObject['$in'] = values; if (Array.isArray(selectObject['$in'])) {
selectObject['$in'] = selectObject['$in'].concat(values);
} else {
selectObject['$in'] = values;
}
// Keep replacing $select clauses // Keep replacing $select clauses
return this.replaceSelect(); return this.replaceSelect();
@@ -329,7 +341,11 @@ RestQuery.prototype.replaceDontSelect = function() {
values.push(result[dontSelectValue.key]); values.push(result[dontSelectValue.key]);
} }
delete dontSelectObject['$dontSelect']; delete dontSelectObject['$dontSelect'];
dontSelectObject['$nin'] = values; if (Array.isArray(dontSelectObject['$nin'])) {
dontSelectObject['$nin'] = dontSelectObject['$nin'].concat(values);
} else {
dontSelectObject['$nin'] = values;
}
// Keep replacing $dontSelect clauses // Keep replacing $dontSelect clauses
return this.replaceDontSelect(); return this.replaceDontSelect();