adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-06 11:32:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding a workaround to DboSource::showLog() to work around fix added in [da9c0da626].

Browse source 
Also adding explanation message when logs are not generated.
This commit is contained in:
mark_story 2010-08-26 21:24:09 -04:00
parent 123873b4d8
commit ea9e30890f
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/datasources/dbo_source.php
View file

@ -630,7 +630,7 @@ class DboSource extends DataSource {
$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");

10
cake/libs/view/elements/sql_dump.ctp
View file

@ -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;
?>