Skip to content

Commit bf0159a

Browse files
paulbalandanpaulbalandan
committed
Add structured trace for all DB drivers
1 parent 427eeeb commit bf0159a

File tree

7 files changed

+115
-15
lines changed

7 files changed

+115
-15
lines changed

‎system/Database/MySQLi/Connection.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,12 @@ protected function execute(string $sql)
326326
try {
327327
return $this->connID->query($this->prepQuery($sql), $this->resultMode);
328328
} catch (mysqli_sql_exception $e) {
329-
log_message('error', (string) $e);
329+
log_message('error', "{message}\nin {exFile} on line {exLine}.\n{trace}", [
330+
'message' => $e->getMessage(),
331+
'exFile' => clean_path($e->getFile()),
332+
'exLine' => $e->getLine(),
333+
'trace' => render_backtrace($e->getTrace()),
334+
]);
330335

331336
if ($this->DBDebug) {
332337
throw new DatabaseException($e->getMessage(), $e->getCode(), $e);

‎system/Database/OCI8/Connection.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,14 @@ protected function execute(string $sql)
226226

227227
return $result;
228228
} catch (ErrorException $e) {
229-
log_message('error', (string) $e);
229+
$trace = array_slice($e->getTrace(), 2); // remove call to error handler
230+
231+
log_message('error', "{message}\nin {exFile} on line {exLine}.\n{trace}", [
232+
'message' => $e->getMessage(),
233+
'exFile' => clean_path($e->getFile()),
234+
'exLine' => $e->getLine(),
235+
'trace' => render_backtrace($trace),
236+
]);
230237

231238
if ($this->DBDebug) {
232239
throw new DatabaseException($e->getMessage(), $e->getCode(), $e);

‎system/Database/Postgre/Connection.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,14 @@ protected function execute(string $sql)
205205
try {
206206
return pg_query($this->connID, $sql);
207207
} catch (ErrorException $e) {
208-
log_message('error', (string) $e);
208+
$trace = array_slice($e->getTrace(), 2); // remove the call to error handler
209+
210+
log_message('error', "{message}\nin {exFile} on line {exLine}.\n{trace}", [
211+
'message' => $e->getMessage(),
212+
'exFile' => clean_path($e->getFile()),
213+
'exLine' => $e->getLine(),
214+
'trace' => render_backtrace($trace),
215+
]);
209216

210217
if ($this->DBDebug) {
211218
throw new DatabaseException($e->getMessage(), $e->getCode(), $e);

‎system/Database/SQLSRV/Connection.php

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -488,14 +488,21 @@ public function setDatabase(?string $databaseName = null)
488488
*/
489489
protected function execute(string $sql)
490490
{
491-
$stmt = ($this->scrollable === false || $this->isWriteType($sql)) ?
492-
sqlsrv_query($this->connID, $sql) :
493-
sqlsrv_query($this->connID, $sql, [], ['Scrollable' => $this->scrollable]);
491+
$stmt = ($this->scrollable === false || $this->isWriteType($sql))
492+
? sqlsrv_query($this->connID, $sql)
493+
: sqlsrv_query($this->connID, $sql, [], ['Scrollable' => $this->scrollable]);
494494

495495
if ($stmt === false) {
496496
$error = $this->error();
497-
498-
log_message('error', $error['message']);
497+
$trace = debug_backtrace();
498+
$first = array_shift($trace);
499+
500+
log_message('error', "{message}\nin {exFile} on line {exLine}.\n{trace}", [
501+
'message' => $error['message'],
502+
'exFile' => clean_path($first['file']),
503+
'exLine' => $first['line'],
504+
'trace' => render_backtrace($trace),
505+
]);
499506

500507
if ($this->DBDebug) {
501508
throw new DatabaseException($error['message']);

‎system/Database/SQLite3/Connection.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,12 @@ protected function execute(string $sql)
175175
? $this->connID->exec($sql)
176176
: $this->connID->query($sql);
177177
} catch (Exception $e) {
178-
log_message('error', (string) $e);
178+
log_message('error', "{message}\nin {exFile} on line {exLine}.\n{trace}", [
179+
'message' => $e->getMessage(),
180+
'exFile' => clean_path($e->getFile()),
181+
'exLine' => $e->getLine(),
182+
'trace' => render_backtrace($e->getTrace()),
183+
]);
179184

180185
if ($this->DBDebug) {
181186
throw new DatabaseException($e->getMessage(), $e->getCode(), $e);

‎tests/system/Database/Live/ExecuteLogMessageFormatTest.php

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/**
6+
* This file is part of CodeIgniter 4 framework.
7+
*
8+
* (c) CodeIgniter Foundation <[email protected]>
9+
*
10+
* For the full copyright and license information, please view
11+
* the LICENSE file that was distributed with this source code.
12+
*/
13+
14+
namespace CodeIgniter\Database\Live;
15+
16+
use CodeIgniter\Test\CIUnitTestCase;
17+
use CodeIgniter\Test\DatabaseTestTrait;
18+
use CodeIgniter\Test\TestLogger;
19+
use Config\Database;
20+
use PHPUnit\Framework\Attributes\Group;
21+
22+
/**
23+
* @internal
24+
*/
25+
#[Group('DatabaseLive')]
26+
final class ExecuteLogMessageFormatTest extends CIUnitTestCase
27+
{
28+
use DatabaseTestTrait;
29+
30+
protected function setUp(): void
31+
{
32+
$this->db = Database::connect(getShared: false);
33+
$this->disableDBDebug();
34+
35+
parent::setUp();
36+
}
37+
38+
protected function tearDown(): void
39+
{
40+
$this->enableDBDebug();
41+
42+
parent::tearDown();
43+
}
44+
45+
public function testLogMessageWhenExecuteFailsShowFullStructuredBacktrace(): void
46+
{
47+
$sql = 'SELECT * FROM some_table WHERE id = ? AND status = ? AND author = ?';
48+
$this->db->query($sql, [3, 'live', 'Rick']);
49+
50+
$message = match ($this->db->DBDriver) {
51+
'MySQLi' => 'Table \'test.some_table\' doesn\'t exist',
52+
'Postgre' => 'pg_query(): Query failed: ERROR: relation "some_table" does not exist',
53+
'SQLite3' => 'Unable to prepare statement: no such table: some_table',
54+
'OCI8' => 'oci_execute(): ORA-00942: table or view does not exist',
55+
'SQLSRV' => '[Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Invalid object name \'some_table\'.',
56+
default => 'Unknown DB error',
57+
};
58+
$messageFromLogs = explode("\n", $this->getPrivateProperty(TestLogger::class, 'op_logs')[0]['message']);
59+
60+
$this->assertSame($message, array_shift($messageFromLogs));
61+
62+
if ($this->db->DBDriver === 'Postgre') {
63+
$messageFromLogs = array_slice($messageFromLogs, 2);
64+
} elseif ($this->db->DBDriver === 'OCI8') {
65+
$messageFromLogs = array_slice($messageFromLogs, 1);
66+
}
67+
68+
$this->assertMatchesRegularExpression('/^in \S+ on line \d+\.$/', array_shift($messageFromLogs));
69+
70+
foreach ($messageFromLogs as $line) {
71+
$this->assertMatchesRegularExpression('/^\s*\d* .+(?:\(\d+\))?: \S+(?:(?:\->|::)\S+)?\(.*\)$/', $line);
72+
}
73+
}
74+
}

‎utils/phpstan-baseline/missingType.iterableValue.neon

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# total 1672 errors
1+
# total 1670 errors
22

33
parameters:
44
ignoreErrors:
@@ -2417,11 +2417,6 @@ parameters:
24172417
count: 1
24182418
path: ../../system/Debug/Exceptions.php
24192419

2420-
-
2421-
message: '#^Method CodeIgniter\\Debug\\Exceptions\:\:renderBacktrace\(\) has parameter \$backtrace with no value type specified in iterable type array\.$#'
2422-
count: 1
2423-
path: ../../system/Debug/Exceptions.php
2424-
24252420
-
24262421
message: '#^Method CodeIgniter\\Debug\\Exceptions\:\:respond\(\) has parameter \$data with no value type specified in iterable type array\.$#'
24272422
count: 1

0 commit comments

Comments
 (0)