Skip to content

feat(comparison): Add contains / containedBy methods to Comparison expression #25

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
veewee merged 1 commit into from
Apr 13, 2026
Merged

feat(comparison): Add contains / containedBy methods to Comparison expression #25

Show file tree
Hide file tree
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: 10 additions & 0 deletions src/Expression/Comparison.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ public static function lessThanOrEqual(Expression $left, Expression $right): sel
return new self($left, '<=', $right);
}

public static function contains(Expression $left, Expression $right): self
{
return new self($left, '@>', $right);
}

public static function containedBy(Expression $left, Expression $right): self
{
return new self($left, '<@', $right);
Comment thread
ElwynVdb marked this conversation as resolved.
}

/**
* @return non-empty-string
*/
Expand Down
96 changes: 96 additions & 0 deletions tests/Integration/Expression/ComparisonTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,100 @@ public function it_can_perform_less_than_or_equal_comparison_checks(): void
self::assertSame($actualResults[1], true);
self::assertSame($actualResults[2], false);
}

#[Test]
public function it_can_perform_contains_checks_on_arrays(): void
{
$qb = $this->connection()->createQueryBuilder();
$qb->select(
Comparison::contains(
new SqlExpression('ARRAY[1,2,3]'),
new SqlExpression('ARRAY[1,2]')
)->toSQL(),
Comparison::contains(
new SqlExpression('ARRAY[1,2]'),
new SqlExpression('ARRAY[1,2,3]')
)->toSQL()
);

$actualResults = $qb->fetchNumeric();
if (!$actualResults) {
$this->fail('No results found');
}

self::assertSame($actualResults[0], true);
self::assertSame($actualResults[1], false);
}

#[Test]
public function it_can_perform_contains_checks_on_jsonb(): void
{
$qb = $this->connection()->createQueryBuilder();
$qb->select(
Comparison::contains(
new SqlExpression("'[\"ROLE_USER\", \"ROLE_ADMIN\"]'::jsonb"),
new SqlExpression("'[\"ROLE_USER\"]'::jsonb")
)->toSQL(),
Comparison::contains(
new SqlExpression("'[\"ROLE_USER\"]'::jsonb"),
new SqlExpression("'[\"ROLE_ADMIN\"]'::jsonb")
)->toSQL()
);

$actualResults = $qb->fetchNumeric();
if (!$actualResults) {
$this->fail('No results found');
}

self::assertSame($actualResults[0], true);
self::assertSame($actualResults[1], false);
}

#[Test]
public function it_can_perform_contained_by_checks_on_arrays(): void
{
$qb = $this->connection()->createQueryBuilder();
$qb->select(
Comparison::containedBy(
new SqlExpression('ARRAY[1,2]'),
new SqlExpression('ARRAY[1,2,3]')
)->toSQL(),
Comparison::containedBy(
new SqlExpression('ARRAY[1,2,3]'),
new SqlExpression('ARRAY[1,2]')
)->toSQL()
);

$actualResults = $qb->fetchNumeric();
if (!$actualResults) {
$this->fail('No results found');
}

self::assertSame($actualResults[0], true);
self::assertSame($actualResults[1], false);
}

#[Test]
public function it_can_perform_contained_by_checks_on_jsonb(): void
{
$qb = $this->connection()->createQueryBuilder();
$qb->select(
Comparison::containedBy(
new SqlExpression("'[\"ROLE_USER\"]'::jsonb"),
new SqlExpression("'[\"ROLE_USER\", \"ROLE_ADMIN\"]'::jsonb")
)->toSQL(),
Comparison::containedBy(
new SqlExpression("'[\"ROLE_ADMIN\"]'::jsonb"),
new SqlExpression("'[\"ROLE_USER\"]'::jsonb")
)->toSQL()
);

$actualResults = $qb->fetchNumeric();
if (!$actualResults) {
$this->fail('No results found');
}

self::assertSame($actualResults[0], true);
self::assertSame($actualResults[1], false);
}
}
Loading