Skip to content

some minor cleanups in query converter #206

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 1 commit into from
Dec 16, 2021
Merged

some minor cleanups in query converter #206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions src/PHPCR/Util/QOM/Sql2ToQomQueryConverter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use DateTime;
use Exception;
use InvalidArgumentException;
use Jackalope\Query\QOM\Selector;
use LogicException;
use PHPCR\PropertyType;
use PHPCR\Query\InvalidQueryException;
Expand All @@ -21,7 +20,6 @@
use PHPCR\Query\QOM\JoinInterface;
use PHPCR\Query\QOM\NotInterface;
use PHPCR\Query\QOM\OrderingInterface;
use PHPCR\Query\QOM\PropertyExistenceInterface;
use PHPCR\Query\QOM\PropertyValueInterface;
use PHPCR\Query\QOM\QueryObjectModelConstantsInterface as Constants;
use PHPCR\Query\QOM\QueryObjectModelFactoryInterface;
Expand Down Expand Up @@ -133,9 +131,7 @@ public function parse($sql2)

$columns = $this->buildColumns($columnData);

$query = $this->factory->createQuery($source, $constraint, $orderings, $columns);

return $query;
return $this->factory->createQuery($source, $constraint, $orderings, $columns);
}

/**
Expand All @@ -161,7 +157,7 @@ protected function parseSource()

/**
* 6.7.3. Selector
* Parse an SQL2 selector and return a QOM\Selector.
* Parse an SQL2 selector and return a QOM\SelectorInterface.
*
* @return SelectorInterface
*/
Expand Down Expand Up @@ -519,7 +515,7 @@ protected function parseOperator()
/**
* 6.7.18 PropertyExistence.
*
* @return PropertyExistenceInterface
* @return ConstraintInterface
*/
protected function parsePropertyExistence()
{
Expand Down