Improved query splitter to handle semicolons in quoted blocks

Author: intuibase

src/Instrumentation/MySqli/src/MySqliTracker.php

@@ -171,13 +171,22 @@ private function splitQueries(string $sql)
         $blockDepth = 0;
         $tokens = preg_split('/(;)/', $sql, -1, PREG_SPLIT_DELIM_CAPTURE); // Keep semicolons as separate tokens
 
+        $singleQuotes = 0;
+        $doubleQuotes = 0;
+
         foreach ($tokens as $token) {
             if ($token === '') {
                 continue;
             }
 
-            if ($blockDepth === 0) {
-                $token = trim($token);
+            $tokenLen = strlen($token);
+            for ($i = 0; $i < $tokenLen; $i++) {
+                if ($token[$i] == "'" && ($token[$i - 1] ?? false) !== '\\') {
+                    $singleQuotes++;
+                }
+                if ($token[$i] == '"' && ($token[$i - 1] ?? false) !== '\\') {
+                    $doubleQuotes++;
+                }
             }
 
             $buffer .= $token;
@@ -192,13 +201,20 @@ private function splitQueries(string $sql)
                 $blockDepth--;
             }
 
+            // we're somewhere inside qoutes
+            if (($singleQuotes % 2) != 0 || ($doubleQuotes % 2) != 0) {
+                continue;
+            }
+
             // If we are outside a block and encounter a semicolon, split the query
             if ($blockDepth === 0 && $token === ';') {
                 $trimmedQuery = trim($buffer);
                 if ($trimmedQuery !== ';') { // Ignore empty queries
                     $queries[] = $trimmedQuery;
                 }
                 $buffer = '';
+                $singleQuotes = 0;
+                $doubleQuotes = 0;
             }
         }
 

src/Instrumentation/MySqli/tests/Integration/MySqliInstrumentationTest.php

@@ -1374,7 +1374,6 @@ public function test_mysqli_select_db(): void
             ]);
         }
 
-
         mysqli_select_db($mysqli, $this->database);
 
         $res = $mysqli->query('SELECT * FROM users;');

src/Instrumentation/MySqli/tests/Integration/MySqliTrackerTest.php

@@ -55,6 +55,28 @@ public function test_split_queries_whitespaces(): void
         $this->assertEquals($expected, $result);
     }
 
+    public function test_split_queries_with_binding(): void
+    {
+        $query = '
+            INSERT INTO `tableA` (columnA) VALUES (\'hello; world\'); SELECT LAST_INSERT_ID();
+            INSERT INTO `tableA` (columnA) VALUES (?); SELECT LAST_INSERT_ID();
+            INSERT INTO `tableA` (columnA) VALUES (\'hel\\\'lo; \\"world\'); SELECT LAST_INSERT_ID();
+        ';
+
+        $result = $this->splitQueries->invoke($this->tracker, $query);
+
+        $expected = [
+            "INSERT INTO `tableA` (columnA) VALUES ('hello; world');",
+            'SELECT LAST_INSERT_ID();',
+            'INSERT INTO `tableA` (columnA) VALUES (?);',
+            'SELECT LAST_INSERT_ID();',
+            "INSERT INTO `tableA` (columnA) VALUES ('hel\'lo; \\\"world');",
+            'SELECT LAST_INSERT_ID();',
+        ];
+
+        $this->assertEquals($expected, $result);
+    }
+
     public function test_split_queries_with_begin_end(): void
     {
         $query = "