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

Improve displayQuery and benchmarkQuery functions and whitelist_array variable

Browse Source
This commit is contained in:
shoosah 2019-05-28 11:47:32 +12:00
parent d684c69f09
commit d740998463
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,17 @@ abstract class Database
const PARTIAL_QUERY = 'partial_query';
const FULL_QUERY = 'full_query';
/**
* To use, call from _config.php
* Example:
* <code>
* Database::setWhitelistQueryArray([
* 'Qualmark' => 'partial_query',
* 'SELECT "Version" FROM "SiteTree_Live" WHERE "ID" = ?' => 'full_query',
* ])
* </code>
* @internal
* @var array
*/
protected static $whitelist_array = [];
@ -225,17 +235,19 @@ abstract class Database
$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);
foreach (self::$whitelist_array as $query => $searchType) {
$fullQuery = ($searchType === self::FULL_QUERY && $query === $sql);
$partialQuery = ($searchType === self::PARTIAL_QUERY && mb_strpos($sql, $query) !== false);
if (!$fullQuery && !$partialQuery) {
continue;
}
$sql = DB::inline_parameters($sql, $parameters);
$this->displayQuery($sql, $endtime);
}
}
if ($displaySql) {
$this->displayQuery($this->queryCount, $sql, $endtime);
$this->displayQuery($sql, $endtime);
}
// Show a backtrace if ?showqueries=backtrace
@ -251,13 +263,12 @@ abstract class Database
/**
* Display query message
*
* @param int $queryCount
* @param mixed $query
* @param float $endtime
*/
private function displayQuery($queryCount, $query, $endtime)
private function displayQuery($query, $endtime)
{
$queryCount = sprintf("%04d", $queryCount);
$queryCount = sprintf("%04d", $this->queryCount);
Debug::message("\n$queryCount: $query\n{$endtime}s\n", false);
}
@ -265,11 +276,10 @@ abstract class Database
* 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;
self::$whitelist_array = $whitelistArray;
}
/**