Fix broken incorrect clause order detection for Joins

src/Statement.php

@@ -457,20 +457,48 @@ public function validateClauseOrder($parser, $list)
         }
 
         $minIdx = -1;
+
+        /**
+         * For tracking JOIN clauses in a query
+         *   0 - JOIN not found till now
+         *   1 - JOIN has been found
+         *   2 - A Non-JOIN clause has been found
+         *       after a previously found JOIN clause
+         *
+         * @var int $joinStart
+         */
+        $joinStart = 0;
+
+        $error = 0;
         foreach ($clauses as $clauseType => $index) {
             $clauseStartIdx = Utils\Query::getClauseStartOffset(
                 $this,
                 $list,
                 $clauseType
             );
 
+            // Handle ordering of Multiple Joins in a query
+            if ($clauseStartIdx != -1) {
+                if ($joinStart == 0 && stripos($clauseType, 'JOIN')) {
+                    $joinStart = 1;
+                } elseif ($joinStart == 1 && ! stripos($clauseType, 'JOIN')) {
+                    $joinStart = 2;
+                } elseif ($joinStart == 2 && stripos($clauseType, 'JOIN')) {
+                    $error = 1;
+                }
+            }
+
             if ($clauseStartIdx != -1 && $clauseStartIdx < $minIdx) {
-                $token = $list->tokens[$clauseStartIdx];
-                $parser->error(
-                    __('Unexpected ordering of clauses.'),
-                    $token
-                );
-                return false;
+                if ($joinStart == 0 || ($joinStart == 2 && $error = 1)) {
+                    $token = $list->tokens[$clauseStartIdx];
+                    $parser->error(
+                        __('Unexpected ordering of clauses.'),
+                        $token
+                    );
+                    return false;
+                } else {
+                    $minIdx = $clauseStartIdx;
+                }
             } elseif ($clauseStartIdx != -1) {
                 $minIdx = $clauseStartIdx;
             }

src/Statements/SelectStatement.php

@@ -76,7 +76,7 @@ class SelectStatement extends Statement
 
     public static $END_OPTIONS = array(
         'FOR UPDATE'                    => 1,
-        'LOCK IN SHARE MODE'           => 1
+        'LOCK IN SHARE MODE'            => 1
     );
 
     /**

tests/Parser/SelectStatementTest.php

@@ -55,6 +55,7 @@ public function testSelectProvider()
             array('parser/parseSelectJoinNaturalLeftOuter'),
             array('parser/parseSelectJoinNaturalRightOuter'),
             array('parser/parseSelectJoinMultiple'),
+            array('parser/parseSelectJoinMultiple2'),
             array('parser/parseSelectWrongOrder'),
             array('parser/parseSelectEndOptions1'),
             array('parser/parseSelectEndOptions2'),

tests/data/parser/parseSelectJoinMultiple2.in

@@ -0,0 +1,3 @@
+SELECT * FROM orders
+NATURAL JOIN Items_Orders LEFT JOIN items on orders.item_id = items.id
+WHERE customer= 'username'

tests/data/parser/parseSelectJoinMultiple2.out

@@ -0,0 +1,7 @@
+a:4:{s:5:"query";s:118:"SELECT * FROM orders
+NATURAL JOIN Items_Orders LEFT JOIN items on orders.item_id = items.id
+WHERE customer= 'username'";s:5:"lexer";O:15:"SqlParser\Lexer":8:{s:6:"strict";b:0;s:3:"str";s:118:"SELECT * FROM orders
+NATURAL JOIN Items_Orders LEFT JOIN items on orders.item_id = items.id
+WHERE customer= 'username'";s:3:"len";i:118;s:4:"last";i:118;s:4:"list";O:20:"SqlParser\TokensList":3:{s:6:"tokens";a:35:{i:0;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"SELECT";s:5:"value";s:6:"SELECT";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:0;}i:1;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:6;}i:2;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"*";s:5:"value";s:1:"*";s:4:"type";i:2;s:5:"flags";i:1;s:8:"position";i:7;}i:3;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:8;}i:4;O:15:"SqlParser\Token":5:{s:5:"token";s:4:"FROM";s:5:"value";s:4:"FROM";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:9;}i:5;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:13;}i:6;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"orders";s:5:"value";s:6:"orders";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:14;}i:7;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"
+";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:20;}i:8;O:15:"SqlParser\Token":5:{s:5:"token";s:12:"NATURAL JOIN";s:5:"value";s:12:"NATURAL JOIN";s:4:"type";i:1;s:5:"flags";i:7;s:8:"position";i:21;}i:9;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:33;}i:10;O:15:"SqlParser\Token":5:{s:5:"token";s:12:"Items_Orders";s:5:"value";s:12:"Items_Orders";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:34;}i:11;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:46;}i:12;O:15:"SqlParser\Token":5:{s:5:"token";s:9:"LEFT JOIN";s:5:"value";s:9:"LEFT JOIN";s:4:"type";i:1;s:5:"flags";i:7;s:8:"position";i:47;}i:13;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:56;}i:14;O:15:"SqlParser\Token":5:{s:5:"token";s:5:"items";s:5:"value";s:5:"items";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:57;}i:15;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:62;}i:16;O:15:"SqlParser\Token":5:{s:5:"token";s:2:"on";s:5:"value";s:2:"ON";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:63;}i:17;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:65;}i:18;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"orders";s:5:"value";s:6:"orders";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:66;}i:19;O:15:"SqlParser\Token":5:{s:5:"token";s:1:".";s:5:"value";s:1:".";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:72;}i:20;O:15:"SqlParser\Token":5:{s:5:"token";s:7:"item_id";s:5:"value";s:7:"item_id";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:73;}i:21;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:80;}i:22;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"=";s:5:"value";s:1:"=";s:4:"type";i:2;s:5:"flags";i:2;s:8:"position";i:81;}i:23;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:82;}i:24;O:15:"SqlParser\Token":5:{s:5:"token";s:5:"items";s:5:"value";s:5:"items";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:83;}i:25;O:15:"SqlParser\Token":5:{s:5:"token";s:1:".";s:5:"value";s:1:".";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:88;}i:26;O:15:"SqlParser\Token":5:{s:5:"token";s:2:"id";s:5:"value";s:2:"id";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:89;}i:27;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"
+";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:91;}i:28;O:15:"SqlParser\Token":5:{s:5:"token";s:5:"WHERE";s:5:"value";s:5:"WHERE";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:92;}i:29;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:97;}i:30;O:15:"SqlParser\Token":5:{s:5:"token";s:8:"customer";s:5:"value";s:8:"customer";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:98;}i:31;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"=";s:5:"value";s:1:"=";s:4:"type";i:2;s:5:"flags";i:2;s:8:"position";i:106;}i:32;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:107;}i:33;O:15:"SqlParser\Token":5:{s:5:"token";s:10:"'username'";s:5:"value";s:8:"username";s:4:"type";i:7;s:5:"flags";i:1;s:8:"position";i:108;}i:34;O:15:"SqlParser\Token":5:{s:5:"token";N;s:5:"value";N;s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";N;}}s:5:"count";i:35;s:3:"idx";i:35;}s:9:"delimiter";s:1:";";s:12:"delimiterLen";i:1;s:6:"errors";a:0:{}}s:6:"parser";O:16:"SqlParser\Parser":5:{s:4:"list";r:8;s:6:"strict";b:0;s:6:"errors";a:0:{}s:10:"statements";a:1:{i:0;O:36:"SqlParser\Statements\SelectStatement":15:{s:4:"expr";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";N;s:6:"column";N;s:4:"expr";s:1:"*";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:4:"from";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:6:"orders";s:6:"column";N;s:4:"expr";s:6:"orders";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:9:"partition";N;s:5:"where";a:1:{i:0;O:30:"SqlParser\Components\Condition":3:{s:11:"identifiers";a:2:{i:0;s:8:"customer";i:1;s:8:"username";}s:10:"isOperator";b:0;s:4:"expr";s:20:"customer= 'username'";}}s:5:"group";N;s:6:"having";N;s:5:"order";N;s:5:"limit";N;s:9:"procedure";N;s:4:"into";N;s:4:"join";a:2:{i:0;O:32:"SqlParser\Components\JoinKeyword":4:{s:4:"type";s:7:"NATURAL";s:4:"expr";O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:12:"Items_Orders";s:6:"column";N;s:4:"expr";s:12:"Items_Orders";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}s:2:"on";N;s:5:"using";N;}i:1;O:32:"SqlParser\Components\JoinKeyword":4:{s:4:"type";s:4:"LEFT";s:4:"expr";O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:5:"items";s:6:"column";N;s:4:"expr";s:5:"items";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}s:2:"on";a:1:{i:0;O:30:"SqlParser\Components\Condition":3:{s:11:"identifiers";a:4:{i:0;s:6:"orders";i:1;s:7:"item_id";i:2;s:5:"items";i:3;s:2:"id";}s:10:"isOperator";b:0;s:4:"expr";s:25:"orders.item_id = items.id";}}s:5:"using";N;}}s:5:"union";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:5:"first";i:0;s:4:"last";i:33;}}s:8:"brackets";i:0;}s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:0:{}}}

tools/contexts/_common.txt

@@ -46,13 +46,13 @@ INTEGER (D)
 INTERVAL (D)
 JSON (D)
 KEY (K)
-LOCK IN SHARE MODE
 LEFT JOIN
 LEFT OUTER JOIN
 LESS THAN
 LINEAR HASH
 LINEAR KEY
 LINESTRING (D)
+LOCK IN SHARE MODE
 LONGBLOB (D)
 LONGTEXT (D)
 MATCH (F)