Adding the a test for combined tokens

Author: mamazu

src/PHPCR/Util/QOM/Sql2Scanner.php

@@ -188,6 +188,12 @@ protected function scan($sql2)
                 } elseif (!$stringStartCharacter) {
                     // If there is no start character already we have found the beginning of a new string
                     $stringStartCharacter = $character;
+
+                    // When tokenizing `AS"abc"` add the current token (AS) as token already
+                    if (strlen($currentToken) > 1) {
+                        $tokens[] = substr($currentToken, 0, strlen($currentToken) - 1);
+                        $currentToken = $character;
+                    }
                 }
             }
             $isEscaped = $character === '\\';

tests/PHPCR/Tests/Util/QOM/Sql2ScannerTest.php

@@ -124,6 +124,41 @@ public function testSQLEscapedStrings2()
         $this->expectTokensFromScanner($scanner, $expected);
     }
 
+    public function testSquareBrakets()
+    {
+        $sql = 'WHERE ISSAMENODE(file, ["/home node"])';
+
+        $scanner = new Sql2Scanner($sql);
+        $expected = [
+            'WHERE',
+            'ISSAMENODE',
+            '(',
+            'file',
+            ',',
+            '[',
+            '"/home node"',
+            ']',
+            ')',
+        ];
+
+        $this->expectTokensFromScanner($scanner, $expected);
+    }
+
+    public function testTokenizingWithMissingSpaces()
+    {
+        $sql = 'SELECT * AS"all"';
+
+        $scanner = new Sql2Scanner($sql);
+        $expected = [
+            'SELECT',
+            '*',
+            'AS',
+            '"all"',
+        ];
+
+        $this->expectTokensFromScanner($scanner, $expected);
+    }
+
     public function testThrowingErrorOnUnclosedString()
     {
         $this->expectException(InvalidQueryException::class);