From e516e2dde9460d61f34218cb209fd177fc296006 Mon Sep 17 00:00:00 2001 From: albertlast Date: Sun, 26 Jul 2020 14:44:17 +0200 Subject: [PATCH] Join On base table on left side Signed-off-by: albertlast albertlast@hotmail.de --- Sources/News.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Sources/News.php b/Sources/News.php index bb448b7571..8861c4b09c 100644 --- a/Sources/News.php +++ b/Sources/News.php @@ -859,9 +859,9 @@ function getXmlNews($xml_format, $ascending = false) COALESCE(mem.email_address, m.poster_email) AS poster_email, COALESCE(mem.real_name, m.poster_name) AS poster_name FROM {db_prefix}topics AS t - INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg) - INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board) - LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member) + INNER JOIN {db_prefix}messages AS m ON (t.id_first_msg = m.id_msg) + INNER JOIN {db_prefix}boards AS b ON (t.id_board = b.id_board) + LEFT JOIN {db_prefix}members AS mem ON (m.id_member = mem.id_member ) WHERE ' . $query_this_board . (empty($optimize_msg) ? '' : ' AND {raw:optimize_msg}') . (empty($board) ? '' : ' AND t.id_board = {int:current_board}') . ($modSettings['postmod_active'] ? ' @@ -1280,8 +1280,8 @@ function getXmlRecent($xml_format) $request = $smcFunc['db_query']('', ' SELECT m.id_msg FROM {db_prefix}messages AS m - INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board) - INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic) + INNER JOIN {db_prefix}boards AS b ON (m.id_board = b.id_board) + INNER JOIN {db_prefix}topics AS t ON (m.id_topic = t.id_topic) WHERE ' . $query_this_board . (empty($optimize_msg) ? '' : ' AND {raw:optimize_msg}') . (empty($board) ? '' : ' AND m.id_board = {int:current_board}') . ($modSettings['postmod_active'] ? ' @@ -1325,11 +1325,11 @@ function getXmlRecent($xml_format) COALESCE(memf.real_name, mf.poster_name) AS first_poster_name, COALESCE(mem.email_address, m.poster_email) AS poster_email, m.modified_time FROM {db_prefix}messages AS m - INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic) - INNER JOIN {db_prefix}messages AS mf ON (mf.id_msg = t.id_first_msg) - INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board) - LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member) - LEFT JOIN {db_prefix}members AS memf ON (memf.id_member = mf.id_member) + INNER JOIN {db_prefix}topics AS t ON (m.id_topic = t.id_topic) + INNER JOIN {db_prefix}messages AS mf ON (t.id_first_msg = mf.id_msg) + INNER JOIN {db_prefix}boards AS b ON (t.id_board = b.id_board) + LEFT JOIN {db_prefix}members AS mem ON (m.id_member = mem.id_member) + LEFT JOIN {db_prefix}members AS memf ON (mf.id_member = memf.id_member) WHERE m.id_msg IN ({array_int:message_list}) ' . (empty($board) ? '' : 'AND t.id_board = {int:current_board}') . ' ORDER BY m.id_msg DESC @@ -1362,7 +1362,7 @@ function getXmlRecent($xml_format) SELECT a.id_attach, a.filename, COALESCE(a.size, 0) AS filesize, a.mime_type, a.downloads, a.approved, m.id_topic AS topic FROM {db_prefix}attachments AS a - LEFT JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg) + LEFT JOIN {db_prefix}messages AS m ON (a.id_msg = m.id_msg) WHERE a.attachment_type = {int:attachment_type} AND a.id_msg = {int:message_id}', array( @@ -2146,7 +2146,7 @@ function getXmlPosts($xml_format, $ascending = false) SELECT a.id_attach, a.filename, COALESCE(a.size, 0) AS filesize, a.mime_type, a.downloads, a.approved, m.id_topic AS topic FROM {db_prefix}attachments AS a - LEFT JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg) + LEFT JOIN {db_prefix}messages AS m ON (a.id_msg = m.id_msg) WHERE a.attachment_type = {int:attachment_type} AND a.id_msg = {int:message_id}', array( @@ -2573,8 +2573,8 @@ function getXmlPMs($xml_format, $ascending = false) SELECT pm2.id_pm, COALESCE(memf.real_name, pm2.from_name) AS from_name, ' . $select_id_members_to . ' AS id_members_to, ' . $select_to_names . ' AS to_names FROM {db_prefix}personal_messages AS pm2 INNER JOIN {db_prefix}pm_recipients AS pmr ON (pm2.id_pm = pmr.id_pm) - INNER JOIN {db_prefix}members AS mem ON (mem.id_member = pmr.id_member) - LEFT JOIN {db_prefix}members AS memf ON (memf.id_member = pm2.id_member_from) + INNER JOIN {db_prefix}members AS mem ON (pmr.id_member = mem.id_member) + LEFT JOIN {db_prefix}members AS memf ON (pm2.id_member_from = memf.id_member) WHERE pm2.id_pm > {int:start_after} AND ( (pm2.id_member_from = {int:uid} AND pm2.deleted_by_sender = {int:not_deleted}) @@ -2583,7 +2583,7 @@ function getXmlPMs($xml_format, $ascending = false) GROUP BY pm2.id_pm ORDER BY pm2.id_pm {raw:ascdesc} LIMIT {int:limit} - ) AS nis ON nis.id_pm = pm.id_pm + ) AS nis ON pm.id_pm = nis.id_pm ORDER BY pm.id_pm {raw:ascdesc}', array( 'limit' => $context['xmlnews_limit'],