mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-52060 phpunit: Prevent querying database metadata

Browse Source
This commit is contained in:
Mark Nielsen 2015-11-20 13:53:22 -08:00 committed by Rajesh Taneja
parent 22d55b3950
commit d494306de7
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/dml/moodle_database.php
View File

@ -577,6 +577,11 @@ abstract class moodle_database {
protected function where_clause($table, array $conditions=null) {
// We accept nulls in conditions
$conditions = is_null($conditions) ? array() : $conditions;
if (empty($conditions)) {
return array('', array());
}
// Some checks performed under debugging only
if (debugging()) {
$columns = $this->get_columns($table);
@ -600,9 +605,6 @@ abstract class moodle_database {
}
$allowed_types = $this->allowed_param_types();
if (empty($conditions)) {
return array('', array());
}
$where = array();
$params = array();

6
lib/dml/tests/dml_test.php
View File

@ -1432,9 +1432,9 @@ class core_dml_testcase extends database_driver_testcase {
$this->assertSame('ddltablenotexist', $e->errorcode);
}
}
// And without params.
try {
$records = $DB->get_records('xxxx', array());
$records = $DB->get_records('xxxx', array('id' => '1'));
$this->fail('An Exception is missing, expected due to query against non-existing table');
} catch (moodle_exception $e) {
$this->assertInstanceOf('dml_exception', $e);
@ -5347,7 +5347,7 @@ class core_dml_testcase extends database_driver_testcase {
// The get_records() method generates 2 queries the first time is called
// as it is fetching the table structure.
$whatever = $DB->get_records($tablename);
$whatever = $DB->get_records($tablename, array('id' => '1'));
$this->assertEquals($initreads + 3, $DB->perf_get_reads());
$this->assertEquals($initwrites, $DB->perf_get_writes());