Development

Changeset 1363

You must first sign up to be able to contribute.

Changeset 1363

Show
Ignore:
Timestamp:
05/14/06 14:00:53 (3 years ago)
Author:
fabien
Message:

added sql queries to the web debug toolbar

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/data/web/sf/css/sf_web_debug/main.css

    r1362 r1363  
    6565  padding: 0; 
    6666  border: 0; 
     67} 
     68 
     69#sfWebDebugDatabaseDetails li 
     70{ 
     71  margin: 0; 
     72  margin-left: 30px; 
     73  padding: 0 5px; 
    6774} 
    6875 

  • trunk/data/web/sf/js/sf_web_debug/main.js

    r1352 r1363  
    3939    document.getElementById('sfWebDebugLog').style.display = 'none'; 
    4040    document.getElementById('sfWebDebugConfig').style.display = 'none'; 
     41    document.getElementById('sfWebDebugDatabaseDetails').style.display = 'none'; 
    4142  } 
    4243 

  • trunk/lib/debug/sfWebDebug.class.php

    r1362 r1363  
    173173    } 
    174174 
     175    $logs = ''; 
     176    $sql_logs = array(); 
    175177    if ($sf_logging_active) 
    176178    { 
    177       $logs = '<table id="sfWebDebugLogs">'; 
    178       $logs .= "<tr> 
    179         <th>#</th> 
    180         <th>&nbsp;</th> 
    181         <th>ms</th> 
    182         <th>type</th> 
    183         <th>message</th> 
    184       </tr>\n"; 
     179      $logs = '<table id="sfWebDebugLogs"> 
     180        <tr> 
     181          <th>#</th> 
     182          <th>&nbsp;</th> 
     183          <th>ms</th> 
     184          <th>type</th> 
     185          <th>message</th> 
     186        </tr>'."\n"; 
    185187      $line_nb = 0; 
    186188      foreach($this->log as $logEntry) 
    …… 
    210212        $log = $this->formatLogLine($type, $log); 
    211213 
     214        // sql queries log 
     215        if (preg_match('/executeQuery.+?\:\s+(.+)$/', $log, $match)) 
     216        { 
     217          $sql_logs[] .= $match[1]; 
     218        } 
     219 
    212220        ++$line_nb; 
    213221        $logs .= sprintf("<tr class='sfWebDebugLogLine sfWebDebug%s %s'><td>%s</td><td>%s</td><td>+%s&nbsp;</td><td><span class=\"sfWebDebugLogType\">%s</span></td><td>%s%s</td></tr>\n", ucfirst($priority), $logEntry->getType(), $line_nb, image_tag($this->base_image_path.'/'.$priority.'.png'), $logEntry->getElapsedTime(), $type, $log, $debug_info); 
    …… 
    235243    if (sfConfig::get('sf_logging_active')) 
    236244    { 
    237       $logLink = '<li><a href="#" onclick="document.getElementById(\'sfWebDebugConfig\').style.display=\'none\';sfWebDebugToggle(\'sfWebDebugLog\')"><img src="'.$this->base_image_path.'/comment.png" /> logs &amp; msgs</a></li>'; 
     245      $logLink = '<li><a href="#" onclick="document.getElementById(\'sfWebDebugConfig\').style.display=\'none\';document.getElementById(\'sfWebDebugDatabaseDetails\').style.display=\'none\';sfWebDebugToggle(\'sfWebDebugLog\')"><img src="'.$this->base_image_path.'/comment.png" /> logs &amp; msgs</a></li>'; 
    238246    } 
    239247 
    240248    // database information 
    241249    $dbInfo = ''; 
     250    $dbInfoDetails = ''; 
    242251    if (null !== ($nb = $this->getDatabaseRequestNumber())) 
    243252    { 
    244       $dbInfo = '<li><img src="'.$this->base_image_path.'/database.png" /> '.$nb.'</li>'; 
     253      $dbInfo = '<li><a href="#" onclick="document.getElementById(\'sfWebDebugConfig\').style.display=\'none\';document.getElementById(\'sfWebDebugLog\').style.display=\'none\';sfWebDebugToggle(\'sfWebDebugDatabaseDetails\')"><img src="'.$this->base_image_path.'/database.png" /> '.$nb.'</a></li>'; 
     254 
     255      $dbInfoDetails = ' 
     256        <div id="sfWebDebugDatabaseDetails"> 
     257        <ol><li>'.implode('</><li>', $sql_logs).'</li></ol> 
     258        </div> 
     259      '; 
    245260    } 
    246261 
    …… 
    291306        <a href="#" onclick="sfWebDebugToggleMenu()"><img src="'.$this->base_image_path.'/sf.png" /></a> 
    292307        <ul id="sfWebDebugDetails" class="menu"> 
    293           <li><a href="#" onclick="document.getElementById(\'sfWebDebugLog\').style.display=\'none\';sfWebDebugToggle(\'sfWebDebugConfig\')"><img src="'.$this->base_image_path.'/config.png" /> vars &amp; config</a></li> 
     308          <li><a href="#" onclick="document.getElementById(\'sfWebDebugLog\').style.display=\'none\';document.getElementById(\'sfWebDebugDatabaseDetails\').style.display=\'none\';sfWebDebugToggle(\'sfWebDebugConfig\')"><img src="'.$this->base_image_path.'/config.png" /> vars &amp; config</a></li> 
    294309          '.$cacheLink.' 
    295310          '.$logLink.' 
    …… 
    309324      <h1>Configuration and request variables</h1> 
    310325      '.$this->getCurrentConfigAsHtml().' 
     326      </div> 
     327 
     328      <div id="sfWebDebugDatabaseDetails" class="top" style="display: none"> 
     329      <h1>SQL queries</h1> 
     330      '.$dbInfoDetails 
     331      .' 
    311332      </div> 
    312333    </div> 

The Sensio Labs Network

Since 1998, Sensio Labs has been promoting the Open-Source software movement by providing quality web application development, training, consulting, and supporting several large Open-Source projects.

Open-Source Software

Services

> More