Address fixme on r101644 (bug 32325, bug 32263), originally for bug 31822. PHP 5...

[lhc/web/wiklou.git] / maintenance / sql.php

diff --git a/maintenance/sql.php b/maintenance/sql.php
index 16175bd..e1f2bb5 100644 (file)
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( "Maintenance.php" );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class MwSql extends Maintenance {
        public function __construct() {
@@ -39,9 +39,9 @@ class MwSql extends Maintenance {
                        $promptObject = new SqlPromptPrinter( "> " );
                        $promptCallback = $promptObject->cb();
                }
-       
+
                if ( !$file )
-                       $this->error( "Unable to open input file\n", true );
+                       $this->error( "Unable to open input file", true );
 
                $dbw = wfGetDB( DB_MASTER );
                $error = $dbw->sourceStream( $file, $promptCallback, array( $this, 'sqlPrintResult' ) );
@@ -61,7 +61,7 @@ class MwSql extends Maintenance {
                if ( !$res ) {
                        // Do nothing
                } elseif ( is_object( $res ) && $res->numRows() ) {
-                       while ( $row = $res->fetchObject() ) {
+                       foreach ( $res as $row ) {
                                $this->output( print_r( $row, true ) );
                        }
                } else {
@@ -69,6 +69,10 @@ class MwSql extends Maintenance {
                        $this->output( "Query OK, $affected row(s) affected\n" );
                }
        }
+
+       public function getDbType() {
+               return Maintenance::DB_ADMIN;
+       }
 }
 
 class SqlPromptPrinter {
@@ -86,4 +90,4 @@ class SqlPromptPrinter {
 }
 
 $maintClass = "MwSql";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );