apply changes from Christopher-HM

cakephp · Jan 4, 2024 · b96c1fd · b96c1fd
1 parent 77b6026
commit b96c1fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/Database/Log/DebugLog.php b/src/Database/Log/DebugLog.php
@@ -138,10 +138,13 @@ public function log($level, string|Stringable $message, array $context = []): vo
             $this->_totalTime += $context['response']['took'];
 
             $this->_queries[] = [
-                'isSqlQuery' => false,
-                'query' => $context['request'],
-                'took' => $context['response']['took'],
-                'rows' => $context['response']['hits']['total'],
+                'query' => json_encode([
+                    'method' => $context['request']['method'],
+                    'path' => $context['request']['path'],
+                    'data' => $context['request']['data'],
+                ], JSON_PRETTY_PRINT),
+                'took' => $context['response']['took'] ?: 0,
+                'rows' => $context['response']['hits']['total']['value'] ?? $context['response']['hits']['total'] ?? 0,
             ];
 
             return;
@@ -159,7 +162,6 @@ public function log($level, string|Stringable $message, array $context = []): vo
         $this->_totalTime += $data['took'];
 
         $this->_queries[] = [
-            'isSqlQuery' => true,
             'query' => (string)$query,
             'took' => $data['took'],
             'rows' => $data['numRows'],

diff --git a/templates/element/sql_log_panel.php b/templates/element/sql_log_panel.php
@@ -75,8 +75,7 @@
                         <?php foreach ($queries as $query) : ?>
                         <tr>
                             <td>
-                                <?php
-                                if ($query['isSqlQuery']):
+                                <?= ($query['isSqlQuery']):
                                     echo (new SqlFormatter(
                                         new HtmlHighlighter([
                                             HtmlHighlighter::HIGHLIGHT_QUOTE => 'style="color: #004d40;"',
@@ -86,10 +85,7 @@
                                             HtmlHighlighter::HIGHLIGHT_PRE => 'style="color: #222; background-color: transparent;"',
                                         ])
                                     ))
-                                    ->format($query['query']);
-                                else:
-                                    print_r($query['query']);
-                                endif; ?>
+                                    ->format($query['query']) ?>
                             </td>
                             <td><?= h($query['rows']) ?></td>
                             <td><?= h($query['took']) ?></td>