From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 6 Mar 2019 22:01:20 +0000 (-0800)
Subject: Normalize "LEFT OUTER JOIN" to "LEFT JOIN" in SQL queries
X-Git-Tag: 1.34.0-rc.0~2619^2
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=1e4bf35253a6f672c57c1430c895049591fb090b;p=lhc%2Fweb%2Fwiklou.git

Normalize "LEFT OUTER JOIN" to "LEFT JOIN" in SQL queries

Change-Id: I4de7f0527d9e16f9128ef3b24567511d4c74245d
---

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index d7adb9b0d9..8b3d8649f0 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -141,7 +141,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
 					LIST_OR
 				) ];
 			}
-			$this->addJoinConds( [ 'ug1' => [ 'LEFT OUTER JOIN',
+			$this->addJoinConds( [ 'ug1' => [ 'LEFT JOIN',
 				array_merge( [
 					'ug1.ug_user=user_id',
 					'ug1.ug_expiry IS NULL OR ug1.ug_expiry >= ' . $db->addQuotes( $db->timestamp() )
diff --git a/includes/api/ApiQueryContributors.php b/includes/api/ApiQueryContributors.php
index 93cf016243..9057f1055b 100644
--- a/includes/api/ApiQueryContributors.php
+++ b/includes/api/ApiQueryContributors.php
@@ -176,7 +176,7 @@ class ApiQueryContributors extends ApiQueryBase {
 			$limitGroups = array_unique( $limitGroups );
 			$this->addTables( 'user_groups' );
 			$this->addJoinConds( [ 'user_groups' => [
-				$excludeGroups ? 'LEFT OUTER JOIN' : 'JOIN',
+				$excludeGroups ? 'LEFT JOIN' : 'JOIN',
 				[
 					'ug_user=' . $revQuery['fields']['rev_user'],
 					'ug_group' => $limitGroups,
diff --git a/maintenance/dumpUploads.php b/maintenance/dumpUploads.php
index b4df20fe01..a5bc6cc0bc 100644
--- a/maintenance/dumpUploads.php
+++ b/maintenance/dumpUploads.php
@@ -82,7 +82,7 @@ By default, outputs relative paths against the parent directory of $wgUploadDire
 
 		$sql = "SELECT DISTINCT il_to, img_name
 			FROM $imagelinks
-			LEFT OUTER JOIN $image
+			LEFT JOIN $image
 			ON il_to=img_name";
 		$result = $dbr->query( $sql );
 
diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index bfae4b71ed..e13468ea8b 100644
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -154,7 +154,7 @@ class Orphans extends Maintenance {
 			. "(this may take a while on a large wiki)\n" );
 		$result = $dbw->query( "
 			SELECT *
-			FROM $page LEFT OUTER JOIN $revision ON page_latest=rev_id
+			FROM $page LEFT JOIN $revision ON page_latest=rev_id
 		" );
 		$found = 0;
 		foreach ( $result as $row ) {