Fix #13951 wrong parsing partitions

When partition names contain "_", the parser wasn't reading the full name, but stopped before the first "_". Signed-off-by: Hugues Peccatte <[email protected]>
phpmyadmin · Oct 31, 2019 · fe98a34 · fe98a34
1 parent 49731d2
commit fe98a34
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/Components/PartitionDefinition.php b/src/Components/PartitionDefinition.php
@@ -170,10 +170,16 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                 $ret->name = $token->value;
 
                 // Looking ahead for a 'VALUES' keyword.
-                $idx = $list->idx;
-                $list->getNext();
-                $nextToken = $list->getNext();
-                $list->idx = $idx;
+                // Loop until the end of the partition name (delimited by a whitespace)
+                while ($nextToken = $list->tokens[++$list->idx]) {
+                    if ($nextToken->type === Token::TYPE_WHITESPACE) {
+                        break;
+                    }
+                    $ret->name .= $nextToken->value;
+                }
+                $idx = $list->idx--;
+                // Get the first token after the white space.
+                $nextToken = $list->tokens[++$idx];
 
                 $state = ($nextToken->type === Token::TYPE_KEYWORD)
                     && ($nextToken->value === 'VALUES')