Skip to content

Commit

Permalink
Remove deprecated OCP\AppFramework\Db\Mapper
Browse files Browse the repository at this point in the history
Original PR: e-alfred#48

Fix error message: `Message: Class "OCP\AppFramework\Db\Mapper" not found`

Co-authored-by: <39592566+fcki1984@users.noreply.github.com>
Co-authored-by: Paul <devnoname120@gmail.com>
devnoname120 committed Jul 30, 2023
1 parent 2ce6b85 commit c1ffad3
Showing 3 changed files with 29 additions and 29 deletions.
25 changes: 14 additions & 11 deletions lib/Db/BookmarkMapper.php
Original file line number Diff line number Diff line change
@@ -36,19 +36,22 @@ public function __construct(IDBConnection $db, $UserId, Time $time) {
* @param string $name
* @return array
*/
public function get($fileId, $name, $type=null) {
$sql = "SELECT * FROM `*PREFIX*reader_bookmarks` WHERE file_id=? AND `user_id`=?";
$args = [ $fileId, $this->userId ];
if (!(null === $type)) {
$sql .= " AND `type`=?";
$args[] = $type;
public function get($fileId, $name, $type = null) {
$query = $this->db->getQueryBuilder();
$query->select('*')
->from($this->getTableName())
->where($query->expr()->eq('file_id', $query->createNamedParameter($fileId)))
->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($this->userId)));

if ($type !== null) {
$query->andWhere($query->expr()->eq('type', $query->createNamedParameter($type)));
}
if (!(null === $name)) {
$sql .= " AND `name`=?";
$args[] = $name;

if ($name !== null) {
$query->andWhere($query->expr()->eq('name', $query->createNamedParameter($name)));
}

return $this->findEntities($sql, $args);
return $this->findEntities($query);
}

/**
@@ -118,4 +121,4 @@ function($entity) {
);
}
}

25 changes: 11 additions & 14 deletions lib/Db/PreferenceMapper.php
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@

namespace OCA\Epubreader\Db;

use OCP\DB\QueryBuilder\IQueryBuilder;
use OCA\Epubreader\Utility\Time;
use OCP\IDBConnection;

@@ -29,22 +30,18 @@ public function __construct(IDBConnection $db, $UserId, Time $time) {
* @return array
*/
public function get($scope, $fileId, $name=null) {
if(!empty($name)) {
$sql = "SELECT * FROM `*PREFIX*reader_prefs` WHERE `scope`=? AND `file_id`=? AND `user_id`=? AND `name`=?";
$args = array(
$scope,
$fileId,
$this->userId,
$name);
} else {
$sql = "SELECT * FROM `*PREFIX*reader_prefs` WHERE `scope`=? AND `file_id`=? AND `user_id`=?";
$args = array(
$scope,
$fileId,
$this->userId);
$query = $this->db->getQueryBuilder();
$query->select('*')
->from($this->getTableName())
->where($query->expr()->eq('scope', $query->createNamedParameter($scope)))
->andWhere($query->expr()->eq('file_id', $query->createNamedParameter($fileId)))
->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($this->userId)));

if (!empty($name)) {
$query->andWhere($query->expr()->eq('name', $query->createNamedParameter($name)));
}

return $this->findEntities($sql, $args);
return $this->findEntities($query);
}

/**
8 changes: 4 additions & 4 deletions lib/Db/ReaderMapper.php
Original file line number Diff line number Diff line change
@@ -11,12 +11,12 @@
namespace OCA\Epubreader\Db;

use OCP\IDBConnection;
use OCP\AppFramework\Db\Mapper;
use OCP\AppFramework\Db\QBMapper;
use OCP\AppFramework\Db\Entity;

use OCA\Epubreader\Utility\Time;

abstract class ReaderMapper extends Mapper {
abstract class ReaderMapper extends QBMapper {

/**
* @var Time
@@ -28,12 +28,12 @@ public function __construct(IDBConnection $db, $table, $entity, Time $time) {
$this->time = $time;
}

public function update(Entity $entity) {
public function update(Entity $entity): Entity {
$entity->setLastModified($this->time->getMicroTime());
return parent::update($entity);
}

public function insert(Entity $entity) {
public function insert(Entity $entity): Entity {
$entity->setLastModified($this->time->getMicroTime());
return parent::insert($entity);
}

0 comments on commit c1ffad3

Please sign in to comment.