Merge branch 'MDL-30137' of git://github.com/timhunt/moodle

moodle · Nov 8, 2011 · d4bdd01 · d4bdd01
2 parents 5d788e3 + f484a62
commit d4bdd01
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
@@ -671,7 +671,12 @@ function quiz_update_all_final_grades($quiz) {
 
             WHERE
                 ABS(newgrades.newgrade - qg.grade) > 0.000005 OR
-                (newgrades.newgrade IS NULL) <> (qg.grade IS NULL)",
+                ((newgrades.newgrade IS NULL OR qg.grade IS NULL) AND NOT
+                          (newgrades.newgrade IS NULL AND qg.grade IS NULL))",
+                // The mess on the previous line is detecting where the value is
+                // NULL in one column, and NOT NULL in the other, but SQL does
+                // not have an XOR operator, and MS SQL server can't cope with
+                // (newgrades.newgrade IS NULL) <> (qg.grade IS NULL).
             $param);
 
     $timenow = time();