mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-83290 dml: Remove "ORDER BY" from the $sort

Browse Source
This commit is contained in:
meirzamoodle 2024-11-18 15:45:55 +07:00
parent 269a8a8a1b
commit a0f57612ee
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/dml/moodle_database.php
View File

@ -2962,6 +2962,8 @@ abstract class moodle_database {
): array { ): array {
$fullcountsql = $this->generate_fullcount_sql($sql, $params, $fullcountcolumn); $fullcountsql = $this->generate_fullcount_sql($sql, $params, $fullcountcolumn);
if ($sort) { if ($sort) {
// Remove "ORDER BY" with any extra spaces from $sort.
$sort = preg_replace('/\s*ORDER\s+BY\s*/i', '', $sort);
$fullcountsql .= " ORDER BY " . $sort; $fullcountsql .= " ORDER BY " . $sort;
} }
return $this->get_records_sql($fullcountsql, $params, $limitfrom, $limitnum); return $this->get_records_sql($fullcountsql, $params, $limitfrom, $limitnum);
@ -2993,6 +2995,8 @@ abstract class moodle_database {
): moodle_recordset { ): moodle_recordset {
$fullcountsql = $this->generate_fullcount_sql($sql, $params, $fullcountcolumn); $fullcountsql = $this->generate_fullcount_sql($sql, $params, $fullcountcolumn);
if ($sort) { if ($sort) {
// Remove "ORDER BY" with any extra spaces from $sort.
$sort = preg_replace('/\s*ORDER\s+BY\s*/i', '', $sort);
$fullcountsql .= " ORDER BY " . $sort; $fullcountsql .= " ORDER BY " . $sort;
} }
return $this->get_recordset_sql($fullcountsql, $params, $limitfrom, $limitnum); return $this->get_recordset_sql($fullcountsql, $params, $limitfrom, $limitnum);

42
user/tests/table/participants_search_test.php
View File

@ -36,6 +36,8 @@ use stdClass;
* @category test * @category test
* @copyright 2020 Andrew Nicols <andrew@nicols.co.uk> * @copyright 2020 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*
* @covers \core_user\table\participants_search
*/ */
final class participants_search_test extends advanced_testcase { final class participants_search_test extends advanced_testcase {
@ -3508,4 +3510,44 @@ final class participants_search_test extends advanced_testcase {
return $finaltests; return $finaltests;
} }
/**
* Tests sorting of participants in a course.
*
* This test runs a search for participants twice, first with an "ORDER BY" clause and second without.
* The test asserts the correct ordering of participants based on the sorting condition.
*/
public function test_sort_participants(): void {
$this->resetAfterTest();
$course = $this->getDataGenerator()->create_course();
$coursecontext = context_course::instance($course->id);
// Generate users with their role.
$this->getDataGenerator()->create_and_enrol($course, 'teacher');
$this->getDataGenerator()->create_and_enrol($course, 'student');
// Create the basic filter.
$filterset = new participants_filterset();
$filterset->add_filter(new integer_filter('courseid', null, [(int) $course->id]));
// Run the search with using ORDER BY.
$search = new participants_search($course, $coursecontext, $filterset);
$rs = $search->get_participants(
sort: 'ORDER BY id', // Adding spaces between "ORDER" and "BY" is intentional.
);
$records = $this->convert_recordset_to_array($rs);
$userids = array_keys($records);
$this->assertGreaterThan($userids[0], $userids[1]);
// Run the search without using ORDER BY.
$rs = $search->get_participants(
sort: 'id DESC',
);
$records = $this->convert_recordset_to_array($rs);
$userids = array_keys($records);
$this->assertGreaterThan($userids[1], $userids[0]);
$rs->close();
}
} }