Browse Source

Migrate TagMapper to QBMapper instead of deprecated Mapper

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
tags/v26.0.0beta1
Côme Chilliet 1 year ago
parent
commit
9b78699f0a
1 changed files with 18 additions and 10 deletions
  1. 18
    10
      lib/private/Tagging/TagMapper.php

+ 18
- 10
lib/private/Tagging/TagMapper.php View File

@@ -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.
*
@@ -50,14 +50,18 @@ class TagMapper extends Mapper {
* @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($owners, string $type): array {
if (!is_array($owners)) {
$owners = [$owners];
}

$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
. 'WHERE `uid` IN (' . str_repeat('?,', count($owners) - 1) . '?) AND `type` = ? ORDER BY `category`';
return $this->findEntities($sql, array_merge($owners, [$type]));
$qb = $this->db->getQueryBuilder();
$qb->select(['id', 'uid', 'type', 'category'])
->from($this->getTableName())
->where($qb->expr()->in('uid', $qb->createNamedParameter($owners, IQueryBuilder::PARAM_STR_ARRAY)))
->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_STR)))
->orderBy('category');
return $this->findEntities($qb);
}

/**
@@ -67,10 +71,14 @@ class TagMapper extends Mapper {
* @return bool
*/
public function tagExists($tag) {
$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
. 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
$qb = $this->db->getQueryBuilder();
$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;
}

Loading…
Cancel
Save