BaseDriver: fix parsing of SQL with consecutive delimiters [closes #112]

nextras · Oct 4, 2020 · 6d5983d · 6d5983d
1 parent bfc8b0a
commit 6d5983d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/Drivers/BaseDriver.php b/src/Drivers/BaseDriver.php
@@ -86,7 +86,7 @@ public function loadFile($path)
 		];
 
 		while (TRUE) {
-			if (preg_match($delimiterRe, $content, $match, 0, $queryOffset)) {
+			while (preg_match($delimiterRe, $content, $match, 0, $queryOffset)) {
 				$delimiter = $match[1];
 				$queryOffset += strlen($match[0]);
 				$parseOffset += strlen($match[0]);

diff --git a/tests/cases/unit/BaseDriverTest.phpt b/tests/cases/unit/BaseDriverTest.phpt
@@ -95,6 +95,30 @@ class BaseDriverTest extends Tester\TestCase
 					"\n--\nSELECT 2",
 				],
 			],
+			[
+				implode("\n", [
+					'DELIMITER ;;',
+					'SELECT 1;;',
+					'DELIMITER ;',
+					'DELIMITER ;;',
+					'SELECT 2;;',
+					'DELIMITER ;',
+				]),
+				[
+					"\nSELECT 1",
+					"\nSELECT 2",
+				]
+			],
+			[
+				implode("\n", [
+					'SELECT 1;',
+					'DELIMITER ;;',
+					'DELIMITER ;',
+				]),
+				[
+					"SELECT 1",
+				]
+			],
 		];
 	}
 }