From: David Mudrak <david.mudrak@gmail.com>
Date: Mon, 4 Jan 2010 18:25:41 +0000 (+0000)
Subject: Yet another MySQL fix
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e1aa152246651d98a35ee610edab72f5f13e5dbf;p=moodle.git

Yet another MySQL fix
---

diff --git a/mod/workshop/form/accumulative/lib.php b/mod/workshop/form/accumulative/lib.php
index 6fd2cde4e3..131062dd36 100644
--- 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 881161c0de..de2bad4bbe 100644
--- 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 270cea5284..d21a2c4214 100644
--- 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 dcb8b5fe63..0e752d587e 100644
--- 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);