From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 7 Dec 2015 17:07:13 +0000 (+0300)
Subject: catchup_feed: proper fix for mysql 5.7
X-Git-Tag: 16.3~71
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a956648502ad55cce47bcce613fd938bd165caee;p=tt-rss.git

catchup_feed: proper fix for mysql 5.7
---

diff --git a/include/functions.php b/include/functions.php
index fb7b3244..b928a030 100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -1137,8 +1137,8 @@
 
 						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
-								(SELECT DISTINCT id FROM
-									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
+								(SELECT id FROM
+									(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 										AND owner_uid = $owner_uid AND unread = true AND feed_id IN
 											(SELECT id FROM ttrss_feeds WHERE $cat_qpart) AND $date_qpart) as tmp)");
 
@@ -1154,8 +1154,8 @@
 
 					db_query("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
-							(SELECT DISTINCT id FROM
-								(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
+							(SELECT id FROM
+								(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 									AND owner_uid = $owner_uid AND unread = true AND feed_id = $feed AND $date_qpart) as tmp)");
 
 				} else if ($feed < 0 && $feed > LABEL_BASE_INDEX) { // special, like starred
@@ -1163,16 +1163,16 @@
 					if ($feed == -1) {
 						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
-								(SELECT DISTINCT id FROM
-									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
+								(SELECT id FROM
+									(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 										AND owner_uid = $owner_uid AND unread = true AND marked = true AND $date_qpart) as tmp)");
 					}
 
 					if ($feed == -2) {
 						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
-								(SELECT DISTINCT id FROM
-									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
+								(SELECT id FROM
+									(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 										AND owner_uid = $owner_uid AND unread = true AND published = true AND $date_qpart) as tmp)");
 					}
 
@@ -1189,16 +1189,16 @@
 
 						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
-								(SELECT DISTINCT id FROM
-									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
+								(SELECT id FROM
+									(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 										AND owner_uid = $owner_uid AND score >= 0 AND unread = true AND $date_qpart AND $match_part) as tmp)");
 					}
 
 					if ($feed == -4) {
 						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
-								(SELECT DISTINCT id FROM
-									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
+								(SELECT id FROM
+									(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 										AND owner_uid = $owner_uid AND unread = true AND $date_qpart) as tmp)");
 					}
 
@@ -1208,8 +1208,8 @@
 
 					db_query("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
-							(SELECT DISTINCT id FROM
-								(SELECT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_user_labels2 WHERE ref_id = id
+							(SELECT id FROM
+								(SELECT DISTINCT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_user_labels2 WHERE ref_id = id
 									AND label_id = '$label_id' AND ref_id = article_id
 									AND owner_uid = $owner_uid AND unread = true AND $date_qpart) as tmp)");
 
@@ -1220,8 +1220,8 @@
 			} else { // tag
 				db_query("UPDATE ttrss_user_entries
 					SET unread = false, last_read = NOW() WHERE ref_id IN
-						(SELECT DISTINCT id FROM
-							(SELECT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_tags WHERE ref_id = ttrss_entries.id
+						(SELECT id FROM
+							(SELECT DISTINCT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_tags WHERE ref_id = ttrss_entries.id
 								AND post_int_id = int_id AND tag_name = '$feed'
 								AND ttrss_user_entries.owner_uid = $owner_uid AND unread = true AND $date_qpart) as tmp)");