From: Bram Schoenmakers <me@bramschoenmakers.nl>
Date: Thu, 19 Jun 2014 08:29:48 +0000 (+0200)
Subject: Fix for testing filters getting stuck sometimes.
X-Git-Tag: 1.13~11^2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7b3110c9c97346c7625fba81238d2119381e2247;p=tt-rss.git

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.
---

diff --git a/include/functions2.php b/include/functions2.php
index 5228d875..507c5343 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) {