Remove "Condition" suffix from condition classes (#411)

Author: vjik

CHANGELOG.md

@@ -46,7 +46,7 @@
 - Chg #399: Rename `insertWithReturningPks()` to `insertReturningPks()` in `Command` and `DMLQueryBuilder` classes (@Tigrov)
 - Enh #403: Refactor `DMLQueryBuilder::upsert()`, allow use `EXCLUDED` table alias to access inserted values (@Tigrov)
 - Enh #405: Provide `yiisoft/db-implementation` virtual package (@vjik)
-- Enh #407, #408: Adapt to conditions refactoring in `yiisoft/db` package (@vjik)
+- Enh #407, #408, #411: Adapt to conditions refactoring in `yiisoft/db` package (@vjik)
 
 ## 1.2.0 March 21, 2024
 

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

@@ -11,25 +11,25 @@
 use Yiisoft\Db\Expression\ExpressionBuilderInterface;
 use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Expression\JsonExpression;
-use Yiisoft\Db\QueryBuilder\Condition\JsonOverlapsCondition;
+use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
 
 /**
- * Builds expressions for {@see JsonOverlapsCondition} for MySQL Server.
+ * Builds expressions for {@see JsonOverlaps} for MySQL Server.
  *
- * @implements ExpressionBuilderInterface<JsonOverlapsCondition>
+ * @implements ExpressionBuilderInterface<JsonOverlaps>
  */
-final class JsonOverlapsConditionBuilder implements ExpressionBuilderInterface
+final class JsonOverlapsBuilder implements ExpressionBuilderInterface
 {
     public function __construct(
         private readonly QueryBuilderInterface $queryBuilder,
     ) {
     }
 
     /**
-     * Build SQL for {@see JsonOverlapsCondition}.
+     * Build SQL for {@see JsonOverlaps}.
      *
-     * @param JsonOverlapsCondition $expression The {@see JsonOverlapsCondition} to be built.
+     * @param JsonOverlaps $expression The {@see JsonOverlaps} to be built.
      *
      * @throws Exception
      * @throws InvalidArgumentException

src/Builder/LikeBuilder.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Mysql\Builder;
+
+use Yiisoft\Db\QueryBuilder\Condition\Like;
+
+/**
+ * Build an object of {@see Like} into SQL expressions for MySQL Server.
+ */
+final class LikeBuilder extends \Yiisoft\Db\QueryBuilder\Condition\Builder\LikeBuilder
+{
+    protected function prepareColumn(Like $expression, array &$params): string
+    {
+        $column = parent::prepareColumn($expression, $params);
+
+        if ($expression->caseSensitive === true) {
+            $column = 'BINARY ' . $column;
+        }
+
+        return $column;
+    }
+}

src/Builder/LikeConditionBuilder.php

@@ -5,11 +5,11 @@
 namespace Yiisoft\Db\Mysql;
 
 use Yiisoft\Db\Expression\ExpressionInterface;
-use Yiisoft\Db\Mysql\Builder\JsonOverlapsConditionBuilder;
-use Yiisoft\Db\Mysql\Builder\LikeConditionBuilder;
+use Yiisoft\Db\Mysql\Builder\JsonOverlapsBuilder;
+use Yiisoft\Db\Mysql\Builder\LikeBuilder;
 use Yiisoft\Db\QueryBuilder\AbstractDQLQueryBuilder;
-use Yiisoft\Db\QueryBuilder\Condition\JsonOverlapsCondition;
-use Yiisoft\Db\QueryBuilder\Condition\LikeCondition;
+use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps;
+use Yiisoft\Db\QueryBuilder\Condition\Like;
 
 use function ctype_digit;
 
@@ -74,8 +74,8 @@ protected function defaultExpressionBuilders(): array
     {
         return [
             ...parent::defaultExpressionBuilders(),
-            JsonOverlapsCondition::class => JsonOverlapsConditionBuilder::class,
-            LikeCondition::class => LikeConditionBuilder::class,
+            JsonOverlaps::class => JsonOverlapsBuilder::class,
+            Like::class => LikeBuilder::class,
         ];
     }
 }

src/DQLQueryBuilder.php

@@ -17,7 +17,7 @@
 use Yiisoft\Db\Mysql\Tests\Support\TestTrait;
 use Yiisoft\Db\Query\Query;
 use Yiisoft\Db\Query\QueryInterface;
-use Yiisoft\Db\QueryBuilder\Condition\JsonOverlapsCondition;
+use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps;
 use Yiisoft\Db\Schema\Column\ColumnInterface;
 use Yiisoft\Db\Tests\Common\CommonQueryBuilderTest;
 
@@ -652,7 +652,7 @@ public function testSelectScalar(array|bool|float|int|string $columns, string $e
         parent::testSelectScalar($columns, $expected);
     }
 
-    public function testJsonOverlapsConditionBuilder(): void
+    public function testJsonOverlapsBuilder(): void
     {
         $db = $this->getConnection();
         $serverVersion = $db->getServerInfo()->getVersion();
@@ -666,14 +666,14 @@ public function testJsonOverlapsConditionBuilder(): void
         $qb = $db->getQueryBuilder();
 
         $params = [];
-        $sql = $qb->buildExpression(new JsonOverlapsCondition('column', [1, 2, 3]), $params);
+        $sql = $qb->buildExpression(new JsonOverlaps('column', [1, 2, 3]), $params);
 
         $this->assertSame('JSON_OVERLAPS(`column`, :qp0)', $sql);
         $this->assertEquals([':qp0' => new Param('[1,2,3]', DataType::STRING)], $params);
 
         // Test column as Expression
         $params = [];
-        $sql = $qb->buildExpression(new JsonOverlapsCondition(new Expression('column'), [1, 2, 3]), $params);
+        $sql = $qb->buildExpression(new JsonOverlaps(new Expression('column'), [1, 2, 3]), $params);
 
         $this->assertSame('JSON_OVERLAPS(column, :qp0)', $sql);
         $this->assertEquals([':qp0' => new Param('[1,2,3]', DataType::STRING)], $params);
@@ -682,7 +682,7 @@ public function testJsonOverlapsConditionBuilder(): void
     }
 
     #[DataProviderExternal(QueryBuilderProvider::class, 'overlapsCondition')]
-    public function testJsonOverlapsCondition(iterable|ExpressionInterface $values, int $expectedCount): void
+    public function testJsonOverlaps(iterable|ExpressionInterface $values, int $expectedCount): void
     {
         $db = $this->getConnection();
         $serverVersion = $db->getServerInfo()->getVersion();
@@ -697,7 +697,7 @@ public function testJsonOverlapsCondition(iterable|ExpressionInterface $values,
 
         $count = (new Query($db))
             ->from('json_type')
-            ->where(new JsonOverlapsCondition('json_col', $values))
+            ->where(new JsonOverlaps('json_col', $values))
             ->count();
 
         $this->assertSame($expectedCount, $count);
@@ -706,7 +706,7 @@ public function testJsonOverlapsCondition(iterable|ExpressionInterface $values,
     }
 
     #[DataProviderExternal(QueryBuilderProvider::class, 'overlapsCondition')]
-    public function testJsonOverlapsConditionOperator(iterable|ExpressionInterface $values, int $expectedCount): void
+    public function testJsonOverlapsOperator(iterable|ExpressionInterface $values, int $expectedCount): void
     {
         $db = $this->getConnection();
         $serverVersion = $db->getServerInfo()->getVersion();