Merge pull request #5196 from sfadschm/timeline-query-strings

[Debug] Add formatted query string to timeline.

Author: kenjis

system/Debug/Toolbar.php

@@ -185,16 +185,18 @@ protected function renderTimelineRecursive(array $rows, float $startTime, int $s
 
         foreach ($rows as $row) {
             $hasChildren = isset($row['children']) && ! empty($row['children']);
+            $isQuery     = isset($row['query']) && ! empty($row['query']);
 
+            // Open controller timeline by default
             $open = $row['name'] === 'Controller';
 
-            if ($hasChildren) {
+            if ($hasChildren || $isQuery) {
                 $output .= '<tr class="timeline-parent' . ($open ? ' timeline-parent-open' : '') . '" id="timeline-' . $styleCount . '_parent" onclick="ciDebugBar.toggleChildRows(\'timeline-' . $styleCount . '\');">';
             } else {
                 $output .= '<tr>';
             }
 
-            $output .= '<td class="' . ($isChild ? 'debug-bar-width30' : '') . '" style="--level: ' . $level . ';">' . ($hasChildren ? '<nav></nav>' : '') . $row['name'] . '</td>';
+            $output .= '<td class="' . ($isChild ? 'debug-bar-width30' : '') . '" style="--level: ' . $level . ';">' . ($hasChildren || $isQuery ? '<nav></nav>' : '') . $row['name'] . '</td>';
             $output .= '<td class="' . ($isChild ? 'debug-bar-width10' : '') . '">' . $row['component'] . '</td>';
             $output .= '<td class="' . ($isChild ? 'debug-bar-width10 ' : '') . 'debug-bar-alignRight">' . number_format($row['duration'] * 1000, 2) . ' ms</td>';
             $output .= "<td class='debug-bar-noverflow' colspan='{$segmentCount}'>";
@@ -211,12 +213,22 @@ protected function renderTimelineRecursive(array $rows, float $startTime, int $s
             $styleCount++;
 
             // Add children if any
-            if ($hasChildren) {
+            if ($hasChildren || $isQuery) {
                 $output .= '<tr class="child-row" id="timeline-' . ($styleCount - 1) . '_children" style="' . ($open ? '' : 'display: none;') . '">';
                 $output .= '<td colspan="' . ($segmentCount + 3) . '" class="child-container">';
                 $output .= '<table class="timeline">';
                 $output .= '<tbody>';
-                $output .= $this->renderTimelineRecursive($row['children'], $startTime, $segmentCount, $segmentDuration, $styles, $styleCount, $level + 1, true);
+
+                if ($isQuery) {
+                    // Output query string if query
+                    $output .= '<tr>';
+                    $output .= '<td class="query-container" style="--level: ' . ($level + 1) . ';">' . $row['query'] . '</td>';
+                    $output .= '</tr>';
+                } else {
+                    // Recursively render children
+                    $output .= $this->renderTimelineRecursive($row['children'], $startTime, $segmentCount, $segmentDuration, $styles, $styleCount, $level + 1, true);
+                }
+
                 $output .= '</tbody>';
                 $output .= '</table>';
                 $output .= '</td>';

system/Debug/Toolbar/Collectors/Database.php

@@ -118,6 +118,7 @@ protected function formatTimelineData(): array
                 'component' => 'Database',
                 'start'     => $query['query']->getStartTime(true),
                 'duration'  => $query['query']->getDuration(),
+                'query'     => $query['query']->debugToolbarDisplay(),
             ];
         }