From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 3 Jul 2005 09:05:35 +0000 (+0000)
Subject: * FiveUpgrade: large table hacks, install iw_trans update before links
X-Git-Tag: 1.5.0beta2~48
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=29557cfbd3281363e6aca96e0b656c2dfb0b5a06;p=lhc%2Fweb%2Fwiklou.git

* FiveUpgrade: large table hacks, install iw_trans update before links
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6e5e23c4b9..beead2ac4b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -454,6 +454,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Fix diff order on Enhanced RC 'changes' link
 * (bug 2650) Fix national date type display on wikis that don't support
   dynamic date conversion.
+* FiveUpgrade: large table hacks, install iw_trans update before links
 
 
 === Caveats ===
diff --git a/maintenance/FiveUpgrade.inc b/maintenance/FiveUpgrade.inc
index b509c40d1f..34a0929880 100644
--- a/maintenance/FiveUpgrade.inc
+++ b/maintenance/FiveUpgrade.inc
@@ -431,7 +431,8 @@ class FiveUpgrade {
 		 */
 		#$newmaxold = $this->dbw->selectField( 'old', 'max(old_id)', '', $fname );
 		#$this->setChunkScale( $chunksize, $newmaxold, 'revision', $fname );
-		$countold = $this->dbw->selectField( 'old', 'count(old_id)', '', $fname );
+		#$countold = $this->dbw->selectField( 'old', 'count(old_id)', '', $fname );
+		$countold = $this->dbw->selectField( 'old', 'max(old_id)', '', $fname );
 		$this->setChunkScale( $chunksize, $countold, 'revision', $fname );
 		
 		$this->log( "......Setting up revision table." );
@@ -484,7 +485,8 @@ class FiveUpgrade {
 				'page_touched'      =>              $this->dbw->timestamp(),
 				'page_latest'       =>              $row->rev_id,
 				'page_len'          =>              $row->len );
-			$this->addChunk( $add, $row->cur_id );
+			#$this->addChunk( $add, $row->cur_id );
+			$this->addChunk( $add );
 		}
 		$this->lastChunk( $add );
 		$this->dbr->freeResult( $result );
@@ -497,6 +499,15 @@ class FiveUpgrade {
 		$chunksize = 200;
 		extract( $this->dbw->tableNames( 'links', 'brokenlinks', 'pagelinks', 'cur' ) );
 		
+		$this->log( 'Checking for interwiki table change in case of bogus items...' );
+		if( $this->dbw->fieldExists( 'interwiki', 'iw_trans' ) ) {
+			$this->log( 'interwiki has iw_trans.' );
+		} else {
+			$this->log( 'adding iw_trans...' );
+			dbsource( 'maintenance/archives/patch-interwiki-trans.sql', $this->dbw );
+			$this->log( 'added iw_trans.' );
+		}
+		
 		$this->log( 'Creating pagelinks table...' );
 		$this->dbw->query( "
 CREATE TABLE $pagelinks (