Permalink
Browse files

Adding a workaround to DboSource::showLog() to work around fix added …

…in [da9c0da].

Also adding explanation message when logs are not generated.
  • Loading branch information...
1 parent 123873b commit ea9e30890fa80558fc8afb005cc22231c0e1d1db @markstory markstory committed Aug 27, 2010
Showing with 8 additions and 4 deletions.
  1. +1 −1 cake/libs/model/datasources/dbo_source.php
  2. +7 −3 cake/libs/view/elements/sql_dump.ctp
@@ -630,7 +630,7 @@ function showLog($sorted = false) {
$controller = null;
$View =& new View($controller, false);
$View->set('logs', array($this->configKeyName => $log));
- echo $View->element('sql_dump');
+ echo $View->element('sql_dump', array('_forced_from_dbo_' => true));
} else {
foreach ($log['log'] as $k => $i) {
print (($k + 1) . ". {$i['query']} {$i['error']}\n");
@@ -20,7 +20,8 @@
if (!class_exists('ConnectionManager') || Configure::read('debug') < 2) {
return false;
}
-if (!isset($logs)):
+$noLogs = !isset($logs);
+if ($noLogs):
$sources = ConnectionManager::sourceList();
$logs = array();
@@ -31,8 +32,9 @@ if (!isset($logs)):
endif;
$logs[$source] = $db->getLog();
endforeach;
+endif;
-
+if ($noLogs || isset($_forced_from_dbo_)):
foreach ($logs as $source => $logInfo):
$text = $logInfo['count'] > 1 ? 'queries' : 'query';
printf(
@@ -52,6 +54,8 @@ if (!isset($logs)):
?>
</tbody></table>
<?php
- endforeach;
+ endforeach;
+else:
+ echo '<p>Encountered unexpected $logs cannot generate SQL log</p>';
endif;
?>

0 comments on commit ea9e308

Please sign in to comment.