Adapt to refactoring of condition objects (#371)

vjik · web-flow · commit e746652ad6c8 · 2025-07-21T13:54:33.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,7 @@
 - Enh #360, #361: Implement `DMLQueryBuilder::insertReturningPks()` method (@Tigrov)
 - Chg #362: Replace column and table name quote character from ` to " (@Tigrov)
 - Enh #368: Provide `yiisoft/db-implementation` virtual package (@vjik)
+- Enh #371: Adapt to conditions refactoring in `yiisoft/db` package (@vjik)
 
 ## 1.2.0 March 21, 2024
 
diff --git a/src/Builder/JsonOverlapsConditionBuilder.php b/src/Builder/JsonOverlapsConditionBuilder.php
@@ -8,18 +8,24 @@
 use InvalidArgumentException;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
+use Yiisoft\Db\Expression\ExpressionBuilderInterface;
 use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Expression\JsonExpression;
-use Yiisoft\Db\QueryBuilder\Condition\Builder\AbstractOverlapsConditionBuilder;
 use Yiisoft\Db\QueryBuilder\Condition\JsonOverlapsCondition;
+use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
 
 /**
  * Builds expressions for {@see JsonOverlapsCondition} for SQLite Server.
  *
- * @extends AbstractOverlapsConditionBuilder<JsonOverlapsCondition>
+ * @implements ExpressionBuilderInterface<JsonOverlapsCondition>
  */
-final class JsonOverlapsConditionBuilder extends AbstractOverlapsConditionBuilder
+final class JsonOverlapsConditionBuilder implements ExpressionBuilderInterface
 {
+    public function __construct(
+        private readonly QueryBuilderInterface $queryBuilder,
+    ) {
+    }
+
     /**
      * Build SQL for {@see JsonOverlapsCondition}.
      *
@@ -32,13 +38,14 @@ final class JsonOverlapsConditionBuilder extends AbstractOverlapsConditionBuilde
      */
     public function build(ExpressionInterface $expression, array &$params = []): string
     {
-        $column = $this->prepareColumn($expression->getColumn());
-        $values = $expression->getValues();
+        $column = $expression->column instanceof ExpressionInterface
+            ? $this->queryBuilder->buildExpression($expression->column)
+            : $this->queryBuilder->getQuoter()->quoteColumnName($expression->column);
 
+        $values = $expression->values;
         if (!$values instanceof ExpressionInterface) {
             $values = new JsonExpression($values);
         }
-
         $values = $this->queryBuilder->buildExpression($values, $params);
 
         return "EXISTS(SELECT value FROM json_each($column) INTERSECT SELECT value FROM json_each($values))=1";
diff --git a/src/Builder/LikeConditionBuilder.php b/src/Builder/LikeConditionBuilder.php
@@ -22,7 +22,7 @@ public function __construct(QueryBuilderInterface $queryBuilder)
 
     public function build(ExpressionInterface $expression, array &$params = []): string
     {
-        if ($expression->getCaseSensitive() === true) {
+        if ($expression->caseSensitive === true) {
             throw new NotSupportedException('SQLite doesn\'t support case-sensitive "LIKE" conditions.');
         }
         return parent::build($expression, $params);
diff --git a/src/DQLQueryBuilder.php b/src/DQLQueryBuilder.php
@@ -10,8 +10,8 @@
 use Yiisoft\Db\Query\QueryInterface;
 use Yiisoft\Db\QueryBuilder\AbstractDQLQueryBuilder;
 use Yiisoft\Db\QueryBuilder\Condition\InCondition;
-use Yiisoft\Db\QueryBuilder\Condition\JsonOverlapsCondition;
 use Yiisoft\Db\QueryBuilder\Condition\LikeCondition;
+use Yiisoft\Db\QueryBuilder\Condition\JsonOverlapsCondition;
 use Yiisoft\Db\Sqlite\Builder\InConditionBuilder;
 use Yiisoft\Db\Sqlite\Builder\JsonOverlapsConditionBuilder;
 use Yiisoft\Db\Sqlite\Builder\LikeConditionBuilder;
diff --git a/tests/Builder/InConditionBuilderTest.php b/tests/Builder/InConditionBuilderTest.php
@@ -17,7 +17,7 @@
 /**
  * @group sqlite
  */
-final class InconditionBuilderTest extends TestCase
+final class InConditionBuilderTest extends TestCase
 {
     use TestTrait;
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct(QueryBuilderInterface $queryBuilder)`
`22`	`22`
`23`	`23`	`public function build(ExpressionInterface $expression, array &$params = []): string`
`24`	`24`	`{`
`25`		`- if ($expression->getCaseSensitive() === true) {`
	`25`	`+ if ($expression->caseSensitive === true) {`
`26`	`26`	`throw new NotSupportedException('SQLite doesn\'t support case-sensitive "LIKE" conditions.');`
`27`	`27`	`}`
`28`	`28`	`return parent::build($expression, $params);`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`/**`
`18`	`18`	`* @group sqlite`
`19`	`19`	`*/`
`20`		`-final class InconditionBuilderTest extends TestCase`
	`20`	`+final class InConditionBuilderTest extends TestCase`
`21`	`21`	`{`
`22`	`22`	`use TestTrait;`
`23`	`23`