tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-30 00:19:25 +02:00
Code Issues Projects Releases Wiki Activity

Allow displaying partial/full query message for debugging

Browse Source
This commit is contained in:
shoosah 2019-05-27 12:45:04 +12:00
parent 5851979096
commit d684c69f09
1 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/ORM/Connect/Database.php
View File

@ -20,6 +20,13 @@ use SilverStripe\Dev\Backtrace;
abstract class Database
{
const PARTIAL_QUERY = 'partial_query';
const FULL_QUERY = 'full_query';
/**
* @var array
*/
protected static $whitelist_array = [];
/**
* Database connector object
*
@ -208,6 +215,7 @@ abstract class Database
protected function benchmarkQuery($sql, $callback, $parameters = array())
{
if (isset($_REQUEST['showqueries']) && Director::isDev()) {
$displaySql = true;
$this->queryCount++;
$starttime = microtime(true);
$result = $callback($sql);
@ -215,9 +223,20 @@ abstract class Database
// replace parameters as closely as possible to what we'd expect the DB to put in
if (in_array(strtolower($_REQUEST['showqueries']), ['inline', 'backtrace'])) {
$sql = DB::inline_parameters($sql, $parameters);
} elseif (strtolower($_REQUEST['showqueries']) === 'whitelist') {
$displaySql = false;
foreach (static::$whitelist_array as $query => $searchType) {
if (($searchType === static::FULL_QUERY && $query === $sql) ||
($searchType === static::PARTIAL_QUERY && mb_strpos($sql, $query) !== false)) {
$sql = DB::inline_parameters($sql, $parameters);
$this->displayQuery($this->queryCount, $sql, $endtime);
}
}
}
if ($displaySql) {
$this->displayQuery($this->queryCount, $sql, $endtime);
}
$queryCount = sprintf("%04d", $this->queryCount);
Debug::message("\n$queryCount: $sql\n{$endtime}s\n", false);
// Show a backtrace if ?showqueries=backtrace
if ($_REQUEST['showqueries'] === 'backtrace') {
@ -229,6 +248,30 @@ abstract class Database
}
}
/**
* Display query message
*
* @param int $queryCount
* @param mixed $query
* @param float $endtime
*/
private function displayQuery($queryCount, $query, $endtime)
{
$queryCount = sprintf("%04d", $queryCount);
Debug::message("\n$queryCount: $query\n{$endtime}s\n", false);
}
/**
* Add the sql queries that need to be partially or fully matched
*
* @param array $whitelistArray
* @return mixed Result of query
*/
public static function setWhitelistQueryArray($whitelistArray)
{
static::$whitelist_array = $whitelistArray;
}
/**
* Get the autogenerated ID from the previous INSERT query.
*