MDL-51052 dml: support for sql_like() under utf8_bin

diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
index 9d7b767..8c61536 100644 (file)
--- a/lib/dml/mysqli_native_moodle_database.php
+++ b/lib/dml/mysqli_native_moodle_database.php
@@ -1523,7 +1523,12 @@ class mysqli_native_moodle_database extends moodle_database {
             if ($accentsensitive) {
                 return "LOWER($fieldname) $LIKE LOWER($param) COLLATE utf8_bin ESCAPE '$escapechar'";
             } else {
-                return "$fieldname $LIKE $param ESCAPE '$escapechar'";
+                // Set a case sensitive collation if using utf8_bin.
+                if ($this->get_dbcollation() == 'utf8_bin') {
+                    return "$fieldname $LIKE $param COLLATE utf8_unicode_ci ESCAPE '$escapechar'";
+                } else {
+                    return "$fieldname $LIKE $param ESCAPE '$escapechar'";
+                }
             }
         }
     }

diff --git a/lib/dml/tests/dml_test.php b/lib/dml/tests/dml_test.php
index b064d99..8b16565 100644 (file)
--- a/lib/dml/tests/dml_test.php
+++ b/lib/dml/tests/dml_test.php
@@ -3870,6 +3870,11 @@ class core_dml_testcase extends database_driver_testcase {
         $records = $DB->get_records_sql($sql, array('aui'));
         $this->assertCount(1, $records);
 
+        // Test LIKE under unusual collations.
+        $sql = "SELECT * FROM {{$tablename}} WHERE ".$DB->sql_like('name', '?', false, false);
+        $records = $DB->get_records_sql($sql, array("%dup_r%"));
+        $this->assertCount(2, $records);
+
         $sql = "SELECT * FROM {{$tablename}} WHERE ".$DB->sql_like('name', '?', true, true, true); // NOT LIKE.
         $records = $DB->get_records_sql($sql, array("%o%"));
         $this->assertCount(3, $records);