tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-01 08:59:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4582 from tractorcow/pulls/4.0/showqueries-params

Browse Source 
API showqueries=1 now shows parameters
This commit is contained in:
Loz Calver 2015-09-24 16:27:16 +01:00
commit 23bd11dd91
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
model/connect/Database.php
View File

@ -132,7 +132,8 @@ abstract class SS_Database {
$sql,
function($sql) use($connector, $parameters, $errorLevel) {
return $connector->preparedQuery($sql, $parameters, $errorLevel);
}
},
$parameters
);
}
@ -165,14 +166,20 @@ abstract class SS_Database {
*
* @param string $sql Query to run, and single parameter to callback
* @param callable $callback Callback to execute code
* @param array $parameters Parameters to display
* @return mixed Result of query
*/
protected function benchmarkQuery($sql, $callback) {
protected function benchmarkQuery($sql, $callback, $parameters = null) {
if (isset($_REQUEST['showqueries']) && Director::isDev()) {
$starttime = microtime(true);
$result = $callback($sql);
$endtime = round(microtime(true) - $starttime, 4);
Debug::message("\n$sql\n{$endtime}s\n", false);
$message = $sql;
if($parameters) {
$message .= "\nparams: \"" . implode('", "', $parameters) . '"';
}
Debug::message("\n{$message}\n{$endtime}s\n", false);
return $result;
} else {
return $callback($sql);