Merge branch '5.11.x'

Signed-off-by: Maurício Meneghini Fauth <[email protected]>
phpmyadmin · Oct 25, 2024 · f4b2a20 · f4b2a20
2 parents 9d4796d + 4652d80
commit f4b2a20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Parsers/Conditions.php b/src/Parsers/Conditions.php
@@ -129,7 +129,10 @@ public static function parse(Parser $parser, TokensList $list, array $options =
             }
 
             // Conditions are delimited by logical operators.
-            if (in_array($token->value, self::DELIMITERS, true)) {
+            if (
+                ($token->type === TokenType::Keyword || $token->type === TokenType::Operator)
+                && in_array($token->value, self::DELIMITERS, true)
+            ) {
                 if ($betweenBefore && ($token->value === 'AND')) {
                     // The syntax of keyword `BETWEEN` is hard-coded.
                     $betweenBefore = false;

diff --git a/tests/Components/ConditionTest.php b/tests/Components/ConditionTest.php
@@ -26,4 +26,10 @@ public function testParseBetween(): void
         $this->assertEquals('OR', $component[1]->expr);
         $this->assertEquals('(id BETWEEN 30 AND 40)', $component[2]->expr);
     }
+
+    public function testParseAnd(): void
+    {
+        $component = Conditions::parse(new Parser(), $this->getTokensList("`col` LIKE 'AND'"));
+        $this->assertEquals("`col` LIKE 'AND'", Conditions::buildAll($component));
+    }
 }