* Fix r74790 by actually calling setup (using parent::setup)

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

diff --git a/maintenance/patchSql.php b/maintenance/patchSql.php
index 122f23a..9c59d6a 100644 (file)
--- a/maintenance/patchSql.php
+++ b/maintenance/patchSql.php
@@ -21,31 +21,31 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class PatchSql extends Maintenance {
        public function __construct() {
                parent::__construct();
                $this->mDescription = "Run an SQL file into the DB, replacing prefix and charset vars";
-               $this->addArgs( array( 'patch-name' ) );
+               $this->addArg( 'patch-name', 'Name of the patch file, either full path or in maintenance/archives' );
        }
 
-       protected function getDbType() {
+       public function getDbType() {
                return Maintenance::DB_ADMIN;
        }
 
        public function execute() {
                $dbw = wfGetDB( DB_MASTER );
-               foreach( $this->mArgs as $arg ) {
+               foreach ( $this->mArgs as $arg ) {
                        $files = array(
                                $arg,
-                               DatabaseBase::patchPath( $arg ),
-                               DatabaseBase::patchPath( "patch-$arg.sql" ),
+                               $dbw->patchPath( $arg ),
+                               $dbw->patchPath( "patch-$arg.sql" ),
                        );
-                       foreach( $files as $file ) {
-                               if( file_exists( $file ) ) {
+                       foreach ( $files as $file ) {
+                               if ( file_exists( $file ) ) {
                                        $this->output( "$file ...\n" );
-                                       $dbw->fileSource( $file );
+                                       $dbw->sourceFile( $file );
                                        continue 2;
                                }
                        }