Skip to content

Adapt to refactor "WITH" in Yii DB #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 27, 2025
Merged

Adapt to refactor "WITH" in Yii DB #373

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8386fb
Adapt to refactor "WITH" in Yii DB
vjik Oct 26, 2025
39bb59e
changelog
vjik Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/DQLQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Yiisoft\Db\Oracle\Builder\LongestBuilder;
use Yiisoft\Db\Oracle\Builder\ShortestBuilder;
use Yiisoft\Db\Query\Query;
use Yiisoft\Db\Query\WithQuery;
use Yiisoft\Db\QueryBuilder\AbstractDQLQueryBuilder;
use Yiisoft\Db\QueryBuilder\Condition\In;
use Yiisoft\Db\QueryBuilder\Condition\Like;
Expand Down Expand Up @@ -77,14 +78,18 @@ public function buildFrom(array|null $tables, array &$params): string
return parent::buildFrom($tables, $params);
}

public function buildWithQueries(array $withs, array &$params): string
public function buildWithQueries(array $withQueries, array &$params): string
{
/** @psalm-var array{query:string|Query, alias:ExpressionInterface|string, recursive:bool}[] $withs */
foreach ($withs as &$with) {
$with['recursive'] = false;
}

return parent::buildWithQueries($withs, $params);
$withQueries = array_map(
static fn(WithQuery $withQuery) => new WithQuery(
$withQuery->query,
$withQuery->alias,
false
),
$withQueries,
);

return parent::buildWithQueries($withQueries, $params);
}

protected function defaultExpressionBuilders(): array
Expand Down
Loading