Skip to content

[stable30] fix(QueryBuilder): Account for aliases in output columns #48558

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
sorbaugh merged 1 commit into from
Oct 8, 2024
Merged

[stable30] fix(QueryBuilder): Account for aliases in output columns #48558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fix(QueryBuilder): Account for aliases in output columns 
Signed-off-by: provokateurin <[email protected]>
  • Loading branch information
@provokateurin @backportbot
provokateurin authored and backportbot[bot] committed Oct 3, 2024
commit aab30afc25f43960bef7f2ee2f507c83283a8afe
12 changes: 4 additions & 8 deletions lib/private/DB/QueryBuilder/QueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,9 @@ private function addOutputColumns(array $columns): void {
if (is_array($column)) {
$this->addOutputColumns($column);
} elseif (is_string($column) && !str_contains($column, '*')) {
if (str_contains(strtolower($column), ' as ')) {
[, $column] = preg_split('/ as /i', $column);
}
if (str_contains($column, '.')) {
[, $column] = explode('.', $column);
}
Expand All @@ -591,14 +594,7 @@ private function addOutputColumns(array $columns): void {
}

public function getOutputColumns(): array {
return array_unique(array_map(function (string $column) {
if (str_contains($column, '.')) {
[, $column] = explode('.', $column);
return $column;
} else {
return $column;
}
}, $this->selectedColumns));
return array_unique($this->selectedColumns);
}

/**
Expand Down