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 d7adb9b..8b3d864 100644 (file)
--- 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 93cf016..9057f10 100644 (file)
--- 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 b4df20f..a5bc6cc 100644 (file)
--- 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 bfae4b7..e13468e 100644 (file)
--- 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 ) {