r87639 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r87638‎ | r87639 | r87640 >
Date:15:25, 7 May 2011
Author:happy-melon
Status:reverted
Tags:
Comment:
Move minimum database versions to Defines.php
Modified paths:
  • /trunk/phase3/includes/Defines.php (modified) (history)
  • /trunk/phase3/includes/installer/MysqlInstaller.php (modified) (history)
  • /trunk/phase3/includes/installer/OracleInstaller.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Defines.php
@@ -23,6 +23,9 @@
2424 */
2525 define( 'MW_MIN_PHP_VERSION', '5.2.3' );
2626
 27+define( 'MW_MIN_MYSQL_VERSION', '4.0.14' );
 28+define( 'MW_MIN_ORACLE_VERSION', '9.0.1' );
 29+
2730 /**@}*/
2831
2932 /**@{
Index: trunk/phase3/includes/installer/MysqlInstaller.php
@@ -31,8 +31,6 @@
3232
3333 public $supportedEngines = array( 'InnoDB', 'MyISAM' );
3434
35 - public $minimumVersion = '4.0.14';
36 -
3735 public $webUserPrivs = array(
3836 'DELETE',
3937 'INSERT',
@@ -104,8 +102,8 @@
105103
106104 // Check version
107105 $version = $conn->getServerVersion();
108 - if ( version_compare( $version, $this->minimumVersion ) < 0 ) {
109 - return Status::newFatal( 'config-mysql-old', $this->minimumVersion, $version );
 106+ if ( version_compare( $version, MW_MIN_MYSQL_VERSION ) < 0 ) {
 107+ return Status::newFatal( 'config-mysql-old', MW_MIN_MYSQL_VERSION, $version );
110108 }
111109
112110 return $status;
Index: trunk/phase3/includes/installer/OracleInstaller.php
@@ -26,8 +26,6 @@
2727 '_OracleDefTS' => 'USERS',
2828 '_OracleTempTS' => 'TEMP'
2929 );
30 -
31 - public $minimumVersion = '9.0.1'; // 9iR1
3230
3331 protected $connError = null;
3432
@@ -120,8 +118,8 @@
121119
122120 // Check version
123121 $version = $conn->getServerVersion();
124 - if ( version_compare( $version, $this->minimumVersion ) < 0 ) {
125 - return Status::newFatal( 'config-oracle-old', $this->minimumVersion, $version );
 122+ if ( version_compare( $version, MW_MIN_ORACLE_VERSION ) < 0 ) {
 123+ return Status::newFatal( 'config-oracle-old', MW_MIN_ORACLE_VERSION, $version );
126124 }
127125
128126 return $status;

Follow-up revisions

RevisionCommit summaryAuthorDate
r88176Revert r87635, r87637, r87639, r87643 (MW_MIN_PHP_VERSION etc.): breaks HipHo...tstarling13:21, 15 May 2011

Status & tagging log