preliminary support for MySQL DELIMITER commands

Author: mindplay-dk

src/SQLTokenizer.php

@@ -16,6 +16,11 @@ class SQLTokenizer
      */
     protected $input;
 
+    /**
+     * @var string
+     */
+    protected $delimiter_pattern = ";";
+
     /**
      * @param string $input
      *
@@ -60,18 +65,36 @@ protected function statement()
 
         $tokens = [];
 
-        while ($token = $this->token()) {
+        while ("" !== $token = $this->token()) {
+            if (is_string($token) && preg_match('/^delimiter$/i', $token) === 1) {
+                $this->consume('[ ]*');
+
+                $delimiter = trim($this->consume('.*?[\r\n]+'));
+
+                if ($delimiter === "") {
+                    $this->fail("expected delimiter character(s)");
+                }
+
+                $this->delimiter_pattern = preg_quote($delimiter);
+
+                continue; // omits DELIMITER command - it isn't part of SQL statement syntax
+            }
+
             $tokens[] = $token;
         }
 
         return $tokens;
     }
 
     /**
-     * @return string|array
+     * @return array|string
      */
     protected function token()
     {
+        if ($this->consume($this->delimiter_pattern)) {
+            return ""; // end of statement
+        }
+
         if ("" !== $token = $this->consume('\w+')) {
             return $token;
         }
@@ -84,7 +107,11 @@ protected function token()
             return $token;
         }
 
-        if ($token = $this->consume('[\*,.+-\/=]')) {
+        if ($token = $this->consume('[\*,.+-\/=;<>]')) {
+            return $token;
+        }
+
+        if ($token = $this->consume('\@\w+')) {
             return $token;
         }
 
@@ -108,10 +135,6 @@ protected function token()
             return ""; // end of file/statement
         }
 
-        if ($this->consume(";")) {
-            return ""; // end of statement
-        }
-
         $this->fail("expected SQL token");
     }
 
@@ -181,7 +204,7 @@ protected function grouped()
                 if ($this->is($closing)) {
                     $tokens[] = $closing;
 
-                    $this->offset +=1 ;
+                    $this->offset +=1;
 
                     return $tokens;
                 }

test/test.php

@@ -203,7 +203,7 @@ function () {
 EXECUTE PROCEDURE "blocks".delete_orphaned_blocks();
 SQL;
 
-test("complex real-world use-case", function () use ($sql_template) {
+test("postgres use-case", function () use ($sql_template) {
     $expected_statements = array_map(
         function (string $sql) {
             return rtrim(trim($sql), ";");
@@ -218,4 +218,36 @@ function (string $sql) {
     }
 });
 
+$mysql_script = <<<SQL
+-- delimiter test
+DELIMITER $$
+
+CREATE PROCEDURE dorepeat(p1 INT)
+ BEGIN
+   SET @x = 0; -- comment
+   REPEAT SET @x = @x + 1; UNTIL @x > p1 END REPEAT;
+ END $$
+
+DELIMITER ;
+-- comment
+CALL dorepeat(1000);
+SELECT @x;
+SQL;
+
+$mysql_statements = <<<SQL
+CREATE PROCEDURE dorepeat(p1 INT)
+ BEGIN
+   SET @x = 0;
+   REPEAT SET @x = @x + 1; UNTIL @x > p1 END REPEAT;
+ END
+-----
+CALL dorepeat(1000)
+-----
+SELECT @x
+SQL;
+
+test("mysql use-case", function () use ($mysql_script, $mysql_statements) {
+    eq(SQLSplitter::split($mysql_script), array_map("trim", explode("-----", $mysql_statements)));
+});
+
 exit(run());