Merge branch 'w16_MDL-32392_m23_minversion' of git://github.com/skoda…

…k/moodle
mpetrowi · Apr 16, 2012 · 71504af · 71504af
2 parents 5599620 + 54c5b1a
commit 71504af
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 41 deletions.
diff --git a/lib/dml/mssql_native_moodle_database.php b/lib/dml/mssql_native_moodle_database.php
@@ -287,19 +287,6 @@ public function get_server_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
      * supporting temp tables (#) if detected

diff --git a/lib/dml/oci_native_moodle_database.php b/lib/dml/oci_native_moodle_database.php
@@ -296,19 +296,6 @@ public function get_server_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
      * supporting temp tables ($this->unique_session_id based) if detected

diff --git a/lib/dml/pgsql_native_moodle_database.php b/lib/dml/pgsql_native_moodle_database.php
@@ -262,9 +262,8 @@ public function get_server_info() {
      *
      * @param string $version version to check against
      * @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 = $server['version'];
         return version_compare($server, $version, '>=');

diff --git a/lib/dml/sqlsrv_native_moodle_database.php b/lib/dml/sqlsrv_native_moodle_database.php
@@ -276,19 +276,6 @@ public function get_server_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
      * supporting temp tables (#) if detected