From: Catrope <roan.kattouw@gmail.com>
Date: Wed, 22 Aug 2012 01:45:42 +0000 (+0000)
Subject: Merge "Clean up applyPatch() usage in the installer."
X-Git-Tag: 1.31.0-rc.0~22644
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22statistiques_visites%22%2C%22%22%29%20.%20%22?a=commitdiff_plain;h=21238992a5d8e8a2dab47568f2d1b3c930347ac8;p=lhc%2Fweb%2Fwiklou.git

Merge "Clean up applyPatch() usage in the installer."
---

21238992a5d8e8a2dab47568f2d1b3c930347ac8
diff --cc includes/installer/OracleUpdater.php
index 8a93b45c82,56e887f064..a741f262d5
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@@ -193,28 -174,9 +175,26 @@@ class OracleUpdater extends DatabaseUpd
  			return;
  		}
  
- 		$this->applyPatch( 'patch_recentchanges_fk2_cascade.sql', false );
- 		$this->output( "ok\n" );
+ 		$this->applyPatch( 'patch_recentchanges_fk2_cascade.sql', false, "Altering RECENTCHANGES_FK2" );
  	}
  
 +	/**
 +	 * Fixed wrong PK, UK definition
 +	 */
 +	protected function doPageRestrictionsPKUKFix() {
 +		$this->output( "Altering PAGE_RESTRICTIONS keys ... " );
 +
 +		$meta = $this->db->query( 'SELECT column_name FROM all_cons_columns WHERE owner = \''.strtoupper($this->db->getDBname()).'\' AND constraint_name = \'MW_PAGE_RESTRICTIONS_PK\' AND rownum = 1' );
 +		$row = $meta->fetchRow();
 +		if ( $row['column_name'] == 'PR_ID' ) {
 +			$this->output( "seems to be up to date.\n" );
 +			return;
 +		}
 +
 +		$this->applyPatch( 'patch-page_restrictions_pkuk_fix.sql', false );
 +		$this->output( "ok\n" );
 +	}
 +
  	/**
  	 * rebuilding of the function that duplicates tables for tests
  	 */