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 #49832 from nextcloud/sharding-select-fixes

Browse source
This commit is contained in:
John Molakvoæ 2024-12-12 21:33:02 +01:00 committed by GitHub
commit 08e959d03f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/private/DB/QueryBuilder/Partitioned/PartitionedQueryBuilder.php
View file

@ -76,6 +76,9 @@ class PartitionedQueryBuilder extends ShardedQueryBuilder {
// we need to save selects until we know all the table aliases
public function select(...$selects) {
if (count($selects) === 1 && is_array($selects[0])) {
$selects = $selects[0];
}
$this->selects = [];
$this->addSelect(...$selects);
return $this;
@ -99,16 +102,33 @@ class PartitionedQueryBuilder extends ShardedQueryBuilder {
*
* This is mainly used to ensure that the returned rows from both sides of a partition contains the columns of the join predicate
*
* @param string $column
* @param string|IQueryFunction $column
* @return void
*/
private function ensureSelect(string|IQueryFunction $column, ?string $alias = null): void {
$checkColumn = $alias ?: $column;
if (str_contains($checkColumn, '.')) {
[, $checkColumn] = explode('.', $checkColumn);
[$table, $checkColumn] = explode('.', $checkColumn);
$partition = $this->getPartition($table);
} else {
$partition = null;
}
foreach ($this->selects as $select) {
if ($select['select'] === $checkColumn || $select['select'] === '*' || str_ends_with($select['select'], '.' . $checkColumn)) {
$select = $select['select'];
if (!is_string($select)) {
continue;
}
if (str_contains($select, '.')) {
[$table, $select] = explode('.', $select);
$selectPartition = $this->getPartition($table);
} else {
$selectPartition = null;
}
if (
($select === $checkColumn || $select === '*') &&
$selectPartition === $partition
) {
return;
}
}
@ -284,6 +304,7 @@ class PartitionedQueryBuilder extends ShardedQueryBuilder {
/**
* Split an array of predicates (WHERE query parts) by the partition they reference
*
* @param array $predicates
* @return array<string, array>
*/