Resolved conflicts

Author: thomasnordahl-dk

UPGRADING.md

@@ -12,9 +12,9 @@ From version 2.0.0, the namespace of the `Splitter` and `Tokenizer` has changed
 <?php
 
 -use Kodus\SQLSplit\Splitter;
-+use Kodus\SQLSPlit\Splitter;
++use Kodus\SQLSplit\Splitter;
 -use Kodus\SQLSplit\Tokenizer;
-+use Kodus\SQLSPlit\Tokenizer;
++use Kodus\SQLSplit\Tokenizer;
 ```
 
 _The namespace Kodus/SQL collided with a namespace of another (private) kodus repository. The namespace `Kodus\SQL` is

composer.json

@@ -8,10 +8,10 @@
             "name": "Rasmus Schultz",
             "email": "rasmus@mindplay.dk"
         },
-	    {
+        {
             "name": "Thomas Nordahl Pedersen",
             "email": "thno@jfmedier.dk"
-	    }
+        }
     ],
     "require": {
         "php": ">=8.0"

src/Tokenizer.php

@@ -46,16 +46,24 @@ protected function statements(): array
     {
         $statements = [];
 
-        $result = $this->statement();
-        while ($result) {
-            $statements[] = $result;
+        do {
             $result = $this->statement();
-        }
+            if ($result !== null && count($result) > 0) {
+                $statements[] = $result;
+            }
+        } while ($result !== null);
+
 
         return $statements;
     }
 
     /**
+     * Returns an array containing the tokens in the next statement of the input.
+     *
+     * Returns empty array on empty statements (i.e. repeated delimiters, like: ;;;).
+     *
+     * Returns null if End-Of-File reached.
+     *
      * @return string[]|null
      */
     protected function statement(): ?array
@@ -67,8 +75,13 @@ protected function statement(): ?array
         }
 
         $tokens = [];
+
         $token = $this->token();
         while ($token !== "") {
+            /**
+             * DEV NOTE: This checks for DELIMITER statement, that changes delimiter from ; to something else.
+             * If detected, it will extract the new DELIMITER and reassign $this->delimiter_pattern.
+             */
             if (is_string($token) && preg_match('/^delimiter$/i', $token) === 1) {
                 // Omit DELIMITER command - it isn't part of SQL statement syntax
 

tests/unit/SplitterCest.php

@@ -3,7 +3,7 @@
 namespace unit;
 
 use Codeception\Example;
-use Kodus\SQL\Splitter;
+use Kodus\SQLSplit\Splitter;
 use UnitTester;
 
 class SplitterCest

tests/unit/TokenizerCest.php

@@ -3,8 +3,7 @@
 namespace unit;
 
 use Codeception\Example;
-use Codeception\PHPUnit\TestCase;
-use Kodus\SQL\Tokenizer;
+use Kodus\SQLSplit\Tokenizer;
 use UnitTester;
 
 class TokenizerCest
@@ -138,6 +137,26 @@ protected function useCases(): array
                     ["/* three\nfour */", "\n", "SELECT", " ", "2"],
                 ],
             ],
+            [
+                self::MESSAGE  => "Empty statement - in between",
+                self::INPUT    => "SELECT 1;; SELECT 2",
+                self::EXPECTED => [["SELECT", " ", "1"], ["SELECT", " ", "2"]],
+            ],
+            [
+                self::MESSAGE  => "Empty statements - first",
+                self::INPUT    => ";;SELECT 1; SELECT 2;",
+                self::EXPECTED => [["SELECT", " ", "1"], ["SELECT", " ", "2"]],
+            ],
+            [
+                self::MESSAGE  => "Empty statements - last",
+                self::INPUT    => "SELECT 1; SELECT 2;;;",
+                self::EXPECTED => [["SELECT", " ", "1"], ["SELECT", " ", "2"]],
+            ],
+            [
+                self::MESSAGE  => "Empty statements - all over",
+                self::INPUT    => ";;;;SELECT 1;;;; SELECT 2;;;",
+                self::EXPECTED => [["SELECT", " ", "1"], ["SELECT", " ", "2"]],
+            ],
         ];
     }
 }