From 35c1c575d446148c8ee05f64a3589d97fadba02c Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Thu, 20 Dec 2007 23:15:03 +0000
Subject: [PATCH] After some more tests... apply the new
 preconfigure_dbconnection() to core. MDL-12657

Merged from MOODLE_19_STABLE
---
 lib/dmllib.php | 5 +----
 lib/setup.php  | 7 +++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/dmllib.php b/lib/dmllib.php
index 645229022b..c0a4fa130c 100644
--- a/lib/dmllib.php
+++ b/lib/dmllib.php
@@ -2263,8 +2263,7 @@ function execute_sql_arr($sqlarr, $continue=true, $feedback=true) {
 /**
  * This internal function, called from setup.php, sets all the configuration
  * needed to work properly against any DB. It setups connection encoding
- * and some other variables. Also, ir defines the $CFG->dbfamily variable
- * to handle conditional code better than using $CFG->dbtype directly.
+ * and some other variables.
  *
  * This function must contain the init code needed for each dbtype supported.
  */
@@ -2304,8 +2303,6 @@ function configure_dbconnection() {
         ///       or to turn off magic_quotes to allow Moodle to do it properly
             break;
     }
-/// Finally define dbfamily
-    set_dbfamily();
 }
 
 /**
diff --git a/lib/setup.php b/lib/setup.php
index bd70cdadf1..ca392352b8 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -117,10 +117,9 @@ global $HTTPSPAGEREQUIRED;
 
 /// Connect to the database using adodb
 
-/// Some defines required BEFORE including AdoDB library
-    define ('ADODB_ASSOC_CASE', 0); //Use lowercase fieldnames for ADODB_FETCH_ASSOC
-                                    //(only meaningful for oci8po, it's the default
-                                    //for other DB drivers so this won't affect them)
+/// Set $CFG->dbfamily global
+/// and configure some other specific variables for each db BEFORE attempting the connection
+    preconfigure_dbconnection();
 
     require_once($CFG->libdir .'/adodb/adodb.inc.php'); // Database access functions
 
-- 
2.39.5