Adapt to split Like condition in Yii DB (#436)

Author: vjik

src/Builder/LikeBuilder.php

@@ -5,22 +5,18 @@
 namespace Yiisoft\Db\Pgsql\Builder;
 
 use Yiisoft\Db\QueryBuilder\Condition\Like;
+use Yiisoft\Db\QueryBuilder\Condition\NotLike;
 
 /**
  * Build an object of {@see Like} into SQL expressions for PostgreSQL Server.
  */
 final class LikeBuilder extends \Yiisoft\Db\QueryBuilder\Condition\Builder\LikeBuilder
 {
-    protected function parseOperator(Like $condition): array
+    protected function getOperatorData(Like|NotLike $condition): array
     {
-        [$not, $operator] = parent::parseOperator($condition);
-
-        $operator = match ($condition->caseSensitive) {
-            true => 'LIKE',
-            false => 'ILIKE',
-            default => $operator,
+        return match ($condition::class) {
+            Like::class => [false, $condition->caseSensitive === false ? 'ILIKE' : 'LIKE'],
+            NotLike::class => [true, $condition->caseSensitive === false ? 'NOT ILIKE' : 'NOT LIKE'],
         };
-
-        return [$not, $operator];
     }
 }

src/DQLQueryBuilder.php

@@ -19,28 +19,13 @@
 use Yiisoft\Db\QueryBuilder\Condition\Like;
 use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlaps;
 use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps;
+use Yiisoft\Db\QueryBuilder\Condition\NotLike;
 
 /**
  * Implements a DQL (Data Query Language) SQL statements for PostgreSQL Server.
  */
 final class DQLQueryBuilder extends AbstractDQLQueryBuilder
 {
-    /**
-     * Has an array of default condition classes.
-     *
-     * Extend this method if you want to change default condition classes for the query builder.
-     *
-     * {@see conditionClasses} docs for details.
-     */
-    protected function defaultConditionClasses(): array
-    {
-        return [
-            ...parent::defaultConditionClasses(),
-            'ILIKE' => Like::class,
-            'NOT ILIKE' => Like::class,
-        ];
-    }
-
     protected function defaultExpressionBuilders(): array
     {
         return [
@@ -51,6 +36,7 @@ protected function defaultExpressionBuilders(): array
             JsonOverlaps::class => JsonOverlapsBuilder::class,
             StructuredExpression::class => StructuredExpressionBuilder::class,
             Like::class => LikeBuilder::class,
+            NotLike::class => LikeBuilder::class,
             CaseExpression::class => CaseExpressionBuilder::class,
         ];
     }

tests/Provider/QueryBuilderProvider.php

@@ -66,34 +66,34 @@ public static function buildCondition(): array
             * {@see https://www.postgresql.org/docs/8.3/static/functions-matching.html#FUNCTIONS-LIKE}
             */
             /* empty values */
-            [['ilike', 'name', []], '0=1', []],
-            [['not ilike', 'name', []], '', []],
-            [['ilike', 'name', [], 'conjunction' => LikeConjunction::Or], '0=1', []],
-            [['not ilike', 'name', [], 'conjunction' => LikeConjunction::Or], '', []],
+            [['like', 'name', [], 'caseSensitive' => false], '0=1', []],
+            [['not like', 'name', [], 'caseSensitive' => false], '', []],
+            [['like', 'name', [], 'conjunction' => LikeConjunction::Or, 'caseSensitive' => false], '0=1', []],
+            [['not like', 'name', [], 'conjunction' => LikeConjunction::Or, 'caseSensitive' => false], '', []],
 
             /* simple ilike */
-            [['ilike', 'name', 'heyho'], '"name" ILIKE :qp0', [':qp0' => new Param('%heyho%', DataType::STRING)]],
-            [['not ilike', 'name', 'heyho'], '"name" NOT ILIKE :qp0', [':qp0' => new Param('%heyho%', DataType::STRING)]],
-            [['ilike', 'name', 'heyho', 'conjunction' => LikeConjunction::Or], '"name" ILIKE :qp0', [':qp0' => new Param('%heyho%', DataType::STRING)]],
-            [['not ilike', 'name', 'heyho', 'conjunction' => LikeConjunction::Or], '"name" NOT ILIKE :qp0', [':qp0' => new Param('%heyho%', DataType::STRING)]],
+            [['like', 'name', 'heyho', 'caseSensitive' => false], '"name" ILIKE :qp0', [':qp0' => new Param('%heyho%', DataType::STRING)]],
+            [['not like', 'name', 'heyho', 'caseSensitive' => false], '"name" NOT ILIKE :qp0', [':qp0' => new Param('%heyho%', DataType::STRING)]],
+            [['like', 'name', 'heyho', 'conjunction' => LikeConjunction::Or, 'caseSensitive' => false], '"name" ILIKE :qp0', [':qp0' => new Param('%heyho%', DataType::STRING)]],
+            [['not like', 'name', 'heyho', 'conjunction' => LikeConjunction::Or, 'caseSensitive' => false], '"name" NOT ILIKE :qp0', [':qp0' => new Param('%heyho%', DataType::STRING)]],
 
             /* ilike for many values */
             [
-                ['ilike', 'name', ['heyho', 'abc']],
+                ['like', 'name', ['heyho', 'abc'], 'caseSensitive' => false],
                 '"name" ILIKE :qp0 AND "name" ILIKE :qp1',
                 [':qp0' => new Param('%heyho%', DataType::STRING), ':qp1' => new Param('%abc%', DataType::STRING)],
             ],
             [
-                ['not ilike', 'name', ['heyho', 'abc']],
+                ['not like', 'name', ['heyho', 'abc'], 'caseSensitive' => false],
                 '"name" NOT ILIKE :qp0 AND "name" NOT ILIKE :qp1',
                 [':qp0' => new Param('%heyho%', DataType::STRING), ':qp1' => new Param('%abc%', DataType::STRING)],
             ],
             [
-                ['ilike', 'name', ['heyho', 'abc'], 'conjunction' => LikeConjunction::Or],
+                ['like', 'name', ['heyho', 'abc'], 'conjunction' => LikeConjunction::Or, 'caseSensitive' => false],
                 '"name" ILIKE :qp0 OR "name" ILIKE :qp1', [':qp0' => new Param('%heyho%', DataType::STRING), ':qp1' => new Param('%abc%', DataType::STRING)],
             ],
             [
-                ['not ilike', 'name', ['heyho', 'abc'], 'conjunction' => LikeConjunction::Or],
+                ['not like', 'name', ['heyho', 'abc'], 'conjunction' => LikeConjunction::Or, 'caseSensitive' => false],
                 '"name" NOT ILIKE :qp0 OR "name" NOT ILIKE :qp1',
                 [':qp0' => new Param('%heyho%', DataType::STRING), ':qp1' => new Param('%abc%', DataType::STRING)],
             ],