Yet another MySQL fix

diff --git a/mod/workshop/form/accumulative/lib.php b/mod/workshop/form/accumulative/lib.php
index 6fd2cde4e3df2570e628adec19a7e882f75114b4..131062dd36b865f7927573b272418826e0ce7f20 100644 (file)
--- a/mod/workshop/form/accumulative/lib.php
+++ b/mod/workshop/form/accumulative/lib.php
@@ -407,8 +407,8 @@ class workshop_accumulative_strategy implements workshop_strategy {
         }
         list($dimsql, $dimparams) = $DB->get_in_or_equal(array_keys($this->dimensions), SQL_PARAMS_NAMED);
         // beware! the caller may rely on the returned array is indexed by dimensionid
-        $sql = "SELECT dimensionid, *
-                  FROM {workshop_grades}
+        $sql = "SELECT dimensionid, wg.*
+                  FROM {workshop_grades} wg
                  WHERE assessmentid = :assessmentid AND strategy= :strategy AND dimensionid $dimsql";
         $params = array('assessmentid' => $assessment->id, 'strategy' => 'accumulative');
         $params = array_merge($params, $dimparams);

diff --git a/mod/workshop/form/comments/lib.php b/mod/workshop/form/comments/lib.php
index 881161c0de65588d17291f2ad526853d3d78fd71..de2bad4bbe8fd1aa78c3e09a6b3aea932118ed81 100644 (file)
--- a/mod/workshop/form/comments/lib.php
+++ b/mod/workshop/form/comments/lib.php
@@ -385,8 +385,8 @@ class workshop_comments_strategy implements workshop_strategy {
         }
         list($dimsql, $dimparams) = $DB->get_in_or_equal(array_keys($this->dimensions), SQL_PARAMS_NAMED);
         // beware! the caller may rely on the returned array is indexed by dimensionid
-        $sql = "SELECT dimensionid, *
-                  FROM {workshop_grades}
+        $sql = "SELECT dimensionid, wg.*
+                  FROM {workshop_grades} wg
                  WHERE assessmentid = :assessmentid AND strategy= :strategy AND dimensionid $dimsql";
         $params = array('assessmentid' => $assessment->id, 'strategy' => 'comments');
         $params = array_merge($params, $dimparams);

diff --git a/mod/workshop/form/numerrors/lib.php b/mod/workshop/form/numerrors/lib.php
index 270cea528434a5e33f9356d1d0f6ef5d76fbef77..d21a2c421485def0553b6d0d401cc5a220e1777f 100644 (file)
--- a/mod/workshop/form/numerrors/lib.php
+++ b/mod/workshop/form/numerrors/lib.php
@@ -425,7 +425,7 @@ class workshop_numerrors_strategy implements workshop_strategy {
         }
         list($dimsql, $dimparams) = $DB->get_in_or_equal(array_keys($this->dimensions), SQL_PARAMS_NAMED);
         // beware! the caller may rely on the returned array is indexed by dimensionid
-        $sql = "SELECT dimensionid, *
+        $sql = "SELECT dimensionid, wg.*
                   FROM {workshop_grades}
                  WHERE assessmentid = :assessmentid AND strategy= :strategy AND dimensionid $dimsql";
         $params = array('assessmentid' => $assessment->id, 'strategy' => 'numerrors');

diff --git a/mod/workshop/form/rubric/lib.php b/mod/workshop/form/rubric/lib.php
index dcb8b5fe63398908b889d60bf84ab0b51f2036ef..0e752d587ee77f12a6bfa91ea5a8d93b5f2f3f1d 100644 (file)
--- a/mod/workshop/form/rubric/lib.php
+++ b/mod/workshop/form/rubric/lib.php
@@ -489,8 +489,8 @@ class workshop_rubric_strategy implements workshop_strategy {
         }
         list($dimsql, $dimparams) = $DB->get_in_or_equal(array_keys($this->dimensions), SQL_PARAMS_NAMED);
         // beware! the caller may rely on the returned array is indexed by dimensionid
-        $sql = "SELECT dimensionid, *
-                  FROM {workshop_grades}
+        $sql = "SELECT dimensionid, wg.*
+                  FROM {workshop_grades} wg
                  WHERE assessmentid = :assessmentid AND strategy= :strategy AND dimensionid $dimsql";
         $params = array('assessmentid' => $assessment->id, 'strategy' => 'rubric');
         $params = array_merge($params, $dimparams);