Skip to content

Commit d5432db

Browse files
vjikvjik
authored
Remove "Condition" suffix from condition classes (#428)
1 parent 264e808 commit d5432db

6 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
- Chg #414: Rename `DMLQueryBuilder::insertWithReturningPks()` to `DMLQueryBuilder::insertReturningPks()` (@Tigrov)
4848
- Enh #415: Implement `CaseExpressionBuilder` class (@Tigrov)
4949
- Enh #420: Provide `yiisoft/db-implementation` virtual package (@vjik)
50-
- Enh #424, #425: Adapt to conditions refactoring in `yiisoft/db` package (@vjik)
50+
- Enh #424, #425, #428: Adapt to conditions refactoring in `yiisoft/db` package (@vjik)
5151

5252
## 1.3.0 March 21, 2024
5353

src/Builder/ArrayOverlapsConditionBuilder.php renamed to src/Builder/ArrayOverlapsBuilder.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@
1212
use Yiisoft\Db\Expression\ExpressionBuilderInterface;
1313
use Yiisoft\Db\Expression\ExpressionInterface;
1414
use Yiisoft\Db\Expression\JsonExpression;
15-
use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlapsCondition;
15+
use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlaps;
1616
use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
1717

1818
/**
19-
* Builds expressions for {@see ArrayOverlapsCondition} for PostgreSQL Server.
19+
* Builds expressions for {@see ArrayOverlaps} for PostgreSQL Server.
2020
*
21-
* @implements ExpressionBuilderInterface<ArrayOverlapsCondition>
21+
* @implements ExpressionBuilderInterface<ArrayOverlaps>
2222
*/
23-
final class ArrayOverlapsConditionBuilder implements ExpressionBuilderInterface
23+
final class ArrayOverlapsBuilder implements ExpressionBuilderInterface
2424
{
2525
public function __construct(
2626
private readonly QueryBuilderInterface $queryBuilder,
2727
) {
2828
}
2929

3030
/**
31-
* Build SQL for {@see ArrayOverlapsCondition}.
31+
* Build SQL for {@see ArrayOverlaps}.
3232
*
33-
* @param ArrayOverlapsCondition $expression The {@see ArrayOverlapsCondition} to be built.
33+
* @param ArrayOverlaps $expression The {@see ArrayOverlaps} to be built.
3434
*
3535
* @throws Exception
3636
* @throws InvalidArgumentException

src/Builder/JsonOverlapsConditionBuilder.php renamed to src/Builder/JsonOverlapsBuilder.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@
1212
use Yiisoft\Db\Expression\ExpressionBuilderInterface;
1313
use Yiisoft\Db\Expression\ExpressionInterface;
1414
use Yiisoft\Db\Expression\JsonExpression;
15-
use Yiisoft\Db\QueryBuilder\Condition\JsonOverlapsCondition;
15+
use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps;
1616
use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
1717

1818
/**
19-
* Builds expressions for {@see JsonOverlapsCondition} for PostgreSQL Server.
19+
* Builds expressions for {@see JsonOverlaps} for PostgreSQL Server.
2020
*
21-
* @implements ExpressionBuilderInterface<JsonOverlapsCondition>
21+
* @implements ExpressionBuilderInterface<JsonOverlaps>
2222
*/
23-
final class JsonOverlapsConditionBuilder implements ExpressionBuilderInterface
23+
final class JsonOverlapsBuilder implements ExpressionBuilderInterface
2424
{
2525
public function __construct(
2626
private readonly QueryBuilderInterface $queryBuilder,
2727
) {
2828
}
2929

3030
/**
31-
* Build SQL for {@see JsonOverlapsCondition}.
31+
* Build SQL for {@see JsonOverlaps}.
3232
*
33-
* @param JsonOverlapsCondition $expression The {@see JsonOverlapsCondition} to be built.
33+
* @param JsonOverlaps $expression The {@see JsonOverlaps} to be built.
3434
*
3535
* @throws Exception
3636
* @throws InvalidArgumentException

src/Builder/LikeConditionBuilder.php renamed to src/Builder/LikeBuilder.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
namespace Yiisoft\Db\Pgsql\Builder;
66

7-
use Yiisoft\Db\QueryBuilder\Condition\LikeCondition;
7+
use Yiisoft\Db\QueryBuilder\Condition\Like;
88

99
/**
10-
* Build an object of {@see LikeCondition} into SQL expressions for PostgreSQL Server.
10+
* Build an object of {@see Like} into SQL expressions for PostgreSQL Server.
1111
*/
12-
final class LikeConditionBuilder extends \Yiisoft\Db\QueryBuilder\Condition\Builder\LikeConditionBuilder
12+
final class LikeBuilder extends \Yiisoft\Db\QueryBuilder\Condition\Builder\LikeBuilder
1313
{
14-
protected function parseOperator(LikeCondition $expression): array
14+
protected function parseOperator(Like $expression): array
1515
{
1616
[$andor, $not, $operator] = parent::parseOperator($expression);
1717

‎src/DQLQueryBuilder.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
use Yiisoft\Db\Expression\JsonExpression;
1010
use Yiisoft\Db\Expression\StructuredExpression;
1111
use Yiisoft\Db\Pgsql\Builder\ArrayExpressionBuilder;
12-
use Yiisoft\Db\Pgsql\Builder\ArrayOverlapsConditionBuilder;
12+
use Yiisoft\Db\Pgsql\Builder\ArrayOverlapsBuilder;
1313
use Yiisoft\Db\Pgsql\Builder\CaseExpressionBuilder;
14-
use Yiisoft\Db\Pgsql\Builder\JsonOverlapsConditionBuilder;
15-
use Yiisoft\Db\Pgsql\Builder\LikeConditionBuilder;
14+
use Yiisoft\Db\Pgsql\Builder\JsonOverlapsBuilder;
15+
use Yiisoft\Db\Pgsql\Builder\LikeBuilder;
1616
use Yiisoft\Db\Pgsql\Builder\StructuredExpressionBuilder;
1717
use Yiisoft\Db\Pgsql\Builder\JsonExpressionBuilder;
1818
use Yiisoft\Db\QueryBuilder\AbstractDQLQueryBuilder;
19-
use Yiisoft\Db\QueryBuilder\Condition\LikeCondition;
20-
use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlapsCondition;
21-
use Yiisoft\Db\QueryBuilder\Condition\JsonOverlapsCondition;
19+
use Yiisoft\Db\QueryBuilder\Condition\Like;
20+
use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlaps;
21+
use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps;
2222

2323
/**
2424
* Implements a DQL (Data Query Language) SQL statements for PostgreSQL Server.
@@ -36,10 +36,10 @@ protected function defaultConditionClasses(): array
3636
{
3737
return [
3838
...parent::defaultConditionClasses(),
39-
'ILIKE' => LikeCondition::class,
40-
'NOT ILIKE' => LikeCondition::class,
41-
'OR ILIKE' => LikeCondition::class,
42-
'OR NOT ILIKE' => LikeCondition::class,
39+
'ILIKE' => Like::class,
40+
'NOT ILIKE' => Like::class,
41+
'OR ILIKE' => Like::class,
42+
'OR NOT ILIKE' => Like::class,
4343
];
4444
}
4545

@@ -48,11 +48,11 @@ protected function defaultExpressionBuilders(): array
4848
return [
4949
...parent::defaultExpressionBuilders(),
5050
ArrayExpression::class => ArrayExpressionBuilder::class,
51-
ArrayOverlapsCondition::class => ArrayOverlapsConditionBuilder::class,
51+
ArrayOverlaps::class => ArrayOverlapsBuilder::class,
5252
JsonExpression::class => JsonExpressionBuilder::class,
53-
JsonOverlapsCondition::class => JsonOverlapsConditionBuilder::class,
53+
JsonOverlaps::class => JsonOverlapsBuilder::class,
5454
StructuredExpression::class => StructuredExpressionBuilder::class,
55-
LikeCondition::class => LikeConditionBuilder::class,
55+
Like::class => LikeBuilder::class,
5656
CaseExpression::class => CaseExpressionBuilder::class,
5757
];
5858
}

‎tests/QueryBuilderTest.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
use Yiisoft\Db\Pgsql\Tests\Support\TestTrait;
1616
use Yiisoft\Db\Query\Query;
1717
use Yiisoft\Db\Query\QueryInterface;
18-
use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlapsCondition;
19-
use Yiisoft\Db\QueryBuilder\Condition\JsonOverlapsCondition;
18+
use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlaps;
19+
use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps;
2020
use Yiisoft\Db\Schema\Column\ColumnInterface;
2121
use Yiisoft\Db\Tests\Common\CommonQueryBuilderTest;
2222

@@ -456,34 +456,34 @@ public function testSelectScalar(array|bool|float|int|string $columns, string $e
456456
parent::testSelectScalar($columns, $expected);
457457
}
458458

459-
public function testArrayOverlapsConditionBuilder(): void
459+
public function testArrayOverlapsBuilder(): void
460460
{
461461
$db = $this->getConnection();
462462
$qb = $db->getQueryBuilder();
463463

464464
$params = [];
465-
$sql = $qb->buildExpression(new ArrayOverlapsCondition('column', [1, 2, 3]), $params);
465+
$sql = $qb->buildExpression(new ArrayOverlaps('column', [1, 2, 3]), $params);
466466

467467
$this->assertSame('"column"::text[] && ARRAY[1,2,3]::text[]', $sql);
468468
$this->assertSame([], $params);
469469

470470
// Test column as Expression
471471
$params = [];
472-
$sql = $qb->buildExpression(new ArrayOverlapsCondition(new Expression('column'), [1, 2, 3]), $params);
472+
$sql = $qb->buildExpression(new ArrayOverlaps(new Expression('column'), [1, 2, 3]), $params);
473473

474474
$this->assertSame('column::text[] && ARRAY[1,2,3]::text[]', $sql);
475475
$this->assertSame([], $params);
476476

477477
$db->close();
478478
}
479479

480-
public function testJsonOverlapsConditionBuilder(): void
480+
public function testJsonOverlapsBuilder(): void
481481
{
482482
$db = $this->getConnection();
483483
$qb = $db->getQueryBuilder();
484484

485485
$params = [];
486-
$sql = $qb->buildExpression(new JsonOverlapsCondition('column', [1, 2, 3]), $params);
486+
$sql = $qb->buildExpression(new JsonOverlaps('column', [1, 2, 3]), $params);
487487

488488
$this->assertSame(
489489
'ARRAY(SELECT jsonb_array_elements_text("column"::jsonb)) && ARRAY[1,2,3]::text[]',
@@ -502,21 +502,21 @@ public function testOverlapsCondition(iterable|ExpressionInterface $values, int
502502

503503
$count = $query
504504
->from('array_and_json_types')
505-
->where(new ArrayOverlapsCondition('intarray_col', $values))
505+
->where(new ArrayOverlaps('intarray_col', $values))
506506
->count();
507507

508508
$this->assertSame($expectedCount, $count);
509509

510510
$count = $query
511511
->from('array_and_json_types')
512-
->setWhere(new JsonOverlapsCondition('json_col', $values))
512+
->setWhere(new JsonOverlaps('json_col', $values))
513513
->count();
514514

515515
$this->assertSame($expectedCount, $count);
516516

517517
$count = $query
518518
->from('array_and_json_types')
519-
->setWhere(new JsonOverlapsCondition('jsonb_col', $values))
519+
->setWhere(new JsonOverlaps('jsonb_col', $values))
520520
->count();
521521

522522
$this->assertSame($expectedCount, $count);

0 commit comments

Comments
 (0)