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

diff --cc includes/installer/OracleUpdater.php
index 8a93b45,56e887f..a741f26
--- 1/includes/installer/OracleUpdater.php
--- 2/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
         */