yetangitu/files_reader
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

- Revert to oc_reader_prefs to avoid problem with "too long index name", this undoes the change in 1.5.2.

Browse source 
- reduce maximum database string column size to 3999 to get around '4000 length limit' (https://github.com/nextcloud/server/issues/31791)
This commit is contained in:
Frank de Lange 2022-09-24 22:14:54 +00:00
parent 5e20a5b7ce
commit d875ae571b
8 changed files with 30 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/Db/PreferenceMapper.php
View file

@ -16,12 +16,12 @@ use OCP\IDBConnection;
class PreferenceMapper extends ReaderMapper {
public function __construct(IDBConnection $db, $UserId, Time $time) {
parent::__construct($db, 'reader_preferences', Preference::class, $time);
parent::__construct($db, 'reader_prefs', Preference::class, $time);
$this->userId = $UserId;
}
/**
* @brief get preferences for $scope+$fileId+$userId(+$name)
* @brief get prefs for $scope+$fileId+$userId(+$name)
*
* @param string $scope
* @param int $fileId
@ -30,14 +30,14 @@ class PreferenceMapper extends ReaderMapper {
*/
public function get($scope, $fileId, $name=null) {
if(!empty($name)) {
$sql = "SELECT * FROM `*PREFIX*reader_preferences` WHERE `scope`=? AND `file_id`=? AND `user_id`=? AND `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_preferences` WHERE `scope`=? AND `file_id`=? AND `user_id`=?";
$sql = "SELECT * FROM `*PREFIX*reader_prefs` WHERE `scope`=? AND `file_id`=? AND `user_id`=?";
$args = array(
$scope,
$fileId,
@ -83,7 +83,7 @@ class PreferenceMapper extends ReaderMapper {
/* currently not used*/
public function deleteForFileId($fileId) {
$sql = "SELECT * FROM `*PREFIX*reader_preferences` WHERE file_id=?";
$sql = "SELECT * FROM `*PREFIX*reader_prefs` WHERE file_id=?";
$args = [ $fileId ];
array_map(
function($entity) {
@ -94,7 +94,7 @@ class PreferenceMapper extends ReaderMapper {
/* currently not used*/
public function deleteForUserId($userId) {
$sql = "SELECT * FROM `*PREFIX*reader_preferences` WHERE user_id=?";
$sql = "SELECT * FROM `*PREFIX*reader_prefs` WHERE user_id=?";
$args = [ $userId ];
array_map(
function($entity) {