moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-30147 do not rely on dml exception type outside of dml layer

Browse source 
The trouble is that dml driver methods (insert, update, select) are not guaranteed to return the same exception class for various db problems and coding style issues. The recommended practice is to catch dml_exception only.
This commit is contained in:
Petr Skoda 2011-11-12 17:39:19 +01:00
parent c04e80e328
commit 69ac5d478f
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/ddl/simpletest/testddl.php
View file

@ -180,7 +180,7 @@ class ddl_test extends UnitTestCase {
ob_start(); // hide debug warning
try {
$result = $DB->get_records('test_table0');
} catch (dml_read_exception $e) {
} catch (dml_exception $e) {
$result = false;
}
ob_end_clean();
@ -203,7 +203,7 @@ class ddl_test extends UnitTestCase {
ob_start(); // hide debug warning
try {
$result = $DB->get_records('test_table0');
} catch (dml_read_exception $e) {
} catch (dml_exception $e) {
$result = false;
}
ob_end_clean();
@ -337,14 +337,14 @@ class ddl_test extends UnitTestCase {
try { // columns cache must be empty, so sentence throw exception
$columns = $DB->get_columns('test_table0');
} catch (dml_read_exception $e) {
} catch (dml_exception $e) {
$columns = false;
}
$this->assertFalse($columns);
try { /// throw exception
$indexes = $DB->get_indexes('test_table0');
} catch (dml_read_exception $e) {
} catch (dml_exception $e) {
$indexes = false;
}
$this->assertFalse($indexes);
@ -931,7 +931,7 @@ class ddl_test extends UnitTestCase {
ob_start(); // hide debug warning
try {
$result = $DB->insert_record('test_table_cust0', $record, false);
} catch (dml_write_exception $e) {
} catch (dml_exception $e) {
$result = false;
}
ob_end_clean();
@ -953,7 +953,7 @@ class ddl_test extends UnitTestCase {
ob_start(); // hide debug warning
try {
$result = $DB->insert_record('test_table_cust0', $record, false);
} catch (dml_write_exception $e) {
} catch (dml_exception $e) {
$result = false;
}
ob_end_clean();
@ -1022,7 +1022,7 @@ class ddl_test extends UnitTestCase {
ob_start(); // hide debug warning
try {
$result = $DB->insert_record('test_table_cust0', $record, false);
} catch (dml_write_exception $e) {
} catch (dml_exception $e) {
$result = false;;
}
ob_end_clean();
@ -1644,7 +1644,7 @@ class ddl_test extends UnitTestCase {
$rec = $DB->get_record($tablename, array('id'=>$id));
$this->assertIdentical($rec->name, $maxstr);
} catch (dml_write_exception $e) {
} catch (dml_exception $e) {
if ($DB->get_dbfamily() === 'oracle') {
$this->fail('Oracle does not support text fields larger than 4000 bytes, this is not a big problem for mostly ascii based languages');
} else {