Skip to content

Commit a729ce4

Browse files
author
Samuel Akopyan
committed
Added possibility to hide system queries in debug panel
1 parent 23a89d2 commit a729ce4

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

‎CHANGELOG‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Version 1.4.x -
22
----------------------------
3+
- Enh: added possibility to hide system queries in debug panel
34
- Bug: fixed wrong assignment of _isRendered in CView
45

56

‎framework/core/CDebug.php‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,8 @@ public static function displayInfo()
409409
var arrDebugTabs = ["General","Params","Console","Warnings","Errors","Queries"];
410410
var debugTabsHeight = "200px";
411411
var cssText = keyTab = "";
412+
413+
function toggleSystemQueries(){var x, i; x = document.getElementsByClassName("dbugQuery");for(i = 0; i < x.length; i++){if(x[i].style.display === "none"){x[i].style.display = "";}else {x[i].style.display = "none";}}}
412414
function appSetCookie(state, tab){ document.cookie = "debugBarState="+state+"; path=/"; if(tab !== null) document.cookie = "debugBarTab="+tab+"; path=/"; }
413415
function appGetCookie(name){ if(document.cookie.length > 0){ start_c = document.cookie.indexOf(name + "="); if(start_c != -1){ start_c += (name.length + 1); end_c = document.cookie.indexOf(";", start_c); if(end_c == -1) end_c = document.cookie.length; return unescape(document.cookie.substring(start_c,end_c)); }} return ""; }
414416
function appTabsMiddle(){ appExpandTabs("middle", appGetCookie("debugBarTab")); }
@@ -663,11 +665,16 @@ function appExpandTabs(act, key){
663665
664666
<div id="contentQueries" style="display:none;padding:10px;width:100%;height:200px;overflow-y:auto;">';
665667
if ($totalQueries > 0) {
666-
$output .= A::t('core', 'SQL queries running time') . ': ' . $totalRunningTimeQueriesSql . ' sec.<br><br>';
668+
$output .= A::t('core', 'SQL queries running time') . ': ' . $totalRunningTimeQueriesSql . ' sec. <br><input type="checkbox" id="dbugToggleSysQueries" style="margin:'.($panelTextAlign == 'left' ? '5px 5px 0px 0px' : '5px 0px 0px 5px').';" onclick="toggleSystemQueries()" /><label for="dbugToggleSysQueries">Hide system queries</label><br><br>';
669+
$output .= '<ol style="padding-left:20px;">';
667670
foreach (self::$_arrQueries as $msgKey => $msgVal) {
668-
$output .= $msgKey . '<br>';
671+
$dbugQuery = preg_match('/(show|truncate)/i', $msgKey);
672+
$output .= '<li'.($dbugQuery ? ' class="dbugQuery"' : '').'>';
673+
$output .= preg_replace('#<span[^>]*>.*?</span>#si', '', $msgKey) . '<br>';
669674
$output .= $msgVal[0] . '<br><br>';
675+
$output .= '</li>';
670676
}
677+
$output .= '</ol>';
671678
}
672679
$output .= '</div>
673680

‎framework/db/CDatabase.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public function select($sql, $params = array(), $method = 'fetchAll', $fetchMode
236236
$finishTime = CTime::getMicrotime();
237237
$sqlTotalTime = round((float)$finishTime - (float)$startTime, 5);
238238
CDebug::addSqlTime($sqlTotalTime);
239-
CDebug::addMessage('queries', ++self::$count . '. select | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? count($result) : '0 (<b>' . ($error ? 'error' : 'empty') . '</b>)') . ($cacheContent ? ' <b>[cached]</b>' : '') . '</i>', $this->_query);
239+
CDebug::addMessage('queries', '<span class="dbugNum">'.++self::$count . '.</span> select | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? count($result) : '0 (<b>' . ($error ? 'error' : 'empty') . '</b>)') . ($cacheContent ? ' <b>[cached]</b>' : '') . '</i>', $this->_query);
240240
}
241241

242242
return $result;
@@ -301,7 +301,7 @@ public function insert($table, $data, $forceUpdate = false)
301301
$finishTime = CTime::getMicrotime();
302302
$sqlTotalTime = round((float)$finishTime - (float)$startTime, 5);
303303
CDebug::addSqlTime($sqlTotalTime);
304-
CDebug::addMessage('queries', ++self::$count . '. insert | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>ID: ' . (($result) ? $result : '0 (<b>error</b>)') . '</i>', $this->_query);
304+
CDebug::addMessage('queries', '<span class="dbugNum">' . ++self::$count . '.</span> insert | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>ID: ' . (($result) ? $result : '0 (<b>error</b>)') . '</i>', $this->_query);
305305
}
306306

307307
return $result;
@@ -385,7 +385,7 @@ public function update($table, $data, $where = '1', $params = array(), $forceUpd
385385
$finishTime = CTime::getMicrotime();
386386
$sqlTotalTime = round((float)$finishTime - (float)$startTime, 5);
387387
CDebug::addSqlTime($sqlTotalTime);
388-
CDebug::addMessage('queries', ++self::$count . '. update | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? $sth->rowCount() : '0 (<b>error</b>)') . '</i>', $this->_query);
388+
CDebug::addMessage('queries', '<span class="dbugNum">'.++self::$count . '.</span> update | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? $sth->rowCount() : '0 (<b>error</b>)') . '</i>', $this->_query);
389389
}
390390

391391
return $result;
@@ -436,7 +436,7 @@ public function delete($table, $where = '', $params = array())
436436
$finishTime = CTime::getMicrotime();
437437
$sqlTotalTime = round((float)$finishTime - (float)$startTime, 5);
438438
CDebug::addSqlTime($sqlTotalTime);
439-
CDebug::addMessage('queries', ++self::$count . '. delete | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? $result : '0 (<b>warning</b>)') . '</i>', $this->_query);
439+
CDebug::addMessage('queries', '<span class="dbugNum">'.++self::$count . '.</span> delete | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? $result : '0 (<b>warning</b>)') . '</i>', $this->_query);
440440
}
441441

442442
return $result;
@@ -478,7 +478,7 @@ public function truncate($table)
478478
$finishTime = CTime::getMicrotime();
479479
$sqlTotalTime = round((float)$finishTime - (float)$startTime, 5);
480480
CDebug::addSqlTime($sqlTotalTime);
481-
CDebug::addMessage('queries', ++self::$count . '. truncate | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? $result : '0 (<b>warning</b>)') . '</i>', $this->_query);
481+
CDebug::addMessage('queries', '<span class="dbugNum">'.++self::$count . '.</span> truncate | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? $result : '0 (<b>warning</b>)') . '</i>', $this->_query);
482482
}
483483

484484
return $result;
@@ -545,7 +545,7 @@ public function customQuery($sql, $params = array(), $fetchMode = PDO::FETCH_ASS
545545
$finishTime = CTime::getMicrotime();
546546
$sqlTotalTime = round((float)$finishTime - (float)$startTime, 5);
547547
CDebug::addSqlTime($sqlTotalTime);
548-
CDebug::addMessage('queries', ++self::$count . '. query | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? count($result) : '0 (<b>error</b>)') . '</i>', $this->_query);
548+
CDebug::addMessage('queries', '<span class="dbugNum">'.++self::$count . '.</span> query | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? count($result) : '0 (<b>error</b>)') . '</i>', $this->_query);
549549
}
550550

551551
return $result;
@@ -594,7 +594,7 @@ public function customExec($sql, $params = array(), $forceUpdate = false)
594594
$finishTime = CTime::getMicrotime();
595595
$sqlTotalTime = round((float)$finishTime - (float)$startTime, 5);
596596
CDebug::addSqlTime($sqlTotalTime);
597-
CDebug::addMessage('queries', ++self::$count . '. query | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? $result : '0 (<b>error</b>)') . '</i>', $this->_query);
597+
CDebug::addMessage('queries', '<span class="dbugNum">'.++self::$count . '.</span> query | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? $result : '0 (<b>error</b>)') . '</i>', $this->_query);
598598
}
599599

600600
return $result;
@@ -659,7 +659,7 @@ public function showTables()
659659
$finishTime = CTime::getMicrotime();
660660
$sqlTotalTime = round((float)$finishTime - (float)$startTime, 5);
661661
CDebug::addSqlTime($sqlTotalTime);
662-
CDebug::addMessage('queries', ++self::$count . '. query | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? count($result) : '0 (<b>error</b>)') . '</i>', $this->_query);
662+
CDebug::addMessage('queries', '<span class="dbugNum">'.++self::$count . '.</span> query | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? count($result) : '0 (<b>error</b>)') . '</i>', $this->_query);
663663
}
664664

665665
return $result;
@@ -722,7 +722,7 @@ public function showColumns($table = '')
722722
$finishTime = CTime::getMicrotime();
723723
$sqlTotalTime = round((float)$finishTime - (float)$startTime, 5);
724724
CDebug::addSqlTime($sqlTotalTime);
725-
CDebug::addMessage('queries', ++self::$count . '. query | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? count($result) : '0 (<b>error</b>)') . ($cacheContent ? ' <b>[cached]</b>' : '') . '</i>', $this->_query);
725+
CDebug::addMessage('queries', '<span class="dbugNum">'.++self::$count . '</span> show | ' . $sqlTotalTime . ' ' . A::t('core', 'sec') . '. | <i>' . A::t('core', 'total') . ': ' . (($result) ? count($result) : '0 (<b>error</b>)') . ($cacheContent ? ' <b>[cached]</b>' : '') . '</i>', $this->_query);
726726
}
727727

728728
return $result;

0 commit comments

Comments
 (0)