Proposal to fix #377: understand correctly PARTITION BY RANGE.

Author: niconoe-

src/Components/AlterOperation.php

@@ -432,8 +432,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                 $ret->unknown[] = $token;
             } elseif ($state === 3) {
                 if ($partitionState === 0) {
-                        $list->idx++; // Ignore the current token
-                        $nextToken = $list->getNext();
+                    $list->idx++; // Ignore the current token
+                    $nextToken = $list->getNext();
                     if (
                         ($token->type === Token::TYPE_KEYWORD)
                         && (($token->keyword === 'PARTITION BY')
@@ -452,12 +452,27 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
                     ++$list->idx; // to index the idx by one, because the last getPrevious returned and decreased it.
                 } elseif ($partitionState === 1) {
+                    // Fetch the next token in a way the current index is reset to manage whitespaces in "field".
+                    $currIdx = $list->idx;
+                    ++$list->idx;
+                    $nextToken = $list->getNext();
+                    $list->idx = $currIdx;
                     // Building the expression used for partitioning.
                     if (empty($ret->field)) {
                         $ret->field = '';
                     }
 
-                    $ret->field .= $token->type === Token::TYPE_WHITESPACE ? ' ' : $token->token;
+                    if (
+                        $token->type === Token::TYPE_OPERATOR
+                        && $token->value === '('
+                        && $nextToken
+                        && $nextToken->keyword === 'PARTITION'
+                    ) {
+                        $partitionState = 2;
+                        --$list->idx; // Current idx is on "(". We need a step back for ArrayObj::parse incoming.
+                    } else {
+                        $ret->field .= $token->type === Token::TYPE_WHITESPACE ? ' ' : $token->token;
+                    }
                 } elseif ($partitionState === 2) {
                     $ret->partitions = ArrayObj::parse(
                         $parser,

tests/Parser/AlterStatementTest.php

@@ -48,6 +48,7 @@ public function alterProvider(): array
             ['parser/parseAlterTableCharacterSet5'],
             ['parser/parseAlterTableCharacterSet6'],
             ['parser/parseAlterTableCharacterSet7'],
+            ['parser/parseAlterTablePartitionByRange'],
             ['parser/parseAlterUser'],
             ['parser/parseAlterUser1'],
             ['parser/parseAlterUser2'],

tests/data/parser/parseAlterTablePartitionByRange.in

@@ -0,0 +1,5 @@
+ALTER TABLE d PARTITION BY RANGE (MONTH(departure_date))
+(
+PARTITION p01 VALUES LESS THAN (02) ,
+PARTITION pmaxval VALUES LESS THAN MAXVALUE
+);