L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-62167 core_badges: Prevent SQL error with Oracle

Browse Source
This commit is contained in:
Frédéric Massart
2018-05-01 15:22:59 +02:00
committed by Eloy Lafuente (stronk7)
parent 2cff7ff95f
commit 0318b526f9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
badges/classes/privacy/provider.php
+6 -6
View File
@@ -205,23 +205,23 @@ class provider implements
$params = [];
if (!empty($contexts[CONTEXT_SYSTEM])) {
$sqls[] = "type = :typesite";
$sqls[] = "b.type = :typesite";
$params['typesite'] = BADGE_TYPE_SITE;
}
if (!empty($contexts[CONTEXT_COURSE])) {
list($insql, $inparams) = $DB->get_in_or_equal($contexts[CONTEXT_COURSE], SQL_PARAMS_NAMED);
$sqls[] = "(type = :typecourse AND courseid $insql)";
$sqls[] = "(b.type = :typecourse AND b.courseid $insql)";
$params = array_merge($params, ['typecourse' => BADGE_TYPE_COURSE], $inparams);
}
$sqlwhere = '(' . implode(' OR ', $sqls) . ')';
$sql = "
SELECT *, COALESCE(courseid, 0) AS normalisedcourseid
FROM {badge}
WHERE (usermodified = :userid1 OR usercreated = :userid2)
SELECT b.*, COALESCE(b.courseid, 0) AS normalisedcourseid
FROM {badge} b
WHERE (b.usermodified = :userid1 OR b.usercreated = :userid2)
AND $sqlwhere
ORDER BY courseid, id";
ORDER BY b.courseid, b.id";
$params = array_merge($params, ['userid1' => $userid, 'userid2' => $userid]);
$recordset = $DB->get_recordset_sql($sql, $params);
static::recordset_loop_and_export($recordset, 'normalisedcourseid', [], function($carry, $record) use ($userid) {