improve

Author: vjik

src/DQLQueryBuilder.php

@@ -78,7 +78,7 @@ public function build(QueryInterface $query, array $params = []): array
             $sql = "$sql$this->separator$union";
         }
 
-        $with = $this->buildWith($query->getWith(), $params);
+        $with = $this->buildWithQueries($query->getWithQueries(), $params);
 
         if ($with !== '') {
             $sql = "$with$this->separator$sql";

tests/QueryBuilderTest.php

@@ -16,6 +16,7 @@
 use Yiisoft\Db\Expression\Value\Param;
 use Yiisoft\Db\Query\Query;
 use Yiisoft\Db\Query\QueryInterface;
+use Yiisoft\Db\Query\WithQuery;
 use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps;
 use Yiisoft\Db\Schema\Column\ColumnInterface;
 use Yiisoft\Db\Sqlite\Tests\Provider\QueryBuilderProvider;
@@ -248,8 +249,10 @@ public function testBuildWithQuery(): void
         $with2Query = (new Query($db))->select('id')->from('t2')->innerJoin('a1', 't2.id = a1.id')->where('expr = 2');
         $with3Query = (new Query($db))->select('id')->from('t3')->where('expr = 3');
         $query = (new Query($db))
-            ->addWith($with1Query, 'a1')
-            ->addWith($with2Query->union($with3Query), 'a2')
+            ->withQueries(
+                new WithQuery($with1Query, 'a1'),
+                new WithQuery($with2Query->union($with3Query), 'a2'),
+            )
             ->from('a2');
 
         [$sql, $queryParams] = $qb->build($query);