fix #125 (#359)

Co-authored-by: robert.kubac <[email protected]>

Author: czoIg

src/PHPSQLParser/processors/FromProcessor.php

@@ -190,6 +190,11 @@ public function process($tokens) {
                 if ($token_category === 'LEFT' || $token_category === 'RIGHT' || $token_category === 'NATURAL') {
                     $token_category = '';
                     $parseInfo['next_join_type'] = strtoupper(trim($prevToken)); // it seems to be a join
+                } elseif ($token_category === 'IDX_HINT') {
+                    $parseInfo['expression'] .= $token;
+                    if ($parseInfo['ref_type'] !== false) { // all after ON / USING
+                        $parseInfo['ref_expr'] .= $token;
+                    }
                 }
                 break;
 
@@ -276,6 +281,12 @@ public function process($tokens) {
                 break;
 
             case 'FOR':
+                if ($token_category === 'IDX_HINT') {
+                    $cur_hint = (count($parseInfo['hints']) - 1);
+                    $parseInfo['hints'][$cur_hint]['hint_type'] .= " " . $upper;
+                    continue 2;
+                }
+
                 $parseInfo['token_count']++;
                 $skip_next = true;
                 break;
@@ -295,6 +306,12 @@ public function process($tokens) {
                 $parseInfo['next_join_type'] = 'CROSS';
 
             case 'JOIN':
+                if ($token_category === 'IDX_HINT') {
+                    $cur_hint = (count($parseInfo['hints']) - 1);
+                    $parseInfo['hints'][$cur_hint]['hint_type'] .= " " . $upper;
+                    continue 2;
+                }
+
                 if ($parseInfo['subquery']) {
                     $parseInfo['sub_tree'] = $this->parse($this->removeParenthesisFromStart($parseInfo['subquery']));
                     $parseInfo['expression'] = $parseInfo['subquery'];
@@ -304,6 +321,13 @@ public function process($tokens) {
                 $parseInfo = $this->initParseInfo($parseInfo);
                 break;
 
+            case 'GROUP BY':
+                if ($token_category === 'IDX_HINT') {
+                    $cur_hint = (count($parseInfo['hints']) - 1);
+                    $parseInfo['hints'][$cur_hint]['hint_type'] .= " " . $upper;
+                    continue 2;
+                }
+
             default:
                 // TODO: enhance it, so we can have base_expr to calculate the position of the keywords
                 // build a subtree under "hints"

src/PHPSQLParser/processors/SQLProcessor.php

@@ -400,7 +400,7 @@ public function process($tokens) {
                 break;
 
             case 'FOR':
-                if ($prev_category === 'SHOW') {
+                if ($prev_category === 'SHOW' || $token_category === 'FROM') {
                     break;
                 }
                 $skip_next = 1;

tests/cases/creator/issue125Test.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace PHPSQLParser\Test\Creator;
+use PHPSQLParser\PHPSQLParser;
+use PHPSQLParser\PHPSQLCreator;
+
+class issue125Test extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @dataProvider indexHintsDataProvider
+     * @param string $hintType
+     */
+    public function testIssue125FromIndexHint($hintType)
+    {
+        $sql = sprintf(
+            'SELECT start_date FROM users %s INDEX (vacation_idx, users_idx) INNER JOIN vacation ON start_date = end_date',
+            $hintType
+        );
+
+        $parser = new PHPSQLParser();
+        $creator = new PHPSQLCreator();
+
+        $parser->parse($sql, true);
+
+        $this->assertEquals($sql, $creator->create($parser->parsed));
+    }
+
+    /**
+     * @dataProvider indexHintsDataProvider
+     * @param string $hintType
+     */
+    public function testIssue125JoinIndexHint($hintType)
+    {
+        $sql = sprintf(
+            'SELECT start_date FROM users %s INDEX FOR JOIN (vacation_idx, users_idx) INNER JOIN vacation ON start_date = end_date',
+            $hintType
+        );
+
+        $parser = new PHPSQLParser();
+        $creator = new PHPSQLCreator();
+
+        $parser->parse($sql, true);
+
+        $this->assertEquals($sql, $creator->create($parser->parsed));
+    }
+
+    public function indexHintsDataProvider()
+    {
+        return array(
+            array('USE'),
+            array('FORCE'),
+            array('IGNORE')
+        );
+    }
+}