diff options
author | Bram Schoenmakers <[email protected]> | 2014-06-19 10:29:48 +0200 |
---|---|---|
committer | Bram Schoenmakers <[email protected]> | 2014-06-19 10:29:48 +0200 |
commit | 7b3110c9c97346c7625fba81238d2119381e2247 (patch) | |
tree | 001e46f8d99b0b1fcec50c6112b56eba8358d958 /include/functions2.php | |
parent | 32ae0fc2a2c9909d753f649d87fda45a29e66362 (diff) |
Fix for testing filters getting stuck sometimes.
Sometimes when testing a filter the database becomes unresponsive, stuck
in a long query.
Solution: properly join ttrss_entries and ttrss_user_entries instead of
working with their carthesian product.
Diffstat (limited to 'include/functions2.php')
-rw-r--r-- | include/functions2.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/functions2.php b/include/functions2.php index 5228d875c..507c5343e 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -426,8 +426,10 @@ // Try to check if SQL regexp implementation chokes on a valid regexp - $result = db_query("SELECT true AS true_val FROM ttrss_entries, - ttrss_user_entries, ttrss_feeds + $result = db_query("SELECT true AS true_val + FROM ttrss_entries + JOIN ttrss_user_entries ON ttrss_entries.id = ttrss_user_entries.ref_id + JOIN ttrss_feeds ON ttrss_feeds.id = ttrss_user_entries.feed_id WHERE $filter_query_part LIMIT 1", false); if ($result) { |