Merge branch 'w16_MDL-32392_m23_minversion' of git://github.com/skodak/moodle

This commit is contained in:
Dan Poltawski 2012-04-16 13:52:50 +08:00
commit 71504afc99
4 changed files with 1 additions and 41 deletions

View file

@ -287,19 +287,6 @@ class mssql_native_moodle_database extends moodle_database {
return $info; return $info;
} }
/**
* Returns if the RDBMS server fulfills the required version
*
* @param string $version version to check against
* @return bool returns if the version is fulfilled (true) or no (false)
* @todo Delete this unused and protected method. MDL-32392
*/
protected function is_min_version($version) {
$server = $this->get_server_info();
$server = $server['version'];
return version_compare($server, $version, '>=');
}
/** /**
* Converts short table name {tablename} to real table name * Converts short table name {tablename} to real table name
* supporting temp tables (#) if detected * supporting temp tables (#) if detected

View file

@ -296,19 +296,6 @@ class oci_native_moodle_database extends moodle_database {
return $info; return $info;
} }
/**
* Returns if the RDBMS server fulfills the required version
*
* @param string $version version to check against
* @return bool returns if the version is fulfilled (true) or no (false)
* @todo Delete this unused and protected method. MDL-32392
*/
protected function is_min_version($version) {
$server = $this->get_server_info();
$server = $server['version'];
return version_compare($server, $version, '>=');
}
/** /**
* Converts short table name {tablename} to real table name * Converts short table name {tablename} to real table name
* supporting temp tables ($this->unique_session_id based) if detected * supporting temp tables ($this->unique_session_id based) if detected

View file

@ -262,9 +262,8 @@ class pgsql_native_moodle_database extends moodle_database {
* *
* @param string $version version to check against * @param string $version version to check against
* @return bool returns if the version is fulfilled (true) or no (false) * @return bool returns if the version is fulfilled (true) or no (false)
* @todo Make this method private. MDL-32392
*/ */
protected function is_min_version($version) { private function is_min_version($version) {
$server = $this->get_server_info(); $server = $this->get_server_info();
$server = $server['version']; $server = $server['version'];
return version_compare($server, $version, '>='); return version_compare($server, $version, '>=');

View file

@ -276,19 +276,6 @@ class sqlsrv_native_moodle_database extends moodle_database {
return $info; return $info;
} }
/**
* Returns if the RDBMS server fulfills the required version
*
* @param string $version version to check against
* @return bool returns if the version is fulfilled (true) or no (false)
* @todo Delete this unused and protected method. MDL-32392
*/
protected function is_min_version($version) {
$server = $this->get_server_info();
$server = $server['version'];
return version_compare($server, $version, '>=');
}
/** /**
* Override: Converts short table name {tablename} to real table name * Override: Converts short table name {tablename} to real table name
* supporting temp tables (#) if detected * supporting temp tables (#) if detected