From d6960b0bd118f25558e64e95bef10f57c40417b3 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Thu, 8 Oct 2009 22:04:32 +0000
Subject: [PATCH] MDL-19474 finally dropping support for old adodb moodle
 database drivers, yay!

---
 admin/dbtransfer/database_transfer_form.php | 11 ++++-------
 admin/report/unittest/dbtest.php            |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/admin/dbtransfer/database_transfer_form.php b/admin/dbtransfer/database_transfer_form.php
index 4dcd1d3164d..bf199e7cf04 100644
--- a/admin/dbtransfer/database_transfer_form.php
+++ b/admin/dbtransfer/database_transfer_form.php
@@ -10,13 +10,10 @@ class database_transfer_form extends moodleform {
         $mform->addElement('header', 'database', get_string('dbtransfer', 'dbtransfer'));
 
         $supported = array (
-            'mysqli/adodb',
-            'mysql/adodb',
-            'postgres7/adodb',
-            'mssql_n/adodb',
-            'mssql/adodb',
-            'odbc_mssql/adodb',
-            'oci8po/adodb',
+            'mysqli/native',
+            'pgsql/native',
+            'mssql/native',
+            'oci/native',
             'sqlite3/pdo',
         );
         $drivers = array();
diff --git a/admin/report/unittest/dbtest.php b/admin/report/unittest/dbtest.php
index 574fcdb966a..f0ae99912d2 100644
--- a/admin/report/unittest/dbtest.php
+++ b/admin/report/unittest/dbtest.php
@@ -132,8 +132,8 @@ foreach ($dbinfos as $i=>$dbinfo) {
 echo '</ul>';
 echo '<p>External databases are configured in config.php, add lines:</p>
 <pre>
-$CFG->func_test_db_1 = array("adodb", "postgres7", "localhost", "moodleuser", "password", "moodle", "test", null);
-$CFG->func_test_db_2 = array("adodb", "mssql", "localhost", "moodleuser", "password", "moodle", "test", null);
+$CFG->func_test_db_1 = array("native", "pgsql", "localhost", "moodleuser", "password", "moodle", "test", null);
+$CFG->func_test_db_2 = array("native", "mssql", "localhost", "moodleuser", "password", "moodle", "test", null);
 </pre>
 <p>where order of parameters is: dblibrary, dbtype, dbhost, dbuser, dbpass, dbname, prefix, dboptions</p>';
 echo '<p><input type="submit" value="' . get_string('runtests', 'simpletest') . '" /></p>';