upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #48522 from nextcloud/fix/querybuilder/output-columns-aliases

Browse source
This commit is contained in:
Kate 2024-10-03 15:48:10 +02:00 committed by GitHub
commit 8638a89fca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/private/DB/QueryBuilder/QueryBuilder.php
View file

@ -582,6 +582,9 @@ class QueryBuilder implements IQueryBuilder {
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);
}
@ -591,14 +594,7 @@ class QueryBuilder implements IQueryBuilder {
}
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);
}
/**