From: Max Semenik <maxsem@users.mediawiki.org>
Date: Tue, 23 Feb 2010 12:24:19 +0000 (+0000)
Subject: Fixes for r62870. It still needs a patch for Oracle though
X-Git-Tag: 1.31.0-rc.0~37637
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=commitdiff_plain;h=93b9d905207dcbb588827c495891c4121b6d5578;p=lhc%2Fweb%2Fwiklou.git

Fixes for r62870. It still needs a patch for Oracle though
---

diff --git a/maintenance/archives/patch-mime_minor_length.sql b/maintenance/archives/patch-mime_minor_length.sql
index 7862c9ffc2..3a3c5c4fce 100644
--- a/maintenance/archives/patch-mime_minor_length.sql
+++ b/maintenance/archives/patch-mime_minor_length.sql
@@ -1,9 +1,10 @@
-ALTER TABLE /*$wgDBprefix*/filearchive
+ALTER TABLE /*_*/filearchive
   MODIFY COLUMN fa_minor_mime varbinary(100) default "unknown";
 
-ALTER TABLE /*$wgDBprefix*/image
+ALTER TABLE /*_*/image
   MODIFY COLUMN img_minor_mime varbinary(100) NOT NULL default "unknown";
   
-ALTER TABLE /*$wgDBprefix*/oldimage
+ALTER TABLE /*_*/oldimage
   MODIFY COLUMN oi_minor_mime varbinary(100) NOT NULL default "unknown";
   
+INSERT INTO /*_*/updatelog VALUES ('mime_minor_length');
\ No newline at end of file
diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index c8aa539630..775ecdcd5b 100644
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -169,6 +169,7 @@ $wgUpdates = array(
 		// A field changed name mid-release cycle, so fix it for anyone using
 		// trunk
 		array( 'rename_eu_wiki_id' ),
+		array( 'do_update_mime_minor_field' ),
 	),
 
 	'sqlite' => array(
@@ -194,7 +195,6 @@ $wgUpdates = array(
 		array( 'add_index', 'change_tag',    'change_tag_rc_tag', 'patch-change_tag-indexes.sql' ),
 		array( 'add_field', 'redirect',      'rd_interwiki',     'patch-rd_interwiki.sql' ),
 		array( 'do_update_transcache_field' ),
-		array( 'do_update_mime_minor_field' ),
 		// version-independent searchindex setup, added in 1.16
 		array( 'sqlite_setup_searchindex' ),
 	),
@@ -1357,10 +1357,14 @@ function do_update_transcache_field() {
 }
 
 function do_update_mime_minor_field() {
-	global $wgDatabase;
-	wfOut( "Altering all *_mime_minor fields to 100 bytes in size ... " );
-	$wgDatabase->sourceFile( archive( 'patch-mime_minor_length.sql' ) );
-	wfOut( "ok\n" );
+	if ( update_row_exists( 'mime_minor_length' ) ) {
+		wfOut( "*_mime_minor fields are already long enough.\n" );
+	} else {
+		global $wgDatabase;
+		wfOut( "Altering all *_mime_minor fields to 100 bytes in size ... " );
+		$wgDatabase->sourceFile( archive( 'patch-mime_minor_length.sql' ) );
+		wfOut( "ok\n" );
+	}
 }