valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't try to compare null value against anything

This commit is contained in:
Andrew Dolgov 2021-02-26 21:48:20 +03:00
parent c521e26a19
commit 126b1fd2de
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/rpc.php
View File

@ -248,27 +248,27 @@ class RPC extends Handler_Protected {
if (Config::get(Config::DB_TYPE) == "pgsql") { if (Config::get(Config::DB_TYPE) == "pgsql") {
$update_limit_qpart = "AND (( $update_limit_qpart = "AND ((
update_interval = 0 update_interval = 0
AND p.value != '-1' AND (p.value IS NULL OR p.value != '-1')
AND last_updated < NOW() - CAST((COALESCE(p.value, '$default_interval') || ' minutes') AS INTERVAL) AND last_updated < NOW() - CAST((COALESCE(p.value, '$default_interval') || ' minutes') AS INTERVAL)
) OR ( ) OR (
update_interval > 0 update_interval > 0
AND last_updated < NOW() - CAST((update_interval || ' minutes') AS INTERVAL) AND last_updated < NOW() - CAST((update_interval || ' minutes') AS INTERVAL)
) OR ( ) OR (
update_interval >= 0 update_interval >= 0
AND p.value != '-1' AND (p.value IS NULL OR p.value != '-1')
AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL) AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL)
))"; ))";
} else { } else {
$update_limit_qpart = "AND (( $update_limit_qpart = "AND ((
update_interval = 0 update_interval = 0
AND p.value != '-1' AND (p.value IS NULL OR p.value != '-1')
AND last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(COALESCE(p.value, '$default_interval'), SIGNED INTEGER) MINUTE) AND last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(COALESCE(p.value, '$default_interval'), SIGNED INTEGER) MINUTE)
) OR ( ) OR (
update_interval > 0 update_interval > 0
AND last_updated < DATE_SUB(NOW(), INTERVAL update_interval MINUTE) AND last_updated < DATE_SUB(NOW(), INTERVAL update_interval MINUTE)
) OR ( ) OR (
update_interval >= 0 update_interval >= 0
AND p.value != '-1' AND (p.value IS NULL OR p.value != '-1')
AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL) AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL)
))"; ))";
} }

8
classes/rssutils.php
View File

@ -78,27 +78,27 @@ class RSSUtils {
if (Config::get(Config::DB_TYPE) == "pgsql") { if (Config::get(Config::DB_TYPE) == "pgsql") {
$update_limit_qpart = "AND (( $update_limit_qpart = "AND ((
update_interval = 0 update_interval = 0
AND p.value != '-1' AND (p.value IS NULL OR p.value != '-1')
AND last_updated < NOW() - CAST((COALESCE(p.value, '$default_interval') || ' minutes') AS INTERVAL) AND last_updated < NOW() - CAST((COALESCE(p.value, '$default_interval') || ' minutes') AS INTERVAL)
) OR ( ) OR (
update_interval > 0 update_interval > 0
AND last_updated < NOW() - CAST((update_interval || ' minutes') AS INTERVAL) AND last_updated < NOW() - CAST((update_interval || ' minutes') AS INTERVAL)
) OR ( ) OR (
update_interval >= 0 update_interval >= 0
AND p.value != '-1' AND (p.value IS NULL OR p.value != '-1')
AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL) AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL)
))"; ))";
} else { } else {
$update_limit_qpart = "AND (( $update_limit_qpart = "AND ((
update_interval = 0 update_interval = 0
AND p.value != '-1' AND (p.value IS NULL OR p.value != '-1')
AND last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(COALESCE(p.value, '$default_interval'), SIGNED INTEGER) MINUTE) AND last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(COALESCE(p.value, '$default_interval'), SIGNED INTEGER) MINUTE)
) OR ( ) OR (
update_interval > 0 update_interval > 0
AND last_updated < DATE_SUB(NOW(), INTERVAL update_interval MINUTE) AND last_updated < DATE_SUB(NOW(), INTERVAL update_interval MINUTE)
) OR ( ) OR (
update_interval >= 0 update_interval >= 0
AND p.value != '-1' AND (p.value IS NULL OR p.value != '-1')
AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL) AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL)
))"; ))";
} }