summaryrefslogtreecommitdiff
path: root/update_daemon2.php
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2008-01-24 18:54:36 +0100
committerAndrew Dolgov <[email protected]>2008-01-24 18:54:36 +0100
commit2240601ccf4ff9e9a25a2bc71eb0d2d6f826c9ee (patch)
treedac1e7c575c34a1191ad6a7397d5661bef6fe1c1 /update_daemon2.php
parentabfa57fdf00894a07f8c268c799ce9b225e5bc5b (diff)
daemons: fix feed select query for PGSQL
Diffstat (limited to 'update_daemon2.php')
-rw-r--r--update_daemon2.php13
1 files changed, 3 insertions, 10 deletions
diff --git a/update_daemon2.php b/update_daemon2.php
index cf25eeac2..315daa7e0 100644
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -194,20 +194,13 @@
$login_thresh_qpart = "";
}
- //if (DB_TYPE == "pgsql") {
- // $update_limit_qpart = "AND ttrss_feeds.last_updated < NOW() - INTERVAL '".(DAEMON_SLEEP_INTERVAL*2)." seconds'";
- //} else {
- // $update_limit_qpart = "AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ".(DAEMON_SLEEP_INTERVAL*2)." SECOND)";
- //}
-
if (DB_TYPE == "pgsql") {
- $update_limit_qpart = "AND ttrss_feeds.last_updated < NOW() - INTERVAL '".(DAEMON_SLEEP_INTERVAL*2)." seconds'";
$update_limit_qpart = "AND ((
ttrss_feeds.update_interval = 0
- AND ttrss_feeds.last_updated < NOW() - INTERVAL ttrss_user_prefs.value || ' minutes'
+ AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
) OR (
ttrss_feeds.update_interval > 0
- AND ttrss_feeds.last_updated < NOW() - INTERVAL ttrss_feeds.update_interval || ' minutes'
+ AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
))";
} else {
$update_limit_qpart = "AND ((
@@ -234,7 +227,7 @@
WHERE
ttrss_feeds.owner_uid = ttrss_users.id
AND ttrss_users.id = ttrss_user_prefs.owner_uid
- AND ttrss_user_prefs.pref_name='DEFAULT_UPDATE_INTERVAL'
+ AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
$login_thresh_qpart $update_limit_qpart
$updstart_thresh_qpart
ORDER BY $random_qpart DESC LIMIT " . DAEMON_FEED_LIMIT);