X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fupdate.php;h=ba1d8cdc62cddffbe3364440745529d263fb414b;hb=2a6ed8846065696a6cddd9e3a6dd4e1401e750a6;hp=20e6068540ca395d866fdad9dfca44000309c077;hpb=c5b413565930fe08f4d1ee315a5dd3941005c284;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/update.php b/maintenance/update.php
index 20e6068540..ba1d8cdc62 100644
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -40,7 +40,6 @@ require_once( __DIR__ . '/Maintenance.php' );
  * @ingroup Maintenance
  */
 class UpdateMediaWiki extends Maintenance {
-
 	function __construct() {
 		parent::__construct();
 		$this->mDescription = "MediaWiki database updater";
@@ -48,6 +47,8 @@ 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( 'noschema', 'Only do the updates that are not done during schema updates' );
+		$this->addOption( 'schema', 'Output SQL to do the schema updates instead of doing them.  Works even when $wgAllowSchemaUpdates is false', false, true );
 		$this->addOption( 'force', 'Override when $wgAllowSchemaUpdates disables this script' );
 	}
 
@@ -83,10 +84,24 @@ class UpdateMediaWiki extends Maintenance {
 	function execute() {
 		global $wgVersion, $wgTitle, $wgLang, $wgAllowSchemaUpdates;
 
-		if( !$wgAllowSchemaUpdates && !$this->hasOption( 'force' ) ) {
+		if( !$wgAllowSchemaUpdates && !( $this->hasOption( 'force' ) || $this->hasOption( 'schema' ) || $this->hasOption( 'noschema' ) ) ) {
 			$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 --force", true );
+				. "probably ask for some help in performing your schema updates or use\n"
+				. "the --noschema and --schema options to get an SQL file for someone\n"
+				. "else to inspect and run.\n\n"
+				. "If you know what you are doing, you can continue with --force\n", true );
+		}
+
+		$this->fileHandle = null;
+		if( substr( $this->getOption( 'schema' ), 0, 2 ) === "--" ) {
+			$this->error( "The --schema option requires a file as an argument.\n", true );
+		} else if( $this->hasOption( 'schema' ) ) {
+			$file = $this->getOption( 'schema' );
+			$this->fileHandle = fopen( $file, "w" );
+			if( $this->fileHandle === false ) {
+				$err = error_get_last();
+				$this->error( "Problem opening the schema file for writing: $file\n\t{$err['message']}", true );
+			}
 		}
 
 		$wgLang = Language::factory( 'en' );
@@ -120,7 +135,17 @@ class UpdateMediaWiki extends Maintenance {
 
 		$shared = $this->hasOption( 'doshared' );
 
-		$updates = array( 'core', 'extensions', 'stats' );
+		$updates = array( 'core', 'extensions' );
+		if( !$this->hasOption('schema') ) {
+			if( $this->hasOption('noschema') ) {
+				$updates[] = 'noschema';
+			}
+			$updates[] = 'stats';
+
+			if( !$this->hasOption('nopurge') ) {
+				$updates[] = 'purge';
+			}
+		}
 
 		$updater = DatabaseUpdater::newForDb( $db, $shared, $this );
 		$updater->doUpdates( $updates );
@@ -134,6 +159,8 @@ class UpdateMediaWiki extends Maintenance {
 			if ( !$isLoggedUpdate && $updater->updateRowExists( $maint ) ) {
 				continue;
 			}
+
+			$child = $this->runChild( $maint );
 			$child->execute();
 			if ( !$isLoggedUpdate ) {
 				$updater->insertUpdateRow( $maint );