mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-04 21:28:02 +02:00
Code Issues Releases Wiki Activity

- requires FirePHP 0.2

Browse Source 
- improved DibiFluent
This commit is contained in:
David Grudl
2008-10-25 15:36:37 +00:00
parent 56628144b4
commit e221a13dda
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dibi/libs/DibiFluent.php
View File

@@ -40,6 +40,8 @@ class DibiFluent extends DibiObject
/** @var array */
public static $modifiers = array(
'SELECT' => '%n',
'IN' => '%l',
'VALUES' => '%l',
'SET' => '%a',
'WHERE' => '%and',
@@ -120,8 +122,13 @@ class DibiFluent extends DibiObject
} elseif (is_string($arg) && preg_match('#^[a-z][a-z0-9_.]*$#i', $arg)) { // identifier
$args = array('%n', $arg);
} elseif (is_array($arg) && is_string(key($arg))) { // associative array
$args = array(isset(self::$modifiers[$clause]) ? self::$modifiers[$clause] : '%a', $arg);
} elseif (is_array($arg)) { // any array
if (isset(self::$modifiers[$clause])) {
$args = array(self::$modifiers[$clause], $arg);
} elseif (is_string(key($arg))) { // associative array
$args = array('%a', $arg);
}
}
}

22
dibi/libs/DibiProfiler.php
View File

@@ -111,17 +111,29 @@ class DibiProfiler extends DibiObject implements IDibiProfiler
if ($this->useFirebug) {
self::$table[] = array(
sprintf('%0.3f', dibi::$elapsedTime * 1000),
trim(preg_replace('#\s+#', ' ', $sql)),
trim($sql),
$res instanceof DibiResult ? count($res) : '-',
$connection->getConfig('driver') . '/' . $connection->getConfig('name')
);
$caption = 'dibi profiler (' . dibi::$numOfQueries . ' SQL queries took ' . sprintf('%0.3f', dibi::$totalTime * 1000) . ' ms)';
$payload['FirePHP.Firebug.Console'][] = array('TABLE', array($caption, self::$table));
header('X-Wf-Protocol-dibi: http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
header('X-Wf-dibi-Plugin-1: http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.2.0');
header('X-Wf-dibi-Structure-1: http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
$payload = array(
array(
'Type' => 'TABLE',
'Label' => 'dibi profiler (' . dibi::$numOfQueries . ' SQL queries took ' . sprintf('%0.3f', dibi::$totalTime * 1000) . ' ms)',
),
self::$table,
);
$payload = function_exists('json_encode') ? json_encode($payload) : self::json_encode($payload);
foreach (str_split($payload, 4998) as $num => $s) {
header('X-FirePHP-Data-' . str_pad(++$num, 12, '0', STR_PAD_LEFT) . ': ' . $s);
foreach (str_split($payload, 4990) as $num => $s) {
$num++;
header("X-Wf-dibi-1-1-$num: |$s|\\"); // protocol-, structure-, plugin-, message-index
}
header("X-Wf-dibi-1-1-$num: |$s|");
header("X-Wf-dibi-Index: $num");
}
if ($this->file) {