From 5b8fff99a50c42194df445d82c665f0123caf10e Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Mon, 27 Oct 2014 15:49:50 +0100 Subject: make cleanup faster --- db/itemmapper.php | 2 +- db/postgres/itemmapper.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'db') diff --git a/db/itemmapper.php b/db/itemmapper.php index b1763ed6a..41c2a6975 100644 --- a/db/itemmapper.php +++ b/db/itemmapper.php @@ -242,7 +242,7 @@ class ItemMapper extends NewsMapper { 'FROM `*PREFIX*news_items` `items` ' . 'JOIN `*PREFIX*news_feeds` `feeds` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . - 'WHERE NOT ((`items`.`status` & ?) > 0) ' . + 'AND NOT ((`items`.`status` & ?) > 0) ' . 'GROUP BY `items`.`feed_id`, `feeds`.`articles_per_update` ' . 'HAVING COUNT(*) > ?'; $params = [$status, $threshold]; diff --git a/db/postgres/itemmapper.php b/db/postgres/itemmapper.php index 643055f1a..f736fe54c 100644 --- a/db/postgres/itemmapper.php +++ b/db/postgres/itemmapper.php @@ -36,7 +36,7 @@ class ItemMapper extends \OCA\News\Db\ItemMapper { 'FROM `*PREFIX*news_items` `items` ' . 'JOIN `*PREFIX*news_feeds` `feeds` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . - 'WHERE NOT ((`items`.`status` & ?) > 0) ' . + 'AND NOT ((`items`.`status` & ?) > 0) ' . 'GROUP BY `items`.`feed_id`, `feeds`.`articles_per_update` ' . 'HAVING COUNT(*) > ?'; $params = [$status, $threshold]; -- cgit v1.2.3