joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Updated profiler to only attempt to profile SELECT statements. Also optimized the sanity checks a bit so that we're not always running preg_match() when the profiler is disabled.

Browse source
This commit is contained in:
Josh Sherman 2011-05-05 23:14:59 -04:00
parent 3ded1097ff
commit 0d49ac0558
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
classes/Database/PDO/Common.php
View file

@ -137,19 +137,30 @@ class Database_PDO_Common extends Database_Common
Log::query($loggable_query);
$sql = trim($sql);
// Checks if the query is blank
if (trim($sql) != '')
if ($sql != '')
{
try
{
// Establishes if we're working on an EXPLAIN
$explaining = preg_match('/^EXPLAIN /i', $sql);
if (Profiler::enabled('explains') == true)
{
$explaining = preg_match('/^EXPLAIN /i', $sql);
$selecting = preg_match('/^SELECT /i', $sql);
}
else
{
$explaining = null;
$selecting = null;
}
// Executes a standard query
if ($input_parameters === null)
{
// Explains the query
if ($explaining == false && Profiler::enabled('explains'))
if ($selecting == true && $explaining == false)
{
$explain = $this->fetch('EXPLAIN ' . $sql);
}
@ -161,7 +172,7 @@ class Database_PDO_Common extends Database_Common
else
{
// Explains the query
if ($explaining == false && Profiler::enabled('explains'))
if ($selecting == true && $explaining == false)
{
$explain = $this->fetch('EXPLAIN ' . $sql, $input_parameters);
}