Use WikiPage instead of Article to call updateCategoryCounts()

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

diff --git a/maintenance/sql.php b/maintenance/sql.php
index 1dbbe55..e1f2bb5 100644 (file)
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -3,11 +3,25 @@
  * 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( "Maintenance.php" );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class MwSql extends Maintenance {
        public function __construct() {
@@ -25,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' ) );
@@ -47,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 {
@@ -55,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 {
@@ -72,4 +90,4 @@ class SqlPromptPrinter {
 }
 
 $maintClass = "MwSql";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );