Merge branch 'MDL-46647-master' of git://github.com/FMCorz/moodle

diff --git a/lib/grade/grade_object.php b/lib/grade/grade_object.php
index cceb178..ca6b87b 100644 (file)
--- a/lib/grade/grade_object.php
+++ b/lib/grade/grade_object.php
@@ -177,6 +177,8 @@ abstract class grade_object {
      * @return array|bool Array of object instances or false if not found
      */
     public static function fetch_all_helper($table, $classname, $params) {
+        global $DB; // Need to introspect DB here.
+
         $instance = new $classname();
 
         $classvars = (array)$instance;
@@ -185,14 +187,25 @@ abstract class grade_object {
         $wheresql = array();
         $newparams = array();
 
+        $columns = $DB->get_columns($table); // Cached, no worries.
+
         foreach ($params as $var=>$value) {
             if (!in_array($var, $instance->required_fields) and !array_key_exists($var, $instance->optional_fields)) {
                 continue;
             }
+            if (!array_key_exists($var, $columns)) {
+                continue;
+            }
             if (is_null($value)) {
                 $wheresql[] = " $var IS NULL ";
             } else {
-                $wheresql[] = " $var = ? ";
+                if ($columns[$var]->meta_type === 'X') {
+                    // We have a text/clob column, use the cross-db method for its comparison.
+                    $wheresql[] = ' ' . $DB->sql_compare_text($var) . ' = ' . $DB->sql_compare_text('?') . ' ';
+                } else {
+                    // Other columns (varchar, integers...).
+                    $wheresql[] = " $var = ? ";
+                }
                 $newparams[] = $value;
             }
         }

diff --git a/lib/grade/tests/grade_object_test.php b/lib/grade/tests/grade_object_test.php
new file mode 100644 (file)
index 0000000..f4e4258
--- /dev/null
+++ b/lib/grade/tests/grade_object_test.php
@@ -0,0 +1,77 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Grade object tests.
+ *
+ * @package    core_grades
+ * @category   phpunit
+ * @copyright  2014 Frédéric Massart - FMCorz.net
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once(__DIR__ . '/fixtures/lib.php');
+
+/**
+ * Grade object testcase.
+ *
+ * @package    core_grades
+ * @category   phpunit
+ * @copyright  2014 Frédéric Massart - FMCorz.net
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class core_grade_object_testcase extends grade_base_testcase {
+
+    public function test_fetch_all_helper() {
+        // Simple ID lookup.
+        $params = array('id' => $this->grade_items[0]->id);
+        $items = grade_object::fetch_all_helper('grade_items', 'grade_item', $params);
+        $this->assertCount(1, $items);
+        $item = array_shift($items);
+        $this->assertInstanceOf('grade_item', $item);
+        $this->assertEquals($item->id, $this->grade_items[0]->id);
+
+        // Various parameters lookup, multiple results.
+        $params = array('courseid' => $this->course->id, 'categoryid' => $this->grade_categories[1]->id);
+        $items = grade_object::fetch_all_helper('grade_items', 'grade_item', $params);
+        $this->assertCount(2, $items);
+        $expecteditems = array($this->grade_items[0]->id => true, $this->grade_items[1]->id => true);
+        foreach ($items as $item) {
+            $this->assertInstanceOf('grade_item', $item);
+            $this->assertArrayHasKey($item->id, $expecteditems);
+            unset($expecteditems[$item->id]);
+        }
+
+        // Text column lookup.
+        $params = array('iteminfo' => $this->grade_items[2]->iteminfo);
+        $items = grade_object::fetch_all_helper('grade_items', 'grade_item', $params);
+        $this->assertCount(1, $items);
+        $item = array_shift($items);
+        $this->assertInstanceOf('grade_item', $item);
+        $this->assertEquals($item->id, $this->grade_items[2]->id);
+
+        // Lookup using non-existing columns.
+        $params = array('doesnotexist' => 'ignoreme', 'id' => $this->grade_items[0]->id);
+        $items = grade_object::fetch_all_helper('grade_items', 'grade_item', $params);
+        $this->assertCount(1, $items);
+        $item = array_shift($items);
+        $this->assertInstanceOf('grade_item', $item);
+        $this->assertEquals($item->id, $this->grade_items[0]->id);
+    }
+
+}