released 2.0.2

composer.json

@@ -0,0 +1,16 @@
+{
+	"name": "dg/dibi",
+	"description": "Dibi is Database Abstraction Library for PHP 5.",
+	"keywords": ["dibi", "database", "dbal", "mysql", "postgresql", "sqlite", "mssql", "oracle", "access", "pdo", "odbc"],
+	"homepage": "http://dibiphp.com/",
+	"license": ["BSD-3", "GPLv2", "GPLv3"],
+	"authors": [
+		{
+			"name": "David Grudl",
+			"homepage": "http://davidgrudl.com"
+		}
+	],
+	"autoload": {
+		"classmap": ["dibi/"]
+	}
+}

dibi/Nette/DibiNettePanel.php

@@ -101,9 +101,13 @@ class DibiNettePanel extends DibiObject implements IBarPanel
 	 */
 	public function getTab()
 	{
+		$totalTime = 0;
+		foreach ($this->events as $event) {
+			$totalTime += $event->time;
+		}
 		return '<span title="dibi"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEYSURBVBgZBcHPio5hGAfg6/2+R980k6wmJgsJ5U/ZOAqbSc2GnXOwUg7BESgLUeIQ1GSjLFnMwsKGGg1qxJRmPM97/1zXFAAAAEADdlfZzr26miup2svnelq7d2aYgt3rebl585wN6+K3I1/9fJe7O/uIePP2SypJkiRJ0vMhr55FLCA3zgIAOK9uQ4MS361ZOSX+OrTvkgINSjS/HIvhjxNNFGgQsbSmabohKDNoUGLohsls6BaiQIMSs2FYmnXdUsygQYmumy3Nhi6igwalDEOJEjPKP7CA2aFNK8Bkyy3fdNCg7r9/fW3jgpVJbDmy5+PB2IYp4MXFelQ7izPrhkPHB+P5/PjhD5gCgCenx+VR/dODEwD+A3T7nqbxwf1HAAAAAElFTkSuQmCC" />'
-			. dibi::$numOfQueries . ' queries'
+			. count($this->events) . ' queries'
-			. (dibi::$totalTime ? ' / ' . sprintf('%0.1f', dibi::$totalTime * 1000) . 'ms' : '')
+			. ($totalTime ? ' / ' . sprintf('%0.1f', $totalTime * 1000) . 'ms' : '')
 			. '</span>';
 	}
 
@@ -115,9 +119,10 @@ class DibiNettePanel extends DibiObject implements IBarPanel
 	 */
 	public function getPanel()
 	{
-		$s = NULL;
+		$totalTime = $s = NULL;
 		$h = 'htmlSpecialChars';
 		foreach ($this->events as $event) {
+			$totalTime += $event->time;
 			$explain = NULL; // EXPLAIN is called here to work SELECT FOUND_ROWS()
 			if ($this->explain && $event->type === DibiEvent::SELECT) {
 				try {
@@ -155,7 +160,7 @@ class DibiNettePanel extends DibiObject implements IBarPanel
 			'<style> #nette-debug td.nette-DibiProfiler-sql { background: white !important }
 			#nette-debug .nette-DibiProfiler-source { color: #999 !important }
 			#nette-debug nette-DibiProfiler tr table { margin: 8px 0; max-height: 150px; overflow:auto } </style>
-			<h1>Queries: ' . dibi::$numOfQueries . (dibi::$totalTime === NULL ? '' : ', time: ' . sprintf('%0.3f', dibi::$totalTime * 1000) . ' ms') . '</h1>
+			<h1>Queries: ' . count($this->events) . ($totalTime === NULL ? '' : ', time: ' . sprintf('%0.3f', $totalTime * 1000) . ' ms') . '</h1>
 			<div class="nette-inner nette-DibiProfiler">
 			<table>
 				<tr><th>Time&nbsp;ms</th><th>SQL Statement</th><th>Rows</th><th>Connection</th></tr>' . $s . '

dibi/dibi.php

@@ -80,7 +80,7 @@ class dibi
 		FIELD_TIME = dibi::TIME;
 
 	/** version */
-	const VERSION = '2.0',
+	const VERSION = '2.0.2',
 		REVISION = '$WCREV$ released on $WCDATE$';
 
 	/** sorting order */

dibi/drivers/mssql.reflector.php

@@ -65,18 +65,16 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
 		if (empty($table)) {
 			return false;
 		}
-		$table = $this->driver->escape($table, dibi::TEXT);
-
 		$result = $this->driver->query("
 			SELECT MAX(rowcnt)
 			FROM sys.sysindexes
-			WHERE id=OBJECT_ID({$table})
+			WHERE id=OBJECT_ID({$this->driver->escape($table, dibi::IDENTIFIER)})
 		");
 		$row = $result->fetch(FALSE);
 
 		if (!is_array($row) || count($row) < 1) {
 			if ($fallback) {
-				$row = $this->driver->query("SELECT COUNT(*) FROM {$table}")->fetch(FALSE);
+				$row = $this->driver->query("SELECT COUNT(*) FROM {$this->driver->escape($table, dibi::IDENTIFIER)}")->fetch(FALSE);
 				$count = intval($row[0]);
 			} else {
 				$count = false;
@@ -100,7 +98,7 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
 		$res = $this->driver->query("
 			SELECT * FROM
 			INFORMATION_SCHEMA.COLUMNS
-			WHERE TABLE_NAME = '{$table}'
+			WHERE TABLE_NAME = {$this->driver->escape($table, dibi::TEXT)}
 			ORDER BY TABLE_NAME, ORDINAL_POSITION
 		");
 		$columns = array();
@@ -148,8 +146,6 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
 	 */
 	public function getIndexes($table)
 	{
-		$table = $this->driver->escape($table, dibi::TEXT);
-
 		$res = $this->driver->query(
 			"SELECT ind.name index_name, ind.index_id, ic.index_column_id,
 					col.name column_name, ind.is_unique, ind.is_primary_key
@@ -160,7 +156,7 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
 				(ic.object_id = col.object_id and ic.column_id = col.column_id)
 			INNER JOIN sys.tables t ON
 				(ind.object_id = t.object_id)
-			WHERE t.name = {$table}
+			WHERE t.name = {$this->driver->escape($table, dibi::TEXT)}
 				AND t.is_ms_shipped = 0
 			ORDER BY
 				t.name, ind.name, ind.index_id, ic.index_column_id
@@ -192,8 +188,6 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
 	 */
 	public function getForeignKeys($table)
 	{
-		$table = $this->driver->escape($table, dibi::TEXT);
-
 		$res = $this->driver->query("
 			SELECT f.name AS foreign_key,
 			OBJECT_NAME(f.parent_object_id) AS table_name,
@@ -206,7 +200,7 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
 			FROM sys.foreign_keys AS f
 			INNER JOIN sys.foreign_key_columns AS fc
 			ON f.OBJECT_ID = fc.constraint_object_id
-			WHERE OBJECT_NAME(f.parent_object_id)={$table}
+			WHERE OBJECT_NAME(f.parent_object_id) = {$this->driver->escape($table, dibi::TEXT)}
 		");
 
 		$keys = array();

dibi/drivers/mssql2005.php

@@ -375,14 +375,12 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	 */
 	public function getResultColumns()
 	{
-		$count = sqlsrv_num_fields($this->resultSet);
 		$columns = array();
-		for ($i = 0; $i < $count; $i++) {
+		foreach ((array) sqlsrv_field_metadata($this->resultSet) as $fieldMetadata) {
-			$row = (array) sqlsrv_field_metadata($this->resultSet, $i);
 			$columns[] = array(
-				'name' => $row['Name'],
+				'name' => $fieldMetadata['Name'],
-				'fullname' => $row['Name'],
+				'fullname' => $fieldMetadata['Name'],
-				'nativetype' => $row['Type'],
+				'nativetype' => $fieldMetadata['Type'],
 			);
 		}
 		return $columns;

dibi/drivers/mysql.reflector.php

@@ -68,7 +68,7 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector
 			FROM INFORMATION_SCHEMA.COLUMNS
 			WHERE TABLE_NAME = $table AND TABLE_SCHEMA = DATABASE()
 		");*/
-		$res = $this->driver->query("SHOW FULL COLUMNS FROM `$table`");
+		$res = $this->driver->query("SHOW FULL COLUMNS FROM {$this->driver->escape($table, dibi::IDENTIFIER)}");
 		$columns = array();
 		while ($row = $res->fetch(TRUE)) {
 			$type = explode('(', $row['Type']);
@@ -103,7 +103,7 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector
 			WHERE TABLE_NAME = $table AND TABLE_SCHEMA = DATABASE()
 			AND REFERENCED_COLUMN_NAME IS NULL
 		");*/
-		$res = $this->driver->query("SHOW INDEX FROM `$table`");
+		$res = $this->driver->query("SHOW INDEX FROM {$this->driver->escape($table, dibi::IDENTIFIER)}");
 		$indexes = array();
 		while ($row = $res->fetch(TRUE)) {
 			$indexes[$row['Key_name']]['name'] = $row['Key_name'];

dibi/drivers/sqlite.reflector.php

@@ -60,16 +60,16 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
 	public function getColumns($table)
 	{
 		$meta = $this->driver->query("
-			SELECT sql FROM sqlite_master WHERE type = 'table' AND name = '$table'
+			SELECT sql FROM sqlite_master WHERE type = 'table' AND name = {$this->driver->escape($table, dibi::TEXT)}
 			UNION ALL
-			SELECT sql FROM sqlite_temp_master WHERE type = 'table' AND name = '$table'"
+			SELECT sql FROM sqlite_temp_master WHERE type = 'table' AND name = {$this->driver->escape($table, dibi::TEXT)}
-		)->fetch(TRUE);
+		")->fetch(TRUE);
 
-		$res = $this->driver->query("PRAGMA table_info([$table])");
+		$res = $this->driver->query("PRAGMA table_info({$this->driver->escape($table, dibi::IDENTIFIER)})");
 		$columns = array();
 		while ($row = $res->fetch(TRUE)) {
 			$column = $row['name'];
-			$pattern = "/(\"$column\"|\[$column\]|$column)\s+[^,]+\s+PRIMARY\s+KEY\s+AUTOINCREMENT/Ui";
+			$pattern = "/(\"$column\"|\[$column\]|$column)\\s+[^,]+\\s+PRIMARY\\s+KEY\\s+AUTOINCREMENT/Ui";
 			$type = explode('(', $row['type']);
 			$columns[] = array(
 				'name' => $column,
@@ -95,7 +95,7 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
 	 */
 	public function getIndexes($table)
 	{
-		$res = $this->driver->query("PRAGMA index_list([$table])");
+		$res = $this->driver->query("PRAGMA index_list({$this->driver->escape($table, dibi::IDENTIFIER)})");
 		$indexes = array();
 		while ($row = $res->fetch(TRUE)) {
 			$indexes[$row['name']]['name'] = $row['name'];
@@ -103,7 +103,7 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
 		}
 
 		foreach ($indexes as $index => $values) {
-			$res = $this->driver->query("PRAGMA index_info([$index])");
+			$res = $this->driver->query("PRAGMA index_info({$this->driver->escape($index, dibi::IDENTIFIER)})");
 			while ($row = $res->fetch(TRUE)) {
 				$indexes[$index]['columns'][$row['seqno']] = $row['name'];
 			}
@@ -150,7 +150,7 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
 		if (!($this->driver instanceof DibiSqlite3Driver)) {
 			// throw new DibiNotSupportedException; // @see http://www.sqlite.org/foreignkeys.html
 		}
-		$res = $this->driver->query("PRAGMA foreign_key_list([$table])");
+		$res = $this->driver->query("PRAGMA foreign_key_list({$this->driver->escape($table, dibi::IDENTIFIER)})");
 		$keys = array();
 		while ($row = $res->fetch(TRUE)) {
 			$keys[$row['id']]['name'] = $row['id']; // foreign key name

dibi/libs/DibiConnection.php

@@ -339,8 +339,6 @@ class DibiConnection extends DibiObject
 		$this->connected || $this->connect();
 
 		$event = $this->onEvent ? new DibiEvent($this, DibiEvent::QUERY, $sql) : NULL;
-		dibi::$numOfQueries++;
-		dibi::$sql = $sql;
 		try {
 			$res = $this->driver->query($sql);
 
@@ -690,6 +688,10 @@ class DibiConnection extends DibiObject
 				$count++;
 			}
 		}
+		if (trim($sql) !== '') {
+			$this->driver->query($sql);
+			$count++;
+		}
 		fclose($handle);
 		return $count;
 	}

dibi/libs/DibiEvent.php

@@ -80,6 +80,8 @@ class DibiEvent
 		}
 
 		dibi::$elapsedTime = FALSE;
+		dibi::$numOfQueries++;
+		dibi::$sql = $sql;
 	}
 
 

dibi/libs/DibiFirePhpLogger.php

@@ -28,6 +28,12 @@ class DibiFirePhpLogger extends DibiObject
 	/** @var int */
 	public $filter;
 
+	/** @var int  Elapsed time for all queries */
+	public $totalTime = 0;
+
+	/** @var int  Number of all queries */
+	public $numOfQueries = 0;
+
 	/** @var array */
 	private static $fireTable = array(array('Time', 'SQL Statement', 'Rows', 'Connection'));
 
@@ -60,10 +66,12 @@ class DibiFirePhpLogger extends DibiObject
 			return;
 		}
 
+		$this->totalTime += $event->time;
+		$this->numOfQueries++;
 		self::$fireTable[] = array(
 			sprintf('%0.3f', $event->time * 1000),
 			strlen($event->sql) > self::$maxLength ? substr($event->sql, 0, self::$maxLength) . '...' : $event->sql,
-			$event->result instanceof Exception ? 'ERROR' : $event->count,
+			$event->result instanceof Exception ? 'ERROR' : (string) $event->count,
 			$event->connection->getConfig('driver') . '/' . $event->connection->getConfig('name')
 		);
 
@@ -74,7 +82,7 @@ class DibiFirePhpLogger extends DibiObject
 		$payload = json_encode(array(
 			array(
 				'Type' => 'TABLE',
-				'Label' => 'dibi profiler (' . dibi::$numOfQueries . ' SQL queries took ' . sprintf('%0.3f', dibi::$totalTime * 1000) . ' ms)',
+				'Label' => 'dibi profiler (' . $this->numOfQueries . ' SQL queries took ' . sprintf('%0.3f', $this->totalTime * 1000) . ' ms)',
 			),
 			self::$fireTable,
 		));

dibi/libs/DibiFluent.php

@@ -181,7 +181,7 @@ class DibiFluent extends DibiObject implements IDataSource
 			if ($arg === TRUE) { // flag
 				return $this;
 
-			} elseif (is_string($arg) && preg_match('#^[a-z:_][a-z0-9_.:]*$#i', $arg)) { // identifier
+			} elseif (is_string($arg) && preg_match('#^[a-z:_][a-z0-9_.:]*\z#i', $arg)) { // identifier
 				$args = array('%n', $arg);
 
 			} elseif (is_array($arg) || ($arg instanceof Traversable && !$arg instanceof self)) { // any array

dibi/libs/DibiTranslator.php

@@ -353,7 +353,7 @@ final class DibiTranslator extends DibiObject
 			case 'i':  // signed int
 			case 'u':  // unsigned int, ignored
 				// support for long numbers - keep them unchanged
-				if (is_string($value) && preg_match('#[+-]?\d++(e\d+)?$#A', $value)) {
+				if (is_string($value) && preg_match('#[+-]?\d++(e\d+)?\z#A', $value)) {
 					return $value;
 				} else {
 					return $value === NULL ? 'NULL' : (string) (int) ($value + 0);
@@ -364,7 +364,7 @@ final class DibiTranslator extends DibiObject
 				if (is_string($value) && is_numeric($value) && strpos($value, 'x') === FALSE) {
 					return $value; // something like -9E-005 is accepted by SQL, HEX values are not
 				} else {
-					return $value === NULL ? 'NULL' : rtrim(rtrim(number_format($value + 0, 5, '.', ''), '0'), '.');
+					return $value === NULL ? 'NULL' : rtrim(rtrim(number_format($value + 0, 10, '.', ''), '0'), '.');
 				}
 
 			case 'd':  // date
@@ -436,7 +436,7 @@ final class DibiTranslator extends DibiObject
 			return (string) $value;
 
 		} elseif (is_float($value)) {
-			return rtrim(rtrim(number_format($value, 5, '.', ''), '0'), '.');
+			return rtrim(rtrim(number_format($value, 10, '.', ''), '0'), '.');
 
 		} elseif (is_bool($value)) {
 			return $this->driver->escape($value, dibi::BOOL);

examples/nette-debug-and-exceptions.php

@@ -18,6 +18,20 @@ require_once '../dibi/dibi.php';
 ndebug();
 
 
+dibi::connect(array(
+	'driver'   => 'sqlite',
+	'database' => 'data/sample.sdb',
+	'profiler' => array(
+		'run' => TRUE,
+	)
+));
+
+
+// throws error because SQL is bad
+dibi::query('SELECT * FROM customers WHERE customer_id < ?', 38);
+
+
+
 dibi::connect(array(
 	'driver'   => 'sqlite',
 	'database' => 'data/sample.sdb',

version.txt

@@ -1 +1 @@
-Dibi 2.0 (revision $WCREV$ released on $WCDATE$)
+Dibi 2.0.2 (revision $WCREV$ released on $WCDATE$)