BUGFIX: Correctly parse table name for some edge cases

Sebobo · Sebobo · commit 015cc60e1d96 · 2025-06-11T21:44:43.000+02:00
diff --git a/Classes/Logging/DebugStack.php b/Classes/Logging/DebugStack.php
@@ -81,8 +81,9 @@ public function stopQuery(): void
     protected function parseTableName(string $sql): string
     {
         $sql = strtolower($sql);
-        $start = strpos($sql, 'from ') + 5;
-        $end = strpos($sql, ' ', $start);
-        return substr($sql, $start, $end - $start);
+        if (preg_match('/from\s+([`"\[]?[\w.]+[`"\]]?)/', $sql, $matches)) {
+            return trim($matches[1], '`"[]');
+        }
+        return '';
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,9 @@ public function stopQuery(): void`
`81`	`81`	`protected function parseTableName(string $sql): string`
`82`	`82`	`{`
`83`	`83`	`$sql = strtolower($sql);`
`84`		`- $start = strpos($sql, 'from ') + 5;`
`85`		`- $end = strpos($sql, ' ', $start);`
`86`		`- return substr($sql, $start, $end - $start);`
	`84`	+ if (preg_match('/from\s+([`"\[]?[\w.]+[`"\]]?)/', $sql, $matches)) {
	`85`	+ return trim($matches[1], '`"[]');
	`86`	`+ }`
	`87`	`+ return '';`
`87`	`88`	`}`
`88`	`89`	`}`