refactor: remove where specification from SELECT getter

- search constraints are now fully in control of SystemTagsInFilesDetector::detectAssignedSystemTagsIn(), avoids duplication of a WHERE statement Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
nextcloud · May 10, 2023 · 1891d1e · 1891d1e
1 parent dbfd2f9
commit 1891d1e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/lib/private/Files/Cache/CacheQueryBuilder.php b/lib/private/Files/Cache/CacheQueryBuilder.php
@@ -55,7 +55,6 @@ public function selectTagUsage(): self {
 				$this->expr()->eq('systemtag.id', 'systemtagmap.systemtagid'),
 				$this->expr()->eq('systemtag.visibility', $this->createNamedParameter(true))
 			))
-			->where($this->expr()->like('systemtag.name', $this->createNamedParameter('_%')))
 			->groupBy('systemtag.name', 'systemtag.id', 'systemtag.visibility', 'systemtag.editable');
 
 		return $this;

diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php
@@ -35,7 +35,6 @@
 use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\Folder;
 use OCP\Files\IMimeTypeLoader;
-use OCP\Files\IRootFolder;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Search\ISearchBinaryOperator;
 use OCP\Files\Search\ISearchQuery;
@@ -228,5 +227,4 @@ public function getCachesAndMountPointsForSearch(Root $root, string $path, bool
 
 		return [$caches, $mountByMountPoint];
 	}
-
 }
diff --git a/lib/private/SystemTag/SystemTagsInFilesDetector.php b/lib/private/SystemTag/SystemTagsInFilesDetector.php
@@ -28,9 +28,11 @@
 
 use OC\Files\Cache\QuerySearchHelper;
 use OC\Files\Node\Root;
+use OC\Files\Search\SearchBinaryOperator;
 use OC\Files\Search\SearchComparison;
 use OC\Files\Search\SearchQuery;
 use OCP\Files\Folder;
+use OCP\Files\Search\ISearchBinaryOperator;
 use OCP\Files\Search\ISearchComparison;
 
 class SystemTagsInFilesDetector {
@@ -43,13 +45,15 @@ public function detectAssignedSystemTagsIn(
 		int $limit = 0,
 		int $offset = 0
 	): array {
+		$operator = new SearchComparison(ISearchComparison::COMPARE_LIKE, 'systemtag', '%');
 		// Currently query has to have exactly one search condition. If no media type is provided,
 		// we fall back to the presence of a system tag.
-		if (empty($filteredMediaType)) {
-			$query = new SearchQuery(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'systemtag', '%'), $limit, $offset, []);
-		} else {
-			$query = new SearchQuery(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'mimetype', $filteredMediaType . '/%'), $limit, $offset, []);
+		if (!empty($filteredMediaType)) {
+			$mimeOperator = new SearchComparison(ISearchComparison::COMPARE_LIKE, 'mimetype', $filteredMediaType . '/%');
+			$operator = new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND, [$operator, $mimeOperator]);
 		}
+
+		$query = new SearchQuery($operator, $limit, $offset, []);
 		[$caches, ] = $this->searchHelper->getCachesAndMountPointsForSearch(
 			$this->getRootFolder($folder),
 			$folder->getPath(),