Merge branch 'master' into motranslator

phpmyadmin · Jan 3, 2017 · 13193a6 · 13193a6
2 parents 55a63fc + 7f6d565
commit 13193a6
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/tests/Utils/CLITest.php b/tests/Utils/CLITest.php
@@ -36,6 +36,11 @@ public function highlightParams()
                 "\x1b[35mSELECT\n  \x1b[92m1\x1b[0m\n",
                 0,
             ),
+            array(
+                array('q' => 'SELECT /* comment */ 1 /* other */', 'f' => 'text'),
+                "SELECT\n   /* comment */ 1 /* other */\n",
+                0,
+            ),
             array(
                 array('q' => 'SELECT 1', 'f' => 'foo'),
                 "ERROR: Invalid value for format!\n",