MDL-15247 lib/dmllib.php is now obsolete

diff --git a/admin/cron.php b/admin/cron.php
index 2e590601278ffd45d5d4181f40b48278574914d9..092e9d10d6843dbd77043b94e506bd9cabe6cb97 100644 (file)
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -195,7 +195,7 @@
     mtrace('Removing expired enrolments ...', '');     // See MDL-8785
     $timenow = time();
     $somefound = false;
-    // The preferred way saves memory, dmllib.php
+    // The preferred way saves memory, datablib
     // find courses where limited enrolment is enabled
     $sql = "SELECT ra.roleid, ra.userid, ra.contextid
               FROM {course} c

diff --git a/admin/report/simpletest/dbtest.php b/admin/report/simpletest/dbtest.php
index 4361ea296a9a23495effe19c21366dc916ab63ca..e5ca21a212b55f559c6ec5c408d828597354f0c4 100644 (file)
--- a/admin/report/simpletest/dbtest.php
+++ b/admin/report/simpletest/dbtest.php
@@ -78,8 +78,8 @@ if (!empty($tests)) {
         // Create the group of tests.
         $test = new AutoGroupTest(false, true);
 
-        $test->addTestFile($CFG->libdir.'/dml/simpletest/testdmllib.php');
-        $test->addTestFile($CFG->libdir.'/ddl/simpletest/testddllib.php');
+        $test->addTestFile($CFG->libdir.'/dml/simpletest/testdml.php');
+        $test->addTestFile($CFG->libdir.'/ddl/simpletest/testddl.php');
 
         // Make the reporter, which is what displays the results.
         $reporter = new ExHtmlReporter($showpasses);

diff --git a/admin/report/simpletest/index.php b/admin/report/simpletest/index.php
index b3ce593dd2c0c347e0b1b177e78e71f63878b4ef..58db632feeb4607dbca547e17e48fd3c57a854dc 100644 (file)
--- a/admin/report/simpletest/index.php
+++ b/admin/report/simpletest/index.php
@@ -77,10 +77,10 @@ if (!is_null($path)) {
     // Add ddl and dml tests if requested
     if ($rundbtests) {
         if (!strstr($path, $CFG->libdir . '/ddl')) {
-            $test->addTestFile($CFG->libdir . '/ddl/simpletest/testddllib.php');
+            $test->addTestFile($CFG->libdir . '/ddl/simpletest/testddl.php');
         }
         if (!strstr($path, $CFG->libdir . '/dml')) {
-            $test->addTestFile($CFG->libdir . '/dml/simpletest/testdmllib.php');
+            $test->addTestFile($CFG->libdir . '/dml/simpletest/testdml.php');
         }
     }
 

diff --git a/install.php b/install.php
index 63c975e4439e84e0dcc8dedfb5d59dad50586200..ab7ed08b0b750fcdbe63fe298d648b30ecc5b3b4 100644 (file)
--- a/install.php
+++ b/install.php
@@ -147,7 +147,6 @@ $COURSE->id = 0;
 
 require_once($CFG->libdir.'/setuplib.php');
 require_once($CFG->libdir.'/weblib.php');
-require_once($CFG->libdir.'/dmllib.php');
 require_once($CFG->libdir.'/deprecatedlib.php');
 require_once($CFG->libdir.'/moodlelib.php');
 require_once($CFG->libdir.'/adminlib.php');

diff --git a/lib/datalib.php b/lib/datalib.php
index 04fdd688cb15c77b611099efed8d63ed945a6e42..8c1d76b3b5014fe761768952b01d30fe8a4d349e 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -11,6 +11,89 @@
  * @package moodlecore
  */
 
+/**
+ * Sets up global $DB moodle_database instance
+ * @return void
+ */
+function setup_DB() {
+    global $CFG, $DB;
+
+    if (isset($DB)) {
+        return;
+    }
+
+    if (!isset($CFG->dbuser)) {
+        $CFG->dbuser = '';
+    }
+
+    if (!isset($CFG->dbpass)) {
+        $CFG->dbpass = '';
+    }
+
+    if (!isset($CFG->dbname)) {
+        $CFG->dbname = '';
+    }
+
+    if (!isset($CFG->dbpersist)) {
+        $CFG->dbpersist = false;
+    }
+
+    if (!isset($CFG->dblibrary)) {
+        $CFG->dblibrary = 'adodb';
+    }
+
+    if (!isset($CFG->dboptions)) {
+        $CFG->dboptions = array();
+    }
+
+    if ($CFG->dblibrary == 'adodb') {
+        $classname = $CFG->dbtype.'_adodb_moodle_database';
+        require_once($CFG->libdir.'/dml/'.$classname.'.php');
+        $DB = new $classname();
+
+    } else {
+        error('Not implemented db library yet: '.$CFG->dblibrary);
+    }
+
+    $CFG->dbfamily = $DB->get_dbfamily(); // TODO: BC only for now
+
+    $driverstatus = $DB->driver_installed();
+
+    if ($driverstatus !== true) {
+        print_error('dbdriverproblem', 'error', '', $driverstatus);
+    }
+
+    if (debugging('', DEBUG_ALL)) {
+        // catch errors
+        ob_start();
+    } else {
+        $prevdebug = error_reporting(0);
+    }
+    if (!$DB->connect($CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->dbpersist, $CFG->prefix, $CFG->dboptions)) {
+        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)) {
+            @mail($CFG->emailconnectionerrorsto,
+                  'WARNING: Database connection error: '.$CFG->wwwroot,
+                  'Connection error: '.$CFG->wwwroot);
+        }
+        print_error('dbconnectionfailed', 'error', '', $dberr);
+    }
+    if (debugging('', DEBUG_ALL)) {
+        ob_end_clean();
+    } else {
+        error_reporting($prevdebug);
+    }
+
+    return true;
+}
+
  /// Some constants
  define('LASTACCESS_UPDATE_SECS', 60); /// Number of seconds to wait before
                                        /// updating lastaccess information in DB.
@@ -1867,10 +1950,6 @@ function add_to_log($courseid, $module, $action, $url='', $info='', $cm=0, $user
 /**
  * Store user last access times - called when use enters a course or site
  *
- * Note: we use ADOdb code directly in this function to save some CPU
- * cycles here and there. They are simple operations not needing any
- * of the postprocessing performed by dmllib.php
- *
  * @param int $courseid, empty means site
  * @return void
  */

diff --git a/lib/ddl/simpletest/testddllib.php b/lib/ddl/simpletest/testddl.php
similarity index 99%
rename from lib/ddl/simpletest/testddllib.php
rename to lib/ddl/simpletest/testddl.php
index 0002f101a91db6af78ceb358d52a3414ac7cf514..99cde3dd0e0444fb81547701ab4ff192be143906 100755 (executable)
--- a/lib/ddl/simpletest/testddllib.php
+++ b/lib/ddl/simpletest/testddl.php
@@ -11,7 +11,7 @@ if (!defined('MOODLE_INTERNAL')) {
 
 require_once($CFG->libdir . '/adminlib.php');
 
-class ddllib_test extends UnitTestCase {
+class ddl_test extends UnitTestCase {
     private $tables = array();
     private $tdb;
 

diff --git a/lib/dml/adodb_moodle_database.php b/lib/dml/adodb_moodle_database.php
index 406c2aba9dbf0bb1a245f31a8c1ec7f996ab77ec..2aeb9d6c488a01e04cc72441ed90fa76bad8c3d0 100644 (file)
--- a/lib/dml/adodb_moodle_database.php
+++ b/lib/dml/adodb_moodle_database.php
@@ -5,7 +5,7 @@ require_once($CFG->libdir.'/dml/adodb_moodle_recordset.php');
 
 /**
  * Abstract moodle database class
- * @package dmlib
+ * @package dml
  */
 abstract class adodb_moodle_database extends moodle_database {
 

diff --git a/lib/dml/adodb_moodle_recordset.php b/lib/dml/adodb_moodle_recordset.php
index 7a55b1762606fda4eb8a98b2d52c358e3251f160..a9776957cfdf898026ed119e4be0e570b027dceb 100644 (file)
--- a/lib/dml/adodb_moodle_recordset.php
+++ b/lib/dml/adodb_moodle_recordset.php
@@ -4,7 +4,7 @@ require_once($CFG->libdir.'/dml/moodle_recordset.php');
 
 /**
  * Adodb basic moodle recordset class
- * @package dmlib
+ * @package dml
  */
 class adodb_moodle_recordset extends moodle_recordset {
 

diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php
index ea277f583460c68ff73cbc6b8152f49bb78228fb..9fbc12a7873b07170c5b1b134eb7e21676913f68 100644 (file)
--- a/lib/dml/moodle_database.php
+++ b/lib/dml/moodle_database.php
@@ -2,9 +2,26 @@
 
 require_once($CFG->libdir.'/dml/database_column_info.php');
 
+/// GLOBAL CONSTANTS /////////////////////////////////////////////////////////
+
+/**
+ * Bitmask, indicates only :name type parameters are supported by db backend.
+ */
+define('SQL_PARAMS_NAMED', 1);
+
+/**
+ * Bitmask, indicates only ? type parameters are supported by db backend.
+ */
+define('SQL_PARAMS_QM', 2);
+
+/**
+ * Bitmask, indicates only $1, $2.. type parameters are supported by db backend.
+ */
+define('SQL_PARAMS_DOLLAR', 4);
+
 /**
  * Abstract class representing moodle database interface.
- * @package dmlib
+ * @package dml
  */
 abstract class moodle_database {
 

diff --git a/lib/dml/mssql_adodb_moodle_database.php b/lib/dml/mssql_adodb_moodle_database.php
index 655a38029b4e316dec8adb0e0222f8b0f8a0a410..2287ae9b6fa0490dd1db70499a7a4f414006f900 100644 (file)
--- a/lib/dml/mssql_adodb_moodle_database.php
+++ b/lib/dml/mssql_adodb_moodle_database.php
@@ -5,7 +5,7 @@ require_once($CFG->libdir.'/dml/adodb_moodle_database.php');
 
 /**
  * MSSQL database class using adodb backend
- * @package dmlib
+ * @package dml
  */
 class mssql_adodb_moodle_database extends adodb_moodle_database {
     /**

diff --git a/lib/dml/mssql_n_adodb_moodle_database.php b/lib/dml/mssql_n_adodb_moodle_database.php
index e8a7d508fc9c3811901bc159be3e7bb9e4122651..aa26856ea8e736c90f6228316aaeb69b3e50c6c8 100644 (file)
--- a/lib/dml/mssql_n_adodb_moodle_database.php
+++ b/lib/dml/mssql_n_adodb_moodle_database.php
@@ -6,7 +6,7 @@ require_once($CFG->libdir.'/dml/mssql_adodb_moodle_database.php');
 
 /**
  * MSSQL_N database class using adodb backend
- * @package dmlib
+ * @package dml
  */
 class mssql_n_adodb_moodle_database extends mssql_adodb_moodle_database {
 

diff --git a/lib/dml/mysql_adodb_moodle_database.php b/lib/dml/mysql_adodb_moodle_database.php
index c796537b61f9e5e26d664aafc5c4514c3492876f..76ba6081973fd3e625fbb3823beef0684fa838d6 100644 (file)
--- a/lib/dml/mysql_adodb_moodle_database.php
+++ b/lib/dml/mysql_adodb_moodle_database.php
@@ -6,7 +6,7 @@ require_once($CFG->libdir.'/dml/mysqli_adodb_moodle_database.php');
 
 /**
  * Legacy MySQL database class using adodb backend
- * @package dmlib
+ * @package dml
  */
 class mysql_adodb_moodle_database extends mysqli_adodb_moodle_database {
 

diff --git a/lib/dml/mysqli_adodb_moodle_database.php b/lib/dml/mysqli_adodb_moodle_database.php
index 80021cc6090354ccdf63510de8ddb53a07f84987..55ba5aa294af57c64e9af2ea7ad98e2405eb8f30 100644 (file)
--- a/lib/dml/mysqli_adodb_moodle_database.php
+++ b/lib/dml/mysqli_adodb_moodle_database.php
@@ -5,7 +5,7 @@ require_once($CFG->libdir.'/dml/adodb_moodle_database.php');
 
 /**
  * Recommended MySQL database class using adodb backend
- * @package dmlib
+ * @package dml
  */
 class mysqli_adodb_moodle_database extends adodb_moodle_database {
 

diff --git a/lib/dml/oci8po_adodb_moodle_database.php b/lib/dml/oci8po_adodb_moodle_database.php
index ecf358fedf7cb665689378e18bdf3a9301650396..585cddc2cdaf6e811020f254ab84fe595b366a09 100644 (file)
--- a/lib/dml/oci8po_adodb_moodle_database.php
+++ b/lib/dml/oci8po_adodb_moodle_database.php
@@ -6,7 +6,7 @@ require_once($CFG->libdir.'/dml/oci8po_adodb_moodle_recordset.php');
 
 /**
  * Oracle database class using adodb backend
- * @package dmlib
+ * @package dml
  */
 class oci8po_adodb_moodle_database extends adodb_moodle_database {
 

diff --git a/lib/dml/oci8po_adodb_moodle_recordset.php b/lib/dml/oci8po_adodb_moodle_recordset.php
index 14a58d9a5df75267c7b8cea8053fc5cc86527d95..8df89fff799fa0b8d3ec25872ca91493c5b5b098 100644 (file)
--- a/lib/dml/oci8po_adodb_moodle_recordset.php
+++ b/lib/dml/oci8po_adodb_moodle_recordset.php
@@ -4,7 +4,7 @@ require_once($CFG->libdir.'/dml/adodb_moodle_recordset.php');
 
 /**
  * Oracle moodle recordest with special hacks
- * @package dmlib
+ * @package dml
  */
 class oci8po_adodb_moodle_recordset extends adodb_moodle_recordset {
 

diff --git a/lib/dml/odbc_mssql_adodb_moodle_database.php b/lib/dml/odbc_mssql_adodb_moodle_database.php
index c6e9f35d58a2ff017c0d83ee570faaa5879e8c4f..ec72c98bfd80e99e29fe20df6b05b0540e88db96 100644 (file)
--- a/lib/dml/odbc_mssql_adodb_moodle_database.php
+++ b/lib/dml/odbc_mssql_adodb_moodle_database.php
@@ -6,7 +6,7 @@ require_once($CFG->libdir.'/dml/mssql_adodb_moodle_database.php');
 
 /**
  * Experimenta mssql odbc database class using adodb backend
- * @package dmlib
+ * @package dml
  */
 class odbc_mssql_adodb_moodle_database extends mssql_adodb_moodle_database {
 

diff --git a/lib/dml/pdo_moodle_database.php b/lib/dml/pdo_moodle_database.php
index 81497a4a3ae90ef8bf56735e620536036b3700e2..5f1167ac2b909c227f790eb169356d55bf727174 100644 (file)
--- a/lib/dml/pdo_moodle_database.php
+++ b/lib/dml/pdo_moodle_database.php
@@ -5,7 +5,7 @@ require_once($CFG->libdir.'/dml/pdo_moodle_recordset.php');
 
 /**
  * Experimental pdo database class
- * @package dmlib
+ * @package dml
  */
 abstract class pdo_moodle_database extends moodle_database {
 

diff --git a/lib/dml/pdo_moodle_recordset.php b/lib/dml/pdo_moodle_recordset.php
index 3bc45d1c72b06a6ed00cae4ab501785028a7d673..fee26e8b44f17b9b416a04a557a10335f649481c 100644 (file)
--- a/lib/dml/pdo_moodle_recordset.php
+++ b/lib/dml/pdo_moodle_recordset.php
@@ -4,7 +4,7 @@ require_once($CFG->libdir.'/dml/moodle_recordset.php');
 
 /**
  * Experimental pdo recordset
- * @package dmlib
+ * @package dml
  */
 class pdo_moodle_recordset extends moodle_recordset {
 

diff --git a/lib/dml/postgres7_adodb_moodle_database.php b/lib/dml/postgres7_adodb_moodle_database.php
index c16299df900060aa7f096b8253af14d7516cafcf..ce667ba9f9a67193dd1b4a39d0beab9581466fed 100644 (file)
--- a/lib/dml/postgres7_adodb_moodle_database.php
+++ b/lib/dml/postgres7_adodb_moodle_database.php
@@ -5,7 +5,7 @@ require_once($CFG->libdir.'/dml/adodb_moodle_database.php');
 
 /**
  * Postgresql database class using adodb backend
- * @package dmlib
+ * @package dml
  */
 class postgres7_adodb_moodle_database extends adodb_moodle_database {
 

diff --git a/lib/dml/simpletest/testdmllib.php b/lib/dml/simpletest/testdml.php
similarity index 99%
rename from lib/dml/simpletest/testdmllib.php
rename to lib/dml/simpletest/testdml.php
index 2f1d4099b62aa022907eb198160779966f43881c..1a68d08aeafaf4bdcaeaa51e34812dfb67f82f55 100755 (executable)
--- a/lib/dml/simpletest/testdmllib.php
+++ b/lib/dml/simpletest/testdml.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Unit tests for dmllib
- * @package dmllib
+ * Unit tests for dml
+ * @package dml
  */
 
 if (!defined('MOODLE_INTERNAL')) {
     die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
 }
 
-class dmllib_test extends UnitTestCase {
+class dml_test extends UnitTestCase {
     private $tables = array();
     private $tdb;
 

diff --git a/lib/dmllib.php b/lib/dmllib.php
index f542ae4bd749f2c3045c64a55adc9f715df13512..b8ff1e692e1946f280a1c6a16cb5aa98d3ca21f3 100644 (file)
--- a/lib/dmllib.php
+++ b/lib/dmllib.php
@@ -35,104 +35,3 @@
 ///     http://docs.moodle.org/en/DML_functions
 /// (feel free to modify, improve and document such page, thanks!)
 
-/// GLOBAL CONSTANTS /////////////////////////////////////////////////////////
-
-/**
- * Bitmask, indicates only :name type parameters are supported by db backend.
- */
-define('SQL_PARAMS_NAMED', 1);
-
-/**
- * Bitmask, indicates only ? type parameters are supported by db backend.
- */
-define('SQL_PARAMS_QM', 2);
-
-/**
- * Bitmask, indicates only $1, $2.. type parameters are supported by db backend.
- */
-define('SQL_PARAMS_DOLLAR', 4);
-
-
-/**
- * Sets up global $DB moodle_database instance
- * @return void
- */
-function setup_DB() {
-    global $CFG, $DB;
-
-    if (isset($DB)) {
-        return;
-    }
-
-    if (!isset($CFG->dbuser)) {
-        $CFG->dbuser = '';
-    }
-
-    if (!isset($CFG->dbpass)) {
-        $CFG->dbpass = '';
-    }
-
-    if (!isset($CFG->dbname)) {
-        $CFG->dbname = '';
-    }
-
-    if (!isset($CFG->dbpersist)) {
-        $CFG->dbpersist = false;
-    }
-
-    if (!isset($CFG->dblibrary)) {
-        $CFG->dblibrary = 'adodb';
-    }
-
-    if (!isset($CFG->dboptions)) {
-        $CFG->dboptions = array();
-    }
-
-    if ($CFG->dblibrary == 'adodb') {
-        $classname = $CFG->dbtype.'_adodb_moodle_database';
-        require_once($CFG->libdir.'/dml/'.$classname.'.php');
-        $DB = new $classname();
-
-    } else {
-        error('Not implemented db library yet: '.$CFG->dblibrary);
-    }
-
-    $CFG->dbfamily = $DB->get_dbfamily(); // TODO: BC only for now
-
-    $driverstatus = $DB->driver_installed();
-
-    if ($driverstatus !== true) {
-        print_error('dbdriverproblem', 'error', '', $driverstatus);
-    }
-
-    if (debugging('', DEBUG_ALL)) {
-        // catch errors
-        ob_start();
-    } else {
-        $prevdebug = error_reporting(0);
-    }
-    if (!$DB->connect($CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->dbpersist, $CFG->prefix, $CFG->dboptions)) {
-        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)) {
-            @mail($CFG->emailconnectionerrorsto,
-                  'WARNING: Database connection error: '.$CFG->wwwroot,
-                  'Connection error: '.$CFG->wwwroot);
-        }
-        print_error('dbconnectionfailed', 'error', '', $dberr);
-    }
-    if (debugging('', DEBUG_ALL)) {
-        ob_end_clean();
-    } else {
-        error_reporting($prevdebug);
-    }
-
-    return true;
-}
-

diff --git a/lib/setup.php b/lib/setup.php
index a330d570839c08f9af8c84784e4512b59a11f882..c5ba97153c48acfd72e62d7a3016345ef97f4f6e 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -127,7 +127,6 @@ global $HTTPSPAGEREQUIRED;
 /// Load up standard libraries
     require_once($CFG->libdir .'/textlib.class.php');   // Functions to handle multibyte strings
     require_once($CFG->libdir .'/weblib.php');          // Functions for producing HTML
-    require_once($CFG->libdir .'/dmllib.php');          // Functions to handle DB data (DML)
     require_once($CFG->libdir .'/datalib.php');         // Legacy lib with a big-mix of functions.
     require_once($CFG->libdir .'/accesslib.php');       // Access control functions
     require_once($CFG->libdir .'/deprecatedlib.php');   // Deprecated functions included for backward compatibility