MDL-61951 core_grading: SQL improvements for grading_instance join

rudivdme · May 11, 2018 · b3252ec · b3252ec
1 parent 6f213a2
commit b3252ec
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/grade/grading/classes/privacy/provider.php b/grade/grading/classes/privacy/provider.php
@@ -93,9 +93,9 @@ public static function get_contexts_for_userid(int $userid) : contextlist {
                   FROM {context} c
                   JOIN {grading_areas} a ON a.contextid = c.id
                   JOIN {grading_definitions} d ON d.areaid = a.id
-             LEFT JOIN {grading_instances} i ON i.definitionid = d.id
+             LEFT JOIN {grading_instances} i ON i.definitionid = d.id AND i.raterid = :raterid
                  WHERE c.contextlevel = :contextlevel
-                   AND (d.usercreated = :usercreated OR d.usermodified = :usermodified OR i.raterid = :raterid)";
+                   AND (d.usercreated = :usercreated OR d.usermodified = :usermodified OR i.id IS NOT NULL)";
         $params = [
             'usercreated' => $userid,
             'usermodified' => $userid,
@@ -152,9 +152,9 @@ protected static function export_definitions(\context $context, array $subcontex
         ];
 
         if (!empty($userid)) {
-            $join .= ' LEFT JOIN {grading_instances} i ON i.definitionid = d.id';
+            $join .= ' LEFT JOIN {grading_instances} i ON i.definitionid = d.id AND i.raterid = :raterid';
             $select .= ' AND (usercreated = :usercreated
-                OR usermodified = :usermodified OR i.raterid = :raterid)';
+                OR usermodified = :usermodified OR i.id IS NOT NULL)';
             $params['usercreated'] = $userid;
             $params['usermodified'] = $userid;
             $params['raterid'] = $userid;