Merge pull request #34038 from nextcloud/fix/migrate-TagMapper-to-QBMapper

Migrate TagMapper to QBMapper instead of deprecated Mapper

lib/private/Tagging/TagMapper.php

@@ -26,14 +26,14 @@
 namespace OC\Tagging;
 
 use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Db\Mapper;
+use OCP\AppFramework\Db\QBMapper;
 use OCP\IDBConnection;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 
 /**
  * Mapper for Tag entity
  */
-class TagMapper extends Mapper {
+class TagMapper extends QBMapper {
-
 	/**
 	 * Constructor.
 	 *
@@ -46,31 +46,34 @@ class TagMapper extends Mapper {
 	/**
 	 * Load tags from the database.
 	 *
-	 * @param array|string $owners The user(s) whose tags we are going to load.
+	 * @param array $owners The user(s) whose tags we are going to load.
 	 * @param string $type The type of item for which we are loading tags.
 	 * @return array An array of Tag objects.
 	 */
-	public function loadTags($owners, $type) {
+	public function loadTags(array $owners, string $type): array {
-		if (!is_array($owners)) {
+		$qb = $this->db->getQueryBuilder();
-			$owners = [$owners];
+		$qb->select(['id', 'uid', 'type', 'category'])
-		}
+			->from($this->getTableName())
-
+			->where($qb->expr()->in('uid', $qb->createNamedParameter($owners, IQueryBuilder::PARAM_STR_ARRAY)))
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_STR)))
-			. 'WHERE `uid` IN (' . str_repeat('?,', count($owners) - 1) . '?) AND `type` = ? ORDER BY `category`';
+			->orderBy('category');
-		return $this->findEntities($sql, array_merge($owners, [$type]));
+		return $this->findEntities($qb);
 	}
 
 	/**
 	 * Check if a given Tag object already exists in the database.
 	 *
 	 * @param Tag $tag The tag to look for in the database.
-	 * @return bool
 	 */
-	public function tagExists($tag) {
+	public function tagExists(Tag $tag): bool {
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+		$qb = $this->db->getQueryBuilder();
-			. 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
+		$qb->select(['id', 'uid', 'type', 'category'])
+			->from($this->getTableName())
+			->where($qb->expr()->eq('uid', $qb->createNamedParameter($tag->getOwner(), IQueryBuilder::PARAM_STR)))
+			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($tag->getType(), IQueryBuilder::PARAM_STR)))
+			->andWhere($qb->expr()->eq('category', $qb->createNamedParameter($tag->getName(), IQueryBuilder::PARAM_STR)));
 		try {
-			$this->findEntity($sql, [$tag->getOwner(), $tag->getType(), $tag->getName()]);
+			$this->findEntity($qb);
 		} catch (DoesNotExistException $e) {
 			return false;
 		}

tests/lib/ServerTest.php

@@ -151,7 +151,7 @@ class ServerTest extends \Test\TestCase {
 			['UserSession', '\OCP\IUserSession'],
 
 			['TagMapper', '\OC\Tagging\TagMapper'],
-			['TagMapper', '\OCP\AppFramework\Db\Mapper'],
+			['TagMapper', '\OCP\AppFramework\Db\QBMapper'],
 			['TagManager', '\OC\TagManager'],
 			['TagManager', '\OCP\ITagManager'],
 			['TempManager', '\OC\TempManager'],