Fix parsing and building of SELECT ... INTO @var1 [,@var2...]

Signed-off-by: Deven Bansod <[email protected]>

Author: devenbansod

src/Components/IntoKeyword.php

@@ -45,6 +45,13 @@ class IntoKeyword extends Component
      */
     public $columns;
 
+    /**
+     * The values to be selected into (SELECT .. INTO @var1)
+     *
+     * @var ExpressionArray
+     */
+    public $values;
+
     /**
      * @param Parser     $parser  The parser that serves as context.
      * @param TokensList $list    The list of tokens that are being parsed.
@@ -102,14 +109,22 @@ public static function parse(Parser $parser, TokensList $list, array $options =
             }
 
             if ($state === 0) {
-                $ret->dest = Expression::parse(
-                    $parser,
-                    $list,
-                    array(
-                        'parseField' => 'table',
-                        'breakOnAlias' => true,
-                    )
-                );
+                if ((isset($options['fromInsert'])
+                    && $options['fromInsert'])
+                    || (isset($options['fromReplace'])
+                    && $options['fromReplace'])
+                ) {
+                    $ret->dest = Expression::parse(
+                        $parser,
+                        $list,
+                        array(
+                            'parseField' => 'table',
+                            'breakOnAlias' => true,
+                        )
+                    );
+                } else {
+                    $ret->values = ExpressionArray::parse($parser, $list);
+                }
                 $state = 1;
             } elseif ($state === 1) {
                 if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
@@ -140,6 +155,8 @@ public static function build($component, array $options = array())
             $columns = !empty($component->columns) ?
                 '(`' . implode('`, `', $component->columns) . '`)' : '';
             return $component->dest . $columns;
+        } elseif (isset($component->values)) {
+            return ExpressionArray::build($component->values);
         } else {
             return 'OUTFILE "' . $component->dest . '"';
         }

src/Statements/InsertStatement.php

@@ -200,7 +200,11 @@ public function parse(Parser $parser, TokensList $list)
                     break;
                 } else {
                     ++$list->idx;
-                    $this->into = IntoKeyword::parse($parser, $list);
+                    $this->into = IntoKeyword::parse(
+                        $parser,
+                        $list,
+                        array('fromInsert' => true)
+                    );
                 }
 
                 $state = 1;

src/Statements/ReplaceStatement.php

@@ -166,7 +166,11 @@ public function parse(Parser $parser, TokensList $list)
                     break;
                 } else {
                     ++$list->idx;
-                    $this->into = IntoKeyword::parse($parser, $list);
+                    $this->into = IntoKeyword::parse(
+                        $parser,
+                        $list,
+                        array('fromReplace' => true)
+                    );
                 }
 
                 $state = 1;

tests/Components/IntoKeywordTest.php

@@ -23,6 +23,12 @@ public function testBuild()
         $this->assertEquals('tbl(`col1`, `col2`)', IntoKeyword::build($component));
     }
 
+    public function testBuildValues()
+    {
+        $component = IntoKeyword::parse(new Parser(), $this->getTokensList('@a1, @a2, @a3'));
+        $this->assertEquals('@a1, @a2, @a3', IntoKeyword::build($component));
+    }
+
     public function testBuildOutfile()
     {
         $component = IntoKeyword::parse(new Parser(), $this->getTokensList('OUTFILE "/tmp/outfile.txt"'));