Add support for MySQL commands inside comments.

5 files changed, 37 insertions, 15 deletions

diff --git a/src/Lexer.php b/src/Lexer.php
index 69c1ff2..82385e3 100644
--- a/src/Lexer.php
+++ b/src/Lexer.php
@@ -515,15 +515,39 @@ namespace SqlParser {
                 $token .= $this->str[$this->last];
                 if (Context::isComment($token)) {
                     $flags = Token::FLAG_COMMENT_C;
+
+                    // This comment already ended. It may be a part of a
+                    // previous MySQL specific command.
+                    if ($token === '*/') {
+                        return new Token($token, Token::TYPE_COMMENT, $flags);
+                    }
+
+                    // Checking if this is a MySQL-specific command.
                     if (($this->last + 1 < $this->len) && ($this->str[$this->last + 1] === '!')) {
-                        // It is a MySQL-specific command.
                         $flags |= Token::FLAG_COMMENT_MYSQL_CMD;
+                        $token .= $this->str[++$this->last];
+
+                        while ((++$this->last < $this->len)
+                            && ('0' <= $this->str[$this->last])
+                            && ($this->str[$this->last] <= '9')
+                        ) {
+                            $token .= $this->str[$this->last];
+                        }
+                        --$this->last;
+
+                        // We split this comment and parse only its beginning
+                        // here.
+                        return new Token($token, Token::TYPE_COMMENT, $flags);
                     }
+
+                    // Parsing the comment.
                     while ((++$this->last < $this->len)
                         && (($this->str[$this->last - 1] !== '*') || ($this->str[$this->last] !== '/'))
                     ) {
                         $token .= $this->str[$this->last];
                     }
+
+                    // Adding the ending.
                     if ($this->last < $this->len) {
                         $token .= $this->str[$this->last];
                     }
diff --git a/src/Utils/Query.php b/src/Utils/Query.php
index 41e99d1..86325ed 100644
--- a/src/Utils/Query.php
+++ b/src/Utils/Query.php
@@ -743,9 +743,7 @@ class Query
         for ($list->idx = 0; $list->idx < $list->count; ++$list->idx) {
             $token = $list->tokens[$list->idx];
 
-            if (($token->type === Token::TYPE_COMMENT)
-                && (!($token->flags & Token::FLAG_COMMENT_MYSQL_CMD))
-            ) {
+            if ($token->type === Token::TYPE_COMMENT) {
                 continue;
             }
 
diff --git a/tests/Utils/QueryTest.php b/tests/Utils/QueryTest.php
index 833469e..9929da1 100644
--- a/tests/Utils/QueryTest.php
+++ b/tests/Utils/QueryTest.php
@@ -495,6 +495,6 @@ class QueryTest extends TestCase
 
         list($statement, $query, $delimiter) =
             Query::getFirstStatement($query, $delimiter);
-        $this->assertEquals('/*!SELECT * FROM actor WHERE last_name = "abc"*/$$', $statement);
+        $this->assertEquals('SELECT * FROM actor WHERE last_name = "abc"$$', $statement);
     }
 }
diff --git a/tests/data/lexer/lexComment.in b/tests/data/lexer/lexComment.in
index 961b250..86ed94f 100644
--- a/tests/data/lexer/lexComment.in
+++ b/tests/data/lexer/lexComment.in
@@ -1,4 +1,4 @@
 # comment
-SELECT /*! STRAIGHT_JOIN */ col1 FROM table1, table2 /* select query */
+SELECT /*!50000 STRAIGHT_JOIN */ col1 FROM table1, table2 /* select query */
 -- comment
 -- comment 2
\ No newline at end of file
diff --git a/tests/data/lexer/lexComment.out b/tests/data/lexer/lexComment.out
index e6e5bfe..edbb277 100644
--- a/tests/data/lexer/lexComment.out
+++ b/tests/data/lexer/lexComment.out
@@ -1,14 +1,14 @@
-a:4:{s:5:"query";s:105:"# comment
-SELECT /*! STRAIGHT_JOIN */ col1 FROM table1, table2 /* select query */
+a:4:{s:5:"query";s:110:"# comment
+SELECT /*!50000 STRAIGHT_JOIN */ col1 FROM table1, table2 /* select query */
 -- comment
--- comment 2";s:5:"lexer";O:15:"SqlParser\Lexer":8:{s:6:"strict";b:0;s:3:"str";s:105:"# comment
-SELECT /*! STRAIGHT_JOIN */ col1 FROM table1, table2 /* select query */
+-- comment 2";s:5:"lexer";O:15:"SqlParser\Lexer":8:{s:6:"strict";b:0;s:3:"str";s:110:"# comment
+SELECT /*!50000 STRAIGHT_JOIN */ col1 FROM table1, table2 /* select query */
 -- comment
--- comment 2";s:3:"len";i:105;s:4:"last";i:106;s:4:"list";O:20:"SqlParser\TokensList":3:{s:6:"tokens";a:19:{i:0;O:15:"SqlParser\Token":5:{s:5:"token";s:10:"# comment
+-- comment 2";s:3:"len";i:110;s:4:"last";i:111;s:4:"list";O:20:"SqlParser\TokensList":3:{s:6:"tokens";a:23:{i:0;O:15:"SqlParser\Token":5:{s:5:"token";s:10:"# comment
 ";s:5:"value";s:10:"# comment
-";s:4:"type";i:4;s:5:"flags";i:1;s:8:"position";i:0;}i:1;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:10;}i:2;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:16;}i:3;O:15:"SqlParser\Token":5:{s:5:"token";s:20:"/*! STRAIGHT_JOIN */";s:5:"value";s:20:"/*! STRAIGHT_JOIN */";s:4:"type";i:4;s:5:"flags";i:10;s:8:"position";i:17;}i:4;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:37;}i:5;O:15:"SqlParser\Token":5:{s:5:"token";s:4:"col1";s:5:"value";s:4:"col1";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:38;}i:6;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:42;}i:7;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:43;}i:8;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:47;}i:9;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"table1";s:5:"value";s:6:"table1";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:48;}i:10;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:54;}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:55;}i:12;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"table2";s:5:"value";s:6:"table2";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:56;}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:62;}i:14;O:15:"SqlParser\Token":5:{s:5:"token";s:18:"/* select query */";s:5:"value";s:18:"/* select query */";s:4:"type";i:4;s:5:"flags";i:2;s:8:"position";i:63;}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:81;}i:16;O:15:"SqlParser\Token":5:{s:5:"token";s:11:"-- comment
+";s:4:"type";i:4;s:5:"flags";i:1;s:8:"position";i:0;}i:1;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:10;}i:2;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:16;}i:3;O:15:"SqlParser\Token":5:{s:5:"token";s:8:"/*!50000";s:5:"value";s:8:"/*!50000";s:4:"type";i:4;s:5:"flags";i:10;s:8:"position";i:17;}i:4;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:25;}i:5;O:15:"SqlParser\Token":5:{s:5:"token";s:13:"STRAIGHT_JOIN";s:5:"value";s:13:"STRAIGHT_JOIN";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:26;}i:6;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:39;}i:7;O:15:"SqlParser\Token":5:{s:5:"token";s:2:"*/";s:5:"value";s:2:"*/";s:4:"type";i:4;s:5:"flags";i:2;s:8:"position";i:40;}i:8;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:42;}i:9;O:15:"SqlParser\Token":5:{s:5:"token";s:4:"col1";s:5:"value";s:4:"col1";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:43;}i:10;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:47;}i:11;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:48;}i:12;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:52;}i:13;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"table1";s:5:"value";s:6:"table1";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:53;}i:14;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:59;}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:60;}i:16;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"table2";s:5:"value";s:6:"table2";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:61;}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:67;}i:18;O:15:"SqlParser\Token":5:{s:5:"token";s:18:"/* select query */";s:5:"value";s:18:"/* select query */";s:4:"type";i:4;s:5:"flags";i:2;s:8:"position";i:68;}i:19;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:86;}i:20;O:15:"SqlParser\Token":5:{s:5:"token";s:11:"-- comment
 ";s:5:"value";s:11:"-- comment
-";s:4:"type";i:4;s:5:"flags";i:4;s:8:"position";i:82;}i:17;O:15:"SqlParser\Token":5:{s:5:"token";s:13:"-- comment 2
+";s:4:"type";i:4;s:5:"flags";i:4;s:8:"position";i:87;}i:21;O:15:"SqlParser\Token":5:{s:5:"token";s:13:"-- comment 2
 ";s:5:"value";s:13:"-- comment 2
-";s:4:"type";i:4;s:5:"flags";i:4;s:8:"position";i:93;}i:18;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:19;s:3:"idx";i:0;}s:9:"delimiter";s:1:";";s:12:"delimiterLen";i:1;s:6:"errors";a:0:{}}s:6:"parser";N;s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:0:{}}}
\ No newline at end of file
+";s:4:"type";i:4;s:5:"flags";i:4;s:8:"position";i:98;}i:22;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:23;s:3:"idx";i:0;}s:9:"delimiter";s:1:";";s:12:"delimiterLen";i:1;s:6:"errors";a:0:{}}s:6:"parser";N;s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:0:{}}}
\ No newline at end of file