L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-17353 native drivers are now default instead of obsoleted adodb drivers

Browse Source
This commit is contained in:
skodak
2008-11-21 20:42:28 +00:00
parent 22d77567a9
commit 3eae57b74e
1 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dmllib.php
+32 -5
View File
@@ -104,7 +104,25 @@ function setup_DB() {
}
if (!isset($CFG->dblibrary)) {
$CFG->dblibrary = 'adodb';
switch ($CFG->dbtype) {
case 'postgres7' :
$CFG->dbtype = 'pgsql';
// continue, no break here
case 'pgsql' :
$CFG->dblibrary = 'native';
break;
case 'mysql' :
$CFG->dbtype = 'mysqli';
// continue, no break here
case 'mysqli' :
$CFG->dblibrary = 'native';
break;
default:
// the rest of drivers is not converted yet - keep adodb for now
$CFG->dblibrary = 'adodb';
}
}
if (!isset($CFG->dboptions)) {
@@ -116,7 +134,9 @@ function setup_DB() {
}
$DB = moodle_database::get_driver_instance($CFG->dbtype, $CFG->dblibrary);
if (!$DB = moodle_database::get_driver_instance($CFG->dbtype, $CFG->dblibrary)) {
throw new dml_exception('dbdriverproblem', "Unknown driver $CFG->dblibrary/$CFG->dbtype");
}
$CFG->dbfamily = $DB->get_dbfamily(); // TODO: BC only for now
@@ -132,14 +152,21 @@ function setup_DB() {
} else {
$prevdebug = error_reporting(0);
}
if (!$DB->connect($CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, $CFG->dboptions)) {
$connected = false;
try {
$connected = $DB->connect($CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, $CFG->dboptions);
} Catch (Exception $e) {
$connected = false;
}
if (!$connected) {
$dberr = '';
if (debugging('', DEBUG_ALL)) {
if ($dberr = ob_get_contents()) {
$dberr = '<p><em>'.$dberr.'</em></p>';
}
ob_end_clean();
} else {
$dberr = '';
}
if (empty($CFG->noemailever) and !empty($CFG->emailconnectionerrorsto)) {
if (file_exists($CFG->dataroot.'/emailcount')){