Skip to content

GitLab

Merged
Created by Евгений Кремнёв@e.kremnevMaintainer

fix: исправлены спецификации EqualsAll и NotEqualsAll

Compare
and
4 files
+ 129
- 47
src/Langu‎age/Specs‎
Equals‎All.php‎ +19 -15
NotEqual‎sAll.php‎ +25 -17
tests‎/Unit‎
ApiQLUni‎tTest.php‎ +84 -14
.phpunit.r‎esult.cache‎ +1 -1
src/Language/Specs/EqualsAll.php
+ 19
- 15
Show all unchanged lines Show 20 lines
{
use JsonField;
private $parameter;
private $field;
private $value;
/**
* @param string $parameter - query parameter
* @param string $field - query parameter
* @param mixed $value - parameter value
*/
public function __construct(string $parameter, $value)
public function __construct(string $field, $value)
{
$this->parameter = $parameter;
$this->field = $field;
$this->value = $value;
}
Show 20 lines Show all unchanged lines Show 20 lines
public function match(QueryBuilder $queryBuilder): string
{
if (is_array($this->value)) {
$values = $this->value;
$value = sprintf('\'{%s}\'', implode(',', $this->value));
} else {
$values = explode(",", $this->value);
}
$orValues = [];
foreach ($values as $index => $value) {
$queryBuilder->setParameter(sprintf("%s_%s", $this->parameter, $index), $value);
$orValues[] = $queryBuilder->expr()->eq(
sprintf(":%s_%s", $this->parameter, $index),
sprintf("ANY (ARRAY[%s])", $this->parameter)
);
$value = sprintf('\'{%s}\'', $this->value);
}
return $queryBuilder->expr()->andX(...$orValues);
$parameter = sprintf(":%s", $this->field);
$andValues = [
sprintf('%s <@ %s', $this->field, $parameter),
sprintf('%s @> %s', $this->field, $parameter),
];
$queryBuilder->setParameter($parameter, $value);
return $queryBuilder->expr()->eq(
sprintf("(%s)", $queryBuilder->expr()->andX(...$andValues)),
'true'
);
}
}
src/Language/Specs/NotEqualsAll.php
+ 25
- 17
Show all unchanged lines Show 20 lines
{
use JsonField;
private $parameter;
/**
* @var string
*/
private $field;
/**
* @var mixed
*/
private $value;
/**
* @param string $parameter - query parameter
* @param string $field - query parameter
* @param mixed $value - parameter value
*/
public function __construct(string $parameter, $value)
public function __construct(string $field, $value)
{
$this->parameter = $parameter;
$this->field = $field;
$this->value = $value;
}
Show 20 lines Show all unchanged lines Show 20 lines
public function match(QueryBuilder $queryBuilder): string
{
if (is_array($this->value)) {
$values = $this->value;
$value = sprintf('\'{%s}\'', implode(',', $this->value));
} else {
$values = explode(",", $this->value);
}
$orValues = [];
foreach ($values as $index => $value) {
$queryBuilder->setParameter(sprintf("%s_%s", $this->parameter, $index), $value);
$orValues[] = $queryBuilder->expr()->eq(
sprintf(":%s_%s", $this->parameter, $index),
sprintf("ANY (ARRAY[%s])", $this->parameter)
);
$value = sprintf('\'{%s}\'', $this->value);
}
return $queryBuilder->expr()->eq(
sprintf("(%s)", $queryBuilder->expr()->andX(...$orValues)),
'false'
$parameter = sprintf(":%s", $this->field);
$andValues = [
sprintf('%s <@ %s', $this->field, $parameter),
sprintf('%s @> %s', $this->field, $parameter),
];
$queryBuilder->setParameter($parameter, $value);
return $queryBuilder->expr()->neq(
sprintf("(%s)", $queryBuilder->expr()->andX(...$andValues)),
'true'
);
}
}
tests/Unit/ApiQLUnitTest.php
+ 84
- 14
Show all unchanged lines Show 20 lines
$qb->select('u.id')
->from('users', 'u');
$query = ["types" => "developer", "spec" => "equals_all"];
$query = ["types" => "1,2,3", "spec" => "equals_all"];
$api = new ApiQL($query, $qb);
$api->execute();
self::assertEquals('SELECT u.id FROM users u WHERE :types_0 = ALL (ARRAY[types])', (string) $qb);
self::assertEquals(
'SELECT u.id FROM users u WHERE ((types <@ :types) AND (types @> :types)) = true',
(string) $qb
);
self::assertCount(1, $qb->getParameters());
self::assertEquals("developer", $qb->getParameters()["types_0"]);
self::assertEquals("'{1,2,3}'", $qb->getParameters()[":types"]);
$qb = new QueryBuilder($this->conn);
$qb->select('u.id')
->from('users', 'u');
$query = ["types" => "1,2,3", "spec" => "EqualsAll"];
$api = new ApiQL($query, $qb);
$api->execute();
self::assertEquals(
'SELECT u.id FROM users u WHERE ((types <@ :types) AND (types @> :types)) = true',
(string) $qb
);
self::assertCount(1, $qb->getParameters());
self::assertEquals("'{1,2,3}'", $qb->getParameters()[":types"]);
$qb = new QueryBuilder($this->conn);
$qb->select('u.id')
->from('users', 'u');
$query = ["types" => "developer", "spec" => "EqualsAll"];
$query = ["equals_all" => ["types" => "1,2,3"]];
$api = new ApiQL($query, $qb);
$api->execute();
self::assertEquals('SELECT u.id FROM users u WHERE :types_0 = ALL (ARRAY[types])', (string) $qb);
self::assertEquals(
'SELECT u.id FROM users u WHERE ((types <@ :types) AND (types @> :types)) = true',
(string) $qb
);
self::assertCount(1, $qb->getParameters());
self::assertEquals("developer", $qb->getParameters()["types_0"]);
self::assertEquals("'{1,2,3}'", $qb->getParameters()[":types"]);
$qb = new QueryBuilder($this->conn);
$qb->select('u.id')
->from('users', 'u');
$query = ["equals_all" => ["types" => "developer"]];
$query = ["equals_all" => ["types" => [1, 2, 3]]];
$api = new ApiQL($query, $qb);
$api->execute();
self::assertEquals('SELECT u.id FROM users u WHERE :types_0 = ALL (ARRAY[types])', (string) $qb);
self::assertEquals(
'SELECT u.id FROM users u WHERE ((types <@ :types) AND (types @> :types)) = true',
(string) $qb
);
self::assertCount(1, $qb->getParameters());
self::assertEquals("developer", $qb->getParameters()["types_0"]);
self::assertEquals("'{1,2,3}'", $qb->getParameters()[":types"]);
}
public function testNotEqualsAllSpec(): void
{
$qb = new QueryBuilder($this->conn);
$qb->select('u.id')
->from('users', 'u');
$query = ["types" => "developer,admin", "spec" => "EqualsAll"];
$query = ["types" => "1,2,3", "spec" => "not_equals_all"];
$api = new ApiQL($query, $qb);
$api->execute();
self::assertEquals(
'SELECT u.id FROM users u WHERE (:types_0 = ALL (ARRAY[types])) OR (:types_1 = ALL (ARRAY[types]))',
'SELECT u.id FROM users u WHERE ((types <@ :types) AND (types @> :types)) <> true',
(string) $qb
);
self::assertCount(2, $qb->getParameters());
self::assertEquals("developer", $qb->getParameters()["types_0"]);
self::assertEquals("admin", $qb->getParameters()["types_1"]);
self::assertCount(1, $qb->getParameters());
self::assertEquals("'{1,2,3}'", $qb->getParameters()[":types"]);
$qb = new QueryBuilder($this->conn);
$qb->select('u.id')
->from('users', 'u');
$query = ["types" => "1,2,3", "spec" => "NotEqualsAll"];
$api = new ApiQL($query, $qb);
$api->execute();
self::assertEquals(
'SELECT u.id FROM users u WHERE ((types <@ :types) AND (types @> :types)) <> true',
(string) $qb
);
self::assertCount(1, $qb->getParameters());
self::assertEquals("'{1,2,3}'", $qb->getParameters()[":types"]);
$qb = new QueryBuilder($this->conn);
$qb->select('u.id')
->from('users', 'u');
$query = ["not_equals_all" => ["types" => "1,2,3"]];
$api = new ApiQL($query, $qb);
$api->execute();
self::assertEquals(
'SELECT u.id FROM users u WHERE ((types <@ :types) AND (types @> :types)) <> true',
(string) $qb
);
self::assertCount(1, $qb->getParameters());
self::assertEquals("'{1,2,3}'", $qb->getParameters()[":types"]);
$qb = new QueryBuilder($this->conn);
$qb->select('u.id')
->from('users', 'u');
$query = ["not_equals_all" => ["types" => [1, 2, 3]]];
$api = new ApiQL($query, $qb);
$api->execute();
self::assertEquals(
'SELECT u.id FROM users u WHERE ((types <@ :types) AND (types @> :types)) <> true',
(string) $qb
);
self::assertCount(1, $qb->getParameters());
self::assertEquals("'{1,2,3}'", $qb->getParameters()[":types"]);
}
public function testTransliterationParameter(): void
Show 20 lines Show all unchanged lines
.phpunit.result.cache
+ 1
- 1

Menu

Help