Merge branch 'flogado-master'

Author: dbu

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.5.2
+-----
+
+* Fix SQL 2 scanner delimiter detection to handle that tokens don't necessarily have whitespace between them.
+
 1.5.1
 -----
 

src/PHPCR/Util/QOM/Sql2Scanner.php

@@ -171,7 +171,7 @@ protected function scan($sql2)
             $regexpTokens[] = preg_quote($token, '/');
         }
 
-        $regexp = '/^'.implode('([ \t\n]+)', $regexpTokens).'$/';
+        $regexp = '/^'.implode('([ \t\n]*)', $regexpTokens).'$/';
         preg_match($regexp, $sql2, $this->delimiters);
         $this->delimiters[0] = '';
 

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

@@ -0,0 +1,47 @@
+<?php
+
+namespace PHPCR\Tests\Util\QOM;
+
+use PHPCR\Util\QOM\Sql2Scanner;
+use PHPUnit\Framework\TestCase;
+
+class Sql2ScannerTest extends TestCase
+{
+    public function testToken()
+    {
+        $scanner = new Sql2Scanner('SELECT page.* FROM [nt:unstructured] AS page');
+        $expected = [
+            'SELECT',
+            'page',
+            '.',
+            '*',
+            'FROM',
+            '[nt:unstructured]',
+            'AS',
+            'page',
+        ];
+
+        while ($token = $scanner->fetchNextToken()) {
+            $this->assertEquals(array_shift($expected), $token);
+        }
+    }
+
+    public function testDelimiter()
+    {
+        $scanner = new Sql2Scanner('SELECT page.* FROM [nt:unstructured] AS page');
+        $expected = [
+            '',
+            ' ',
+            '',
+            '',
+            ' ',
+            ' ',
+            ' ',
+            ' ',
+        ];
+
+        while ($token = $scanner->fetchNextToken()) {
+            $this->assertEquals(array_shift($expected), $scanner->getPreviousDelimiter());
+        }
+    }
+}