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

MDL-16852 fixed left join trouble

Browse Source
This commit is contained in:
skodak
2009-03-04 13:34:20 +00:00
parent b3e0a94764
commit c5129f59e6
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/report/participation/index.php
+4 -10
View File
@@ -185,11 +185,8 @@
$sql = "SELECT ra.userid, u.firstname, u.lastname, u.idnumber, COUNT(l.action) AS count
FROM {$CFG->prefix}role_assignments ra
JOIN {$CFG->prefix}user u ON u.id = ra.userid
LEFT OUTER JOIN {$CFG->prefix}log l ON l.userid = ra.userid
WHERE ra.contextid $relatedcontexts AND ra.roleid = $roleid AND
(l.id IS NULL OR
(l.cmid = $instanceid AND l.time > $timefrom AND $actionsql)
)";
LEFT OUTER JOIN {$CFG->prefix}log l ON (l.userid = ra.userid AND l.cmid = $instanceid AND l.time > $timefrom AND $actionsql)
WHERE ra.contextid $relatedcontexts AND ra.roleid = $roleid";
if ($table->get_sql_where()) {
$sql .= ' AND '.$table->get_sql_where(); //initial bar
@@ -204,11 +201,8 @@
$countsql = "SELECT COUNT(DISTINCT(ra.userid))
FROM {$CFG->prefix}role_assignments ra
JOIN {$CFG->prefix}user u ON u.id = ra.userid
LEFT OUTER JOIN {$CFG->prefix}log l ON l.userid = ra.userid
WHERE ra.contextid $relatedcontexts AND ra.roleid = $roleid AND
(l.id IS NULL OR
(l.cmid = $instanceid AND l.time > $timefrom AND $actionsql)
)";
LEFT OUTER JOIN {$CFG->prefix}log l ON (l.userid = ra.userid AND l.cmid = $instanceid AND l.time > $timefrom AND $actionsql)
WHERE ra.contextid $relatedcontexts AND ra.roleid = $roleid";
$totalcount = count_records_sql($countsql);