diff --git a/lib/Connection.js b/lib/Connection.js index 292d854e..ed46ec02 100644 --- a/lib/Connection.js +++ b/lib/Connection.js @@ -1869,6 +1869,12 @@ function buildSearchQuery(options, extensions, info, isOrChild) { searchargs += ') ('; searchargs += buildSearchQuery(args[1], extensions, info, true); searchargs += ')'; + } else if (criteria === 'AND' && isOrChild) { + if (args.length < 2) + throw new Error('AND must have more than one argument'); + + searchargs += buildSearchQuery(args[0], extensions, info, true); + searchargs += buildSearchQuery(args.slice(1), extensions, info, false); } else { if (criteria[0] === '!') { modifier += 'NOT ';