diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-06-29 12:58:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-29 12:58:20 +0300 |
| commit | 46a49dee8af8c62d0e71385123bf6f0b8b0a1eb4 (patch) | |
| tree | 68c0f31d32482d4d35f61ac6f6ab5606dfed2dee | |
| parent | f74b3eea3748e636f9292131ae1031e0e201da8a (diff) | |
| parent | f326b54e5378b0beffe54f1de83359a71d9d167e (diff) | |
Merge pull request #32994 from nextcloud/fix/extended-query-search
Search without join on filecache_extended
| -rw-r--r-- | lib/private/Files/Cache/CacheQueryBuilder.php | 12 | ||||
| -rw-r--r-- | lib/private/Files/Cache/QuerySearchHelper.php | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lib/private/Files/Cache/CacheQueryBuilder.php b/lib/private/Files/Cache/CacheQueryBuilder.php index b92e79aa229..496a8361d77 100644 --- a/lib/private/Files/Cache/CacheQueryBuilder.php +++ b/lib/private/Files/Cache/CacheQueryBuilder.php @@ -41,12 +41,16 @@ class CacheQueryBuilder extends QueryBuilder { parent::__construct($connection, $systemConfig, $logger); } - public function selectFileCache(string $alias = null) { + public function selectFileCache(string $alias = null, bool $joinExtendedCache = true) { $name = $alias ? $alias : 'filecache'; $this->select("$name.fileid", 'storage', 'path', 'path_hash', "$name.parent", "$name.name", 'mimetype', 'mimepart', 'size', 'mtime', - 'storage_mtime', 'encrypted', 'etag', 'permissions', 'checksum', 'metadata_etag', 'creation_time', 'upload_time', 'unencrypted_size') - ->from('filecache', $name) - ->leftJoin($name, 'filecache_extended', 'fe', $this->expr()->eq("$name.fileid", 'fe.fileid')); + 'storage_mtime', 'encrypted', 'etag', 'permissions', 'checksum', 'unencrypted_size') + ->from('filecache', $name); + + if ($joinExtendedCache) { + $this->addSelect('metadata_etag', 'creation_time', 'upload_time'); + $this->leftJoin($name, 'filecache_extended', 'fe', $this->expr()->eq("$name.fileid", 'fe.fileid')); + } $this->alias = $name; diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php index e7bccbf521c..69a2944b2dd 100644 --- a/lib/private/Files/Cache/QuerySearchHelper.php +++ b/lib/private/Files/Cache/QuerySearchHelper.php @@ -103,7 +103,7 @@ class QuerySearchHelper { $builder = $this->getQueryBuilder(); - $query = $builder->selectFileCache('file'); + $query = $builder->selectFileCache('file', false); if ($this->searchBuilder->shouldJoinTags($searchQuery->getSearchOperation())) { $user = $searchQuery->getUser(); |