diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2025-03-08 11:58:11 +0000 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2025-03-08 11:58:11 +0000 |
| commit | 1fc4eed6cd9d887b52ea09bab6bd1ff75c79c25c (patch) | |
| tree | 5291f35577606b4ca3984fa770aba6b2a989a636 /classes/RPC.php | |
| parent | 9983954bf1e303a9c3136c199c1c08c4f4ed0eef (diff) | |
| parent | 89b0332d3861ce2d9b37c690a32c98e961d7e219 (diff) | |
Merge branch 'feature/time-comparison-gen' into 'master'
Add and use 'Db::past_comparison_qpart()'.
See merge request tt-rss/tt-rss!105
Diffstat (limited to 'classes/RPC.php')
| -rw-r--r-- | classes/RPC.php | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/classes/RPC.php b/classes/RPC.php index 03786beaa..82f85fc11 100644 --- a/classes/RPC.php +++ b/classes/RPC.php @@ -281,11 +281,8 @@ class RPC extends Handler_Protected { } // Test if feed is currently being updated by another process. - if (Config::get(Config::DB_TYPE) == "pgsql") { - $updstart_thresh_qpart = "AND (last_update_started IS NULL OR last_update_started < NOW() - INTERVAL '5 minutes')"; - } else { - $updstart_thresh_qpart = "AND (last_update_started IS NULL OR last_update_started < DATE_SUB(NOW(), INTERVAL 5 MINUTE))"; - } + $updstart_thresh_qpart = 'AND (last_update_started IS NULL OR ' + . Db::past_comparison_qpart('last_update_started', '<', 5, 'minute') . ')'; $random_qpart = Db::sql_random_function(); @@ -528,11 +525,7 @@ class RPC extends Handler_Protected { $data["labels"] = Labels::get_all($_SESSION["uid"]); if (Config::get(Config::LOG_DESTINATION) == 'sql' && $_SESSION['access_level'] >= UserHelper::ACCESS_LEVEL_ADMIN) { - if (Config::get(Config::DB_TYPE) == 'pgsql') { - $log_interval = "created_at > NOW() - interval '1 hour'"; - } else { - $log_interval = "created_at > DATE_SUB(NOW(), INTERVAL 1 HOUR)"; - } + $log_interval = Db::past_comparison_qpart('created_at', '>', 1, 'hour'); $sth = $pdo->prepare("SELECT COUNT(id) AS cid FROM ttrss_error_log |