Skip to content

Respect boolean operator preceding subquery #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 28, 2016
Merged

Respect boolean operator preceding subquery #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35fdf99
Respect boolean operator preceding subquery
Dec 20, 2016
e511ebc
Add test for negating subqueries
Dec 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/Node/Subquery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Gdbots\QueryParser\Node;

use Gdbots\QueryParser\Builder\QueryBuilder;
use Gdbots\QueryParser\Enum\BoolOperator;

final class Subquery extends Node
{
Expand All @@ -21,9 +22,13 @@ final class Subquery extends Node
*
* @throws \LogicException
*/
public function __construct(array $nodes, $useBoost = false, $boost = self::DEFAULT_BOOST)
{
parent::__construct(null, null, $useBoost, $boost);
public function __construct(
array $nodes,
BoolOperator $boolOperator = null,
$useBoost = false,
$boost = self::DEFAULT_BOOST
) {
parent::__construct(null, $boolOperator, $useBoost, $boost);
$this->nodes = $nodes;

foreach ($this->nodes as $node) {
Expand Down
4 changes: 2 additions & 2 deletions src/QueryParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ protected function handleFieldWithRange($fieldName, BoolOperator $boolOperator)
return new Field($fieldName, $nodes[0], $boolOperator, $m['use_boost'], $m['boost']);
}

$subquery = new Subquery($nodes, $m['use_boost'], $m['boost']);
$subquery = new Subquery($nodes, null, $m['use_boost'], $m['boost']);
return new Field($fieldName, $subquery, $boolOperator, $m['use_boost'], $m['boost']);
}

Expand Down Expand Up @@ -374,7 +374,7 @@ protected function handleSubquery(BoolOperator $queryBoolOperator)
return $nodes[0]::fromArray($data);
}

return new Subquery($nodes, $m['use_boost'], $m['boost']);
return new Subquery($nodes, $queryBoolOperator, $m['use_boost'], $m['boost']);
}

/**
Expand Down
38 changes: 37 additions & 1 deletion tests/Fixtures/test-queries.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1426,6 +1426,42 @@
new Subquery([new Word('word:a'), new Word('hashtag:b')]),
]
],

[
'name' => 'booleans before and in subqueries',
'input' => '"ipad pro" AND (gold OR silver)',
'expected_tokens' => [
[T::T_PHRASE, 'ipad pro'],
T::T_AND,
T::T_SUBQUERY_START,
[T::T_WORD, 'gold'],
T::T_OR,
[T::T_WORD, 'silver'],
T::T_SUBQUERY_END,
],
'expected_nodes' => [
new Phrase('ipad pro', BoolOperator::REQUIRED()),
new Subquery([new Word('gold'), new Word('silver')], BoolOperator::REQUIRED()),
]
],

[
'name' => 'booleans before and in subqueries 2',
'input' => '"iphone 7" -(16gb OR 32gb)',
'expected_tokens' => [
[T::T_PHRASE, 'iphone 7'],
T::T_PROHIBITED,
T::T_SUBQUERY_START,
[T::T_WORD, '16gb'],
T::T_OR,
[T::T_WORD, '32gb'],
T::T_SUBQUERY_END,
],
'expected_nodes' => [
new Phrase('iphone 7'),
new Subquery([new Word('16gb'), new Word('32gb')], BoolOperator::PROHIBITED()),
]
],
/*
* END: SUBQUERIES
*/
Expand Down Expand Up @@ -1569,7 +1605,7 @@
],
'expected_nodes' => [
new Phrase('john smith', null, true, 2.0),
new Subquery([new Word('foo'), new Word('bar')], true, 4.0),
new Subquery([new Word('foo'), new Word('bar')], null, true, 4.0),
]
],

Expand Down