ba045f47b7554fedd89977949a22724452332eeb

Author: evilbloodydemon

Date: 2009-06-20 21:35:25 +0400

#20 additional fixes for postgres

diff --git a/controllers/components/toolbar.php b/controllers/components/toolbar.php index 7cc5240..0ddeb4e 100644 --- a/controllers/components/toolbar.php +++ b/controllers/components/toolbar.php @@ -625,7 +625,7 @@ class SqlLogPanel extends DebugPanel { **/ function _explainQuery(&$db, $queryString) { $driver = $db->config['driver']; - $results = null; + $return = null; if ($driver === 'mysqli' || $driver === 'mysql' || $driver === 'postgres') { $results = $db->query('EXPLAIN ' . $queryString); if ($driver === 'postgres') { @@ -633,7 +633,7 @@ class SqlLogPanel extends DebugPanel { foreach ($results as $postgreValue) { $queryPlan[] = array($postgreValue[0]['QUERY PLAN']); } - $results = array_merge(array('Query Plan'), $queryPlan); + $results = array_merge(array(array('')), $queryPlan); } else { $keys = array_keys($results[0][0]); foreach ($results as $mysqlValue) { diff --git a/views/elements/sql_log_panel.ctp b/views/elements/sql_log_panel.ctp index 3f29454..3daabc7 100644 --- a/views/elements/sql_log_panel.ctp +++ b/views/elements/sql_log_panel.ctp @@ -38,7 +38,7 @@ array_shift($explain['explain']); $cells[] = array($toolbar->table($explain['explain'], $headers), $explain['query']); } - $headers = array(__d('debug_kit', 'Plan', true), __d('debug_kit', 'Query', true)); + $headers = array(__d('debug_kit', 'Query plan', true), __d('debug_kit', 'Query', true)); echo $toolbar->table($cells, $headers, array('title' => 'Slow Queries ' . $dbName)); echo '</div>'; else: