Fixed a couple of minor bugs in partition parsing.

'MAXVALUE' can be used for partitions.
The correct class is used for parsing.
Options may be specified for the class that is used for parsing.
Wrote tests.

Author: udan11

src/Components/ArrayObj.php

@@ -115,7 +115,11 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                     $ret->values[] = $token->value;
                     $ret->raw[] = $token->token;
                 } else {
-                    $ret[] = $options['type']::parse($parser, $list);
+                    $ret[] = $options['type']::parse(
+                        $parser,
+                        $list,
+                        empty($options['typeOptions']) ? array() : $options['typeOptions']
+                    );
                 }
                 $state = 2;
             } elseif ($state === 2) {

src/Components/PartitionDefinition.php

@@ -155,7 +155,18 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                 $ret->type = $token->value;
                 $state = 4;
             } elseif ($state === 4) {
-                $ret->expr = Expression::parse($parser, $list, array('noAlias' => true, 'bracketsDelimited' => true));
+                if ($token->value === 'MAXVALUE') {
+                    $ret->expr = $token->value;
+                } else {
+                    $ret->expr = Expression::parse(
+                        $parser,
+                        $list,
+                        array(
+                            'bracketsDelimited' => true,
+                            'noAlias' => true,
+                        )
+                    );
+                }
                 $state = 5;
             } elseif ($state === 5) {
                 $ret->options = OptionsArray::parse($parser, $list, static::$OPTIONS);
@@ -166,12 +177,12 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                         $parser,
                         $list,
                         array(
-                            'type' => 'SqlParser\Components\PartitionDefinition'
+                            'type' => 'SqlParser\\Components\\PartitionDefinition'
                         )
                     );
-                } else {
-                    break;
+                    ++$list->idx;
                 }
+                break;
             }
         }
 
@@ -196,11 +207,10 @@ public static function build($component)
             if ($component->isSubpartition) {
                 return 'SUBPARTITION ' . $component->name;
             } else {
-                if (!empty($component->subpartitions)) {
-                    $subpartitions = ' ' . PartitionDefinition::build($component->subpartitions);
-                }
+                $subpartitions = empty($component->subpartitions)
+                    ? '' : ' ' . PartitionDefinition::build($component->subpartitions);
                 return 'PARTITION ' . $component->name
-                    . ' VALUES ' . $component->type . $component->expr
+                    . ' VALUES ' . $component->type . ' ' . $component->expr
                     . $subpartitions;
             }
 

src/Statements/CreateStatement.php

@@ -421,9 +421,11 @@ public function parse(Parser $parser, TokensList $list)
                     $brackets = false;
                 } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'PARTITIONS')) {
                     $token = $list->getNextOfType(Token::TYPE_NUMBER);
+                    --$list->idx; // `getNextOfType` also advances one position.
                     $this->partitionsNum = $token->value;
                 } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'SUBPARTITIONS')) {
                     $token = $list->getNextOfType(Token::TYPE_NUMBER);
+                    --$list->idx; // `getNextOfType` also advances one position.
                     $this->subpartitionsNum = $token->value;
                 } elseif (!empty($field)) {
 
@@ -457,7 +459,9 @@ public function parse(Parser $parser, TokensList $list)
                         $this->partitions = ArrayObj::parse(
                             $parser,
                             $list,
-                            array('type' => 'SqlParser\Components\PartitionDefinition')
+                            array(
+                                'type' => 'SqlParser\\Components\\PartitionDefinition'
+                            )
                         );
                     }
                     break;

tests/Builder/CreateStatementTest.php

@@ -65,6 +65,34 @@ public function testBuilderTable()
         );
     }
 
+    public function testBuilderPartitions()
+    {
+        $query = 'CREATE TABLE ts (' . "\n"
+            . '`id` INT,' . "\n"
+            . '`purchased` DATE' . "\n"
+            . ') ' . "\n"
+            . 'PARTITION BY RANGE(YEAR(purchased))' . "\n"
+            . 'PARTITIONS 3' . "\n"
+            . 'SUBPARTITION BY HASH(TO_DAYS(purchased))' . "\n"
+            . 'SUBPARTITIONS 2' . "\n"
+            . '(' . "\n"
+            . 'PARTITION p0 VALUES LESS THAN (1990) (' . "\n"
+            . 'SUBPARTITION s0,' . "\n"
+            . 'SUBPARTITION s1' . "\n"
+            . '),' . "\n"
+            . 'PARTITION p1 VALUES LESS THAN (2000) (' . "\n"
+            . 'SUBPARTITION s2,' . "\n"
+            . 'SUBPARTITION s3' . "\n"
+            . '),' . "\n"
+            . 'PARTITION p2 VALUES LESS THAN MAXVALUE (' . "\n"
+            . 'SUBPARTITION s4,' . "\n"
+            . 'SUBPARTITION s5' . "\n"
+            . ')' . "\n"
+            . ')';
+        $parser = new Parser($query);
+        $this->assertEquals($query, $parser->statements[0]->build());
+    }
+
     public function testBuilderView()
     {
         $parser = new Parser(

tests/Components/ArrayObjTest.php

@@ -2,6 +2,7 @@
 
 namespace SqlParser\Tests\Components;
 
+use SqlParser\Parser;
 use SqlParser\Components\ArrayObj;
 
 use SqlParser\Tests\TestCase;
@@ -21,6 +22,22 @@ public function testBuildValues()
         $this->assertEquals('(a, b)', ArrayObj::build($component));
     }
 
+    public function testParseType()
+    {
+        $components = ArrayObj::parse(
+            new Parser(),
+            $this->getTokensList('(1 + 2, 3 + 4)'),
+            array(
+                'type' => 'SqlParser\\Components\\Expression',
+                'typeOptions' => array(
+                    'noBrackets' => true,
+                ),
+            )
+        );
+        $this->assertEquals($components[0]->expr, '1 + 2');
+        $this->assertEquals($components[1]->expr, '3 + 4');
+    }
+
     /**
      * @dataProvider testParseProvider
      */

tests/Components/PartitionDefinitionTest.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace SqlParser\Tests\Components;
+
+use SqlParser\Parser;
+use SqlParser\Components\PartitionDefinition;
+
+use SqlParser\Tests\TestCase;
+
+class PartitionDefinitionTest extends TestCase
+{
+
+    public function testParse()
+    {
+        $component = PartitionDefinition::parse(
+            new Parser(),
+            $this->getTokensList('PARTITION p0 VALUES LESS THAN(1990)')
+        );
+        $this->assertFalse($component->isSubpartition);
+        $this->assertEquals('p0', $component->name);
+        $this->assertEquals('LESS THAN', $component->type);
+        $this->assertEquals('(1990)', $component->expr->expr);
+    }
+}

tests/Parser/CreateStatementTest.php

@@ -26,6 +26,7 @@ public function testCreateProvider()
             array('parser/parseCreateTable'),
             array('parser/parseCreateTable2'),
             array('parser/parseCreateTable3'),
+            array('parser/parseCreateTable4'),
             array('parser/parseCreateTableErr1'),
             array('parser/parseCreateTableErr2'),
             array('parser/parseCreateTrigger'),

tests/data/parser/parseCreateTable4.in

@@ -0,0 +1,21 @@
+CREATE TABLE ts(id INT, purchased DATE)
+PARTITION BY /* comment */ RANGE(YEAR(purchased))
+PARTITIONS 3
+SUBPARTITION BY HASH(TO_DAYS(purchased))
+SUBPARTITIONS 2(
+PARTITION p0
+VALUES LESS THAN(1990)(
+    SUBPARTITION s0,
+    SUBPARTITION s1
+),
+PARTITION p1
+VALUES LESS THAN(2000)(
+    SUBPARTITION s2,
+    SUBPARTITION s3
+),
+PARTITION p2
+VALUES LESS THAN MAXVALUE(
+    SUBPARTITION s4,
+    SUBPARTITION s5
+)
+);