diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-05-18 10:01:30 -0700 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-05-18 10:01:30 -0700 |
commit | 431e510fea97b955ce25151744596b7e76733c11 (patch) | |
tree | 35623da1a583b98d1e76a5a0ca3c6286af6d8887 | |
parent | f6c13efa2139a4067d4e45f2835a67312d8c8d72 (diff) | |
parent | 75bf8ed4b22a8bc8d43d38144025e4641a651cc3 (diff) |
Merge pull request #187 from s17t/master
Fix #174
-rw-r--r-- | db/feedmapper.php | 17 | ||||
-rw-r--r-- | tests/unit/db/FeedMapperTest.php | 38 |
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 +} |