Merge maintenance-work branch (now with less errors!):

* Docs have been updated to indicate the standard on how to write maintenance scripts (MW.org docs will follow) Have ported vast majority of maintenance scripts to new format. Remaining ones (mostly FiveUpgrade-related) are a bit more tricky. commandLine.inc is untouched for now. Many have gotten code-style updates as well. Deleted .inc files were only used by their .php counterparts, and have been merged into single files.
* (bug 11867) Lock error on redirect table when running orphans.php
* (bug 16322) Allow maintenance scripts to accept DB user/pass over input or params
* (bug 18566) Maintenance script to un/protect pages
* initStats overhaul, now uses class SiteStatsInit. Also fixes bug 18930

1 files changed, 62 insertions, 42 deletions

diff --git a/maintenance/sql.php b/maintenance/sql.php
index ab6546b9e08c..16175bdfaa5f 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -3,42 +3,74 @@
  * Send SQL queries from the specified file to the database, performing
  * variable replacement along the way.
  *
- * @file
- * @ingroup Database Maintenance
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/' . 'commandLine.inc' );
+require_once( "Maintenance.php" );
 
-if ( isset( $options['help'] ) ) {
-	echo "Send SQL queries to a MediaWiki database.\nUsage: php sql.php [<file>]\n";
-	exit( 1 );
-}
+class MwSql extends Maintenance {
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Send SQL queries to a MediaWiki database";
+	}
 
-if ( isset( $args[0] ) ) {
-	$fileName = $args[0];
-	$file = fopen( $fileName, 'r' );
-	$promptCallback = false;
-} else {
-	$file = STDIN;
-	$promptObject = new SqlPromptPrinter( "> " );
-	$promptCallback = $promptObject->cb();
-}
+	public function execute() {
+		if ( $this->hasArg() ) {
+			$fileName = $this->getArg();
+			$file = fopen( $fileName, 'r' );
+			$promptCallback = false;
+		} else {
+			$file = $this->getStdin();
+			$promptObject = new SqlPromptPrinter( "> " );
+			$promptCallback = $promptObject->cb();
+		}
+	
+		if ( !$file )
+			$this->error( "Unable to open input file\n", true );
 
-if ( !$file  ) {
-	echo "Unable to open input file\n";
-	exit( 1 );
-}
+		$dbw = wfGetDB( DB_MASTER );
+		$error = $dbw->sourceStream( $file, $promptCallback, array( $this, 'sqlPrintResult' ) );
+		if ( $error !== true ) {
+			$this->error( $error, true );
+		} else {
+			exit( 0 );
+		}
+	}
 
-$dbw =& wfGetDB( DB_MASTER );
-$error = $dbw->sourceStream( $file, $promptCallback, 'sqlPrintResult' );
-if ( $error !== true ) {
-	echo $error;
-	exit( 1 );
-} else {
-	exit( 0 );
+	/**
+	 * Print the results, callback for $db->sourceStream()
+	 * @param $res The results object
+	 * @param $db Database object
+	 */
+	public function sqlPrintResult( $res, $db ) {
+		if ( !$res ) {
+			// Do nothing
+		} elseif ( is_object( $res ) && $res->numRows() ) {
+			while ( $row = $res->fetchObject() ) {
+				$this->output( print_r( $row, true ) );
+			}
+		} else {
+			$affected = $db->affectedRows();
+			$this->output( "Query OK, $affected row(s) affected\n" );
+		}
+	}
 }
 
-//-----------------------------------------------------------------------------
 class SqlPromptPrinter {
 	function __construct( $prompt ) {
 		$this->prompt = $prompt;
@@ -53,17 +85,5 @@ class SqlPromptPrinter {
 	}
 }
 
-function sqlPrintResult( $res, $db ) {
-	if ( !$res ) {
-		// Do nothing
-	} elseif ( is_object( $res ) && $res->numRows() ) {
-		while ( $row = $res->fetchObject() ) {
-			print_r( $row );
-		}
-	} else {
-		$affected = $db->affectedRows();
-		echo "Query OK, $affected row(s) affected\n";
-	}
-}
-
-
+$maintClass = "MwSql";
+require_once( DO_MAINTENANCE );