summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--db/feedmapper.php17
-rw-r--r--tests/unit/db/FeedMapperTest.php38
2 files changed, 42 insertions, 13 deletions
diff --git a/db/feedmapper.php b/db/feedmapper.php
index 438f2e78c..227c5b13c 100644
--- a/db/feedmapper.php
+++ b/db/feedmapper.php
@@ -51,7 +51,10 @@ class FeedMapper extends Mapper implements IMapper {
StatusFlag::UNREAD . ' ' .
'WHERE `feeds`.`id` = ? ' .
'AND `feeds`.`user_id` = ? ' .
- 'GROUP BY `feeds`.`id`';
+ 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+ '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+ '`feeds`.`favicon_link`, `feeds`.`added`,'.
+ '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
$params = array($id, $userId);
$row = $this->findOneQuery($sql, $params);
@@ -89,7 +92,10 @@ class FeedMapper extends Mapper implements IMapper {
StatusFlag::UNREAD . ' ' .
'WHERE `feeds`.`user_id` = ? ' .
'AND `feeds`.`deleted_at` = 0 ' .
- 'GROUP BY `feeds`.`id`';
+ 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+ '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+ '`feeds`.`favicon_link`, `feeds`.`added`,'.
+ '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
$params = array($userId);
return $this->findAllRows($sql, $params);
@@ -116,7 +122,10 @@ class FeedMapper extends Mapper implements IMapper {
StatusFlag::UNREAD . ' ' .
'WHERE `feeds`.`url_hash` = ? ' .
'AND `feeds`.`user_id` = ? ' .
- 'GROUP BY `feeds`.`id`';
+ 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+ '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+ '`feeds`.`favicon_link`, `feeds`.`added`,'.
+ '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
$params = array($hash, $userId);
$row = $this->findOneQuery($sql, $params);
@@ -154,4 +163,4 @@ class FeedMapper extends Mapper implements IMapper {
}
-} \ No newline at end of file
+}
diff --git a/tests/unit/db/FeedMapperTest.php b/tests/unit/db/FeedMapperTest.php
index 8f7d139e1..6894e16d0 100644
--- a/tests/unit/db/FeedMapperTest.php
+++ b/tests/unit/db/FeedMapperTest.php
@@ -64,7 +64,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
StatusFlag::UNREAD . ' ' .
'WHERE `feeds`.`id` = ? ' .
'AND `feeds`.`user_id` = ? ' .
- 'GROUP BY `feeds`.`id`';
+ 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+ '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+ '`feeds`.`favicon_link`, `feeds`.`added`,'.
+ '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
$params = array($id, $userId);
$this->setMapperResult($sql, $params, $rows);
@@ -85,7 +88,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
StatusFlag::UNREAD . ' ' .
'WHERE `feeds`.`id` = ? ' .
'AND `feeds`.`user_id` = ? ' .
- 'GROUP BY `feeds`.`id`';
+ 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+ '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+ '`feeds`.`favicon_link`, `feeds`.`added`,'.
+ '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
$params = array($id, $userId);
$this->setMapperResult($sql, $params);
@@ -109,7 +115,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
StatusFlag::UNREAD . ' ' .
'WHERE `feeds`.`id` = ? ' .
'AND `feeds`.`user_id` = ? ' .
- 'GROUP BY `feeds`.`id`';
+ 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+ '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+ '`feeds`.`favicon_link`, `feeds`.`added`,'.
+ '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
$params = array($id, $userId);
$this->setMapperResult($sql, $params, $rows);
@@ -147,8 +156,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
StatusFlag::UNREAD . ' ' .
'WHERE `feeds`.`user_id` = ? ' .
'AND `feeds`.`deleted_at` = 0 ' .
- 'GROUP BY `feeds`.`id`';
-
+ 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+ '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+ '`feeds`.`favicon_link`, `feeds`.`added`,'.
+ '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
$this->setMapperResult($sql,
array($userId), $rows);
@@ -170,7 +181,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
StatusFlag::UNREAD . ' ' .
'WHERE `feeds`.`url_hash` = ? ' .
'AND `feeds`.`user_id` = ? ' .
- 'GROUP BY `feeds`.`id`';
+ 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+ '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+ '`feeds`.`favicon_link`, `feeds`.`added`,'.
+ '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
$this->setMapperResult($sql,
array($urlHash, $this->user), $row);
@@ -189,7 +203,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
StatusFlag::UNREAD . ' ' .
'WHERE `feeds`.`url_hash` = ? ' .
'AND `feeds`.`user_id` = ? ' .
- 'GROUP BY `feeds`.`id`';
+ 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+ '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+ '`feeds`.`favicon_link`, `feeds`.`added`,'.
+ '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
$this->setMapperResult($sql,
array($urlHash, $this->user));
@@ -212,7 +229,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
StatusFlag::UNREAD . ' ' .
'WHERE `feeds`.`url_hash` = ? ' .
'AND `feeds`.`user_id` = ? ' .
- 'GROUP BY `feeds`.`id`';
+ 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+ '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+ '`feeds`.`favicon_link`, `feeds`.`added`,'.
+ '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
$this->setMapperResult($sql,
array($urlHash, $this->user), $rows);
@@ -294,4 +314,4 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
}
-} \ No newline at end of file
+}