Move the check for if a Maintenance script supports --batch-size away from addDefault...

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

diff --git a/maintenance/update.php b/maintenance/update.php
index 75276ae..ef60a77 100644 (file)
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -5,13 +5,28 @@
  * This is used when the database schema is modified and we need to apply patches.
  * It is kept compatible with php 4 parsing so that it can give out a meaningful error.
  *
+ * 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
+ *
  * @file
  * @todo document
  * @ingroup Maintenance
  */
 
-if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.1.0' ) < 0 ) ) {
-       echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.1.0 or higher. ABORTING.\n" .
+if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.2.3' ) < 0 ) ) {
+       echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.2.3 or higher. ABORTING.\n" .
        "Check if you have a newer php executable with a different name, such as php5.\n";
        die( 1 );
 }
@@ -28,6 +43,7 @@ class UpdateMediaWiki extends Maintenance {
                $this->addOption( 'quick', 'Skip 5 second countdown before starting' );
                $this->addOption( 'doshared', 'Also update shared tables' );
                $this->addOption( 'nopurge', 'Do not purge the objectcache table after updates' );
+               $this->addOption( 'iknowwhatimdoing', 'Override when $wgMiserMode disables this script' );
        }
 
        function getDbType() {
@@ -35,7 +51,7 @@ class UpdateMediaWiki extends Maintenance {
                return 2 /* Maintenance::DB_ADMIN */;
        }
 
-       private function compatChecks() {
+       function compatChecks() {
                $test = new PhpXmlBugTester();
                if ( !$test->ok ) {
                        $this->error(
@@ -60,7 +76,13 @@ class UpdateMediaWiki extends Maintenance {
        }
 
        function execute() {
-               global $wgVersion, $wgTitle, $wgLang;
+               global $wgVersion, $wgTitle, $wgLang, $wgMiserMode;
+
+               if( $wgMiserMode && !$this->hasOption( 'iknowwhatimdoing' ) ) {
+                       $this->error( "Do not run update.php on this wiki. If you're seeing this you should\n"
+                               . "probably ask for some help in performing your schema updates.\n\n"
+                               . "If you know what you are doing, you can continue with --iknowwhatimdoing", true );
+               }
 
                $wgLang = Language::factory( 'en' );
                $wgTitle = Title::newFromText( "MediaWiki database updater" );
@@ -87,10 +109,14 @@ class UpdateMediaWiki extends Maintenance {
                }
 
                $shared = $this->hasOption( 'doshared' );
-               $purge = !$this->hasOption( 'nopurge' );
+
+               $updates = array('core','extensions');
+               if( !$this->hasOption('nopurge') ) {
+                       $updates[] = 'purge';
+               }
 
                $updater = DatabaseUpdater::newForDb( $db, $shared, $this );
-               $updater->doUpdates( $purge );
+               $updater->doUpdates( $updates );
 
                foreach( $updater->getPostDatabaseUpdateMaintenance() as $maint ) {
                        $child = $this->runChild( $maint );
@@ -116,4 +142,4 @@ class UpdateMediaWiki extends Maintenance {
 }
 
 $maintClass = 'UpdateMediaWiki';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );