MDL-16930 ddl - exceptions cleanup

diff --git a/lib/ddl/database_manager.php b/lib/ddl/database_manager.php
index 763524b78c2484ba8b8dddb86d94558c77b01864..6de10698b7a1933f698b26ebc20d949b92a27a86 100644 (file)
--- a/lib/ddl/database_manager.php
+++ b/lib/ddl/database_manager.php
@@ -1003,34 +1003,4 @@ class database_manager {
 }
 
 
-/**
- * DDL exception class, use instead of error() and "return false;" in ddl code.
- */
-class ddl_exception extends moodle_exception {
-    function __construct($errorcode, $a=NULL, $debuginfo=null) {
-        parent::__construct($errorcode, '', '', $a, $debuginfo);
-    }
-}
-
-/**
- * Table does not exist problem exception
- */
-class ddl_table_missing_exception extends ddl_exception {
-    function __construct($tablename, $debuginfo=null) {
-        parent::__construct('ddltablenotexist', $tablename, $debuginfo);
-    }
-}
-
-/**
- * Table does not exist problem exception
- */
-class ddl_field_missing_exception extends ddl_exception {
-    function __construct($fieldname, $tablename, $debuginfo=null) {
-        $a = new object();
-        $a->fieldname = $fieldname;
-        $a->tablename = $tablename;
-        parent::__construct('ddlfieldnotexist', $a, $debuginfo);
-    }
-}
-
 ?>

diff --git a/lib/ddllib.php b/lib/ddllib.php
index 5fad1d1ea3e8fcc0e9f9679a6f24928234e8dcb9..ea8b9daa088463a54401a75365dfca8eb92af189 100644 (file)
--- a/lib/ddllib.php
+++ b/lib/ddllib.php
@@ -54,3 +54,34 @@ require_once($CFG->libdir.'/xmldb/xmldb_statement.php');
 require_once($CFG->libdir.'/ddl/sql_generator.php');
 require_once($CFG->libdir.'/ddl/database_manager.php');
 
+
+
+/**
+ * DDL exception class, use instead of error() and "return false;" in ddl code.
+ */
+class ddl_exception extends moodle_exception {
+    function __construct($errorcode, $a=NULL, $debuginfo=null) {
+        parent::__construct($errorcode, '', '', $a, $debuginfo);
+    }
+}
+
+/**
+ * Table does not exist problem exception
+ */
+class ddl_table_missing_exception extends ddl_exception {
+    function __construct($tablename, $debuginfo=null) {
+        parent::__construct('ddltablenotexist', $tablename, $debuginfo);
+    }
+}
+
+/**
+ * Table does not exist problem exception
+ */
+class ddl_field_missing_exception extends ddl_exception {
+    function __construct($fieldname, $tablename, $debuginfo=null) {
+        $a = new object();
+        $a->fieldname = $fieldname;
+        $a->tablename = $tablename;
+        parent::__construct('ddlfieldnotexist', $a, $debuginfo);
+    }
+}
\ No newline at end of file