mirror_php/php-debugbar
1
0
Fork 0
mirror of https://github.com/maximebf/php-debugbar.git synced 2025-06-23 11:14:49 +02:00
Code Issues Releases Wiki Activity

Fix random instances of SQL queries having params repeated (#505)

Browse Source 
* Fix random instances of SQL queries having params repeated

* Add test
This commit is contained in:
Tadhg Boyle
2022-10-31 09:26:03 -04:00
committed by GitHub
parent 4458e2b164
commit fd43dfb084
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/DebugBar/DataCollector/PDO/TracedStatement.php
View File

@ -123,7 +123,11 @@ class TracedStatement
} }
$matchRule = "/({$marker}(?!\w))(?=(?:[^$quotationChar]|[$quotationChar][^$quotationChar]*[$quotationChar])*$)/"; $matchRule = "/({$marker}(?!\w))(?=(?:[^$quotationChar]|[$quotationChar][^$quotationChar]*[$quotationChar])*$)/";
for ($i = 0; $i <= mb_substr_count($sql, $k); $i++) { $count = mb_substr_count($sql, $k);
if ($count < 1) {
$count = mb_substr_count($sql, $matchRule);
}
for ($i = 0; $i <= $count; $i++) {
$sql = preg_replace($matchRule, $v, $sql, 1); $sql = preg_replace($matchRule, $v, $sql, 1);
} }
} }

21
tests/DebugBar/Tests/TracedStatementTest.php
View File

@ -150,4 +150,25 @@ class TracedStatementTest extends DebugBarTestCase
$result = $traced->getSqlWithParams(); $result = $traced->getSqlWithParams();
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }
/**
* Check that query parameters are being replaced only once
* @bugFix Before fix it: select * from
* `my_table` where `my_field` between
* <2018-01-01> and <2018-01-01>
* @return void
*/
public function testParametersAreNotRepeated()
{
$query = 'select * from `my_table` where `my_field` between ? and ?';
$bindings = [
'2018-01-01',
'2020-09-01',
];
$this->assertEquals(
'select * from `my_table` where `my_field` between <2018-01-01> and <2020-09-01>',
(new TracedStatement($query, $bindings))->getSqlWithParams()
);
}
} }