diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-08-19 12:37:27 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-08-19 12:38:13 +0200 |
| commit | 5a9015bf0ebb72758f1d345db6de9836b2dacc60 (patch) | |
| tree | 1f80b52967754ce4fee04ddcbdb76d451db02795 /db | |
| parent | abcfa5f3f178c3c624ce6bd1ce503ef5202a0112 (diff) | |
remove excessive group by, #540
Diffstat (limited to 'db')
| -rw-r--r-- | db/feedmapper.php | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/db/feedmapper.php b/db/feedmapper.php index 479cead28..589063362 100644 --- a/db/feedmapper.php +++ b/db/feedmapper.php @@ -38,11 +38,7 @@ class FeedMapper extends NewsMapper { StatusFlag::UNREAD . ' ' . 'WHERE `feeds`.`id` = ? ' . 'AND `feeds`.`user_id` = ? ' . - 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`, '. - '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`, '. - '`feeds`.`favicon_link`, `feeds`.`added`, ' . - '`feeds`.`articles_per_update`, `feeds`.`folder_id`, ' . - '`feeds`.`prevent_update`, `feeds`.`deleted_at`'; + 'GROUP BY `feeds`.`id`'; $params = [$id, $userId]; return $this->findEntity($sql, $params); @@ -67,11 +63,7 @@ class FeedMapper extends NewsMapper { 'OR `folders`.`deleted_at` = 0' . ')' . 'AND `feeds`.`deleted_at` = 0 ' . - 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'. - '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. - '`feeds`.`favicon_link`, `feeds`.`added`, ' . - '`feeds`.`articles_per_update`, `feeds`.`folder_id`, ' . - '`feeds`.`prevent_update`, `feeds`.`deleted_at`'; + 'GROUP BY `feeds`.`id`'; $params = [$userId]; return $this->findEntities($sql, $params); @@ -95,11 +87,7 @@ class FeedMapper extends NewsMapper { 'OR `folders`.`deleted_at` = 0' . ')' . 'AND `feeds`.`deleted_at` = 0 ' . - 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'. - '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. - '`feeds`.`favicon_link`, `feeds`.`added`, ' . - '`feeds`.`articles_per_update`, `feeds`.`folder_id`, ' . - '`feeds`.`prevent_update`, `feeds`.`deleted_at`'; + 'GROUP BY `feeds`.`id`'; return $this->findEntities($sql); } @@ -118,11 +106,7 @@ class FeedMapper extends NewsMapper { StatusFlag::UNREAD . ' ' . 'WHERE `feeds`.`url_hash` = ? ' . 'AND `feeds`.`user_id` = ? ' . - 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'. - '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. - '`feeds`.`favicon_link`, `feeds`.`added`, ' . - '`feeds`.`articles_per_update`, `feeds`.`folder_id`, ' . - '`feeds`.`prevent_update`, `feeds`.`deleted_at`'; + 'GROUP BY `feeds`.`id`'; $params = [$hash, $userId]; return $this->findEntity($sql, $params); |