From 602020b1dfa8452942f14df34e5d55b7bb1ef1e6 Mon Sep 17 00:00:00 2001 From: Happy-melon Date: Sat, 7 May 2011 15:25:27 +0000 Subject: [PATCH] Move minimum database versions to Defines.php --- includes/Defines.php | 3 +++ includes/installer/MysqlInstaller.php | 6 ++---- includes/installer/OracleInstaller.php | 6 ++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/includes/Defines.php b/includes/Defines.php index 3ca7dcb366..770f569d4c 100644 --- a/includes/Defines.php +++ b/includes/Defines.php @@ -23,6 +23,9 @@ define( 'MW_SPECIALPAGE_VERSION', 2 ); */ define( 'MW_MIN_PHP_VERSION', '5.2.3' ); +define( 'MW_MIN_MYSQL_VERSION', '4.0.14' ); +define( 'MW_MIN_ORACLE_VERSION', '9.0.1' ); + /**@}*/ /**@{ diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php index 5046df3bd0..fb96e3208e 100644 --- a/includes/installer/MysqlInstaller.php +++ b/includes/installer/MysqlInstaller.php @@ -31,8 +31,6 @@ class MysqlInstaller extends DatabaseInstaller { public $supportedEngines = array( 'InnoDB', 'MyISAM' ); - public $minimumVersion = '4.0.14'; - public $webUserPrivs = array( 'DELETE', 'INSERT', @@ -104,8 +102,8 @@ class MysqlInstaller extends DatabaseInstaller { // Check version $version = $conn->getServerVersion(); - if ( version_compare( $version, $this->minimumVersion ) < 0 ) { - return Status::newFatal( 'config-mysql-old', $this->minimumVersion, $version ); + if ( version_compare( $version, MW_MIN_MYSQL_VERSION ) < 0 ) { + return Status::newFatal( 'config-mysql-old', MW_MIN_MYSQL_VERSION, $version ); } return $status; diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php index 85758301bd..77442a669b 100644 --- a/includes/installer/OracleInstaller.php +++ b/includes/installer/OracleInstaller.php @@ -26,8 +26,6 @@ class OracleInstaller extends DatabaseInstaller { '_OracleDefTS' => 'USERS', '_OracleTempTS' => 'TEMP' ); - - public $minimumVersion = '9.0.1'; // 9iR1 protected $connError = null; @@ -120,8 +118,8 @@ class OracleInstaller extends DatabaseInstaller { // Check version $version = $conn->getServerVersion(); - if ( version_compare( $version, $this->minimumVersion ) < 0 ) { - return Status::newFatal( 'config-oracle-old', $this->minimumVersion, $version ); + if ( version_compare( $version, MW_MIN_ORACLE_VERSION ) < 0 ) { + return Status::newFatal( 'config-oracle-old', MW_MIN_ORACLE_VERSION, $version ); } return $status; -- 2.20.1