Released version 2.1.2

Now, when sql returns float from (0,1) interval, e.g. '.842' - the decimal part is missing & it won't get cast to float.
This is fix for that situation

.gitattributes

@@ -0,0 +1,4 @@
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+tests/ export-ignore

composer.json

@@ -3,15 +3,21 @@
 	"description": "Dibi is Database Abstraction Library for PHP 5.",
 	"keywords": ["database", "dbal", "mysql", "postgresql", "sqlite", "mssql", "oracle", "access", "pdo", "odbc"],
 	"homepage": "http://dibiphp.com/",
-	"license": ["BSD-3", "GPLv2", "GPLv3"],
+	"license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
 	"authors": [
 		{
 			"name": "David Grudl",
 			"homepage": "http://davidgrudl.com"
 		}
 	],
+	"require": {
+		"php": ">=5.2.0"
+	},
 	"require-dev": {
-		"nette/tester": "@dev"
+		"nette/tester": "~1.1"
+	},
+	"replace": {
+		"dg/dibi": "self.version"
 	},
 	"autoload": {
 		"classmap": ["dibi/"]

dibi/bridges/Nette-2.0/DibiNette20Extension.php

@@ -10,7 +10,6 @@
  */
 
 
-
 /**
  * Dibi extension for Nette Framework 2.0. Creates 'connection' service.
  *

dibi/bridges/Nette-2.1/DibiNette21Extension.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * Dibi extension for Nette Framework 2.1. Creates 'connection' service.
  *
@@ -28,7 +23,7 @@ class DibiNette21Extension extends Nette\DI\CompilerExtension
 
 		$useProfiler = isset($config['profiler'])
 			? $config['profiler']
-			: !$container->parameters['productionMode'];
+			: $container->parameters['debugMode'];
 
 		unset($config['profiler']);
 

dibi/bridges/Nette-2.1/DibiNettePanel.php

@@ -2,21 +2,15 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 if (interface_exists('Nette\Diagnostics\IBarPanel')) {
 	class_alias('Nette\Diagnostics\IBarPanel', 'IBarPanel');
 }
 
 
-
 /**
  * Dibi panel for Nette\Diagnostics.
  *
@@ -38,7 +32,6 @@ class DibiNettePanel extends DibiObject implements IBarPanel
 	private $events = array();
 
 
-
 	public function __construct($explain = TRUE, $filter = NULL)
 	{
 		$this->filter = $filter ? (int) $filter : DibiEvent::QUERY;
@@ -46,7 +39,6 @@ class DibiNettePanel extends DibiObject implements IBarPanel
 	}
 
 
-
 	public function register(DibiConnection $connection)
 	{
 		if (is_callable('Nette\Diagnostics\Debugger::enable') && !class_exists('NDebugger')) {
@@ -70,7 +62,6 @@ class DibiNettePanel extends DibiObject implements IBarPanel
 	}
 
 
-
 	/**
 	 * After event notification.
 	 * @return void
@@ -84,7 +75,6 @@ class DibiNettePanel extends DibiObject implements IBarPanel
 	}
 
 
-
 	/**
 	 * Returns blue-screen custom tab.
 	 * @return mixed
@@ -100,7 +90,6 @@ class DibiNettePanel extends DibiObject implements IBarPanel
 	}
 
 
-
 	/**
 	 * Returns HTML code for custom tab. (Nette\Diagnostics\IBarPanel)
 	 * @return mixed
@@ -113,12 +102,11 @@ class DibiNettePanel extends DibiObject implements IBarPanel
 		}
 		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" />'
 			. count($this->events) . ' queries'
-			. ($totalTime ? ' / ' . sprintf('%0.1f', $totalTime * 1000) . 'ms' : '')
+			. ($totalTime ? sprintf(' / %0.1f ms', $totalTime * 1000) : '')
 			. '</span>';
 	}
 
 
-
 	/**
 	 * Returns HTML code for custom panel. (Nette\Diagnostics\IBarPanel)
 	 * @return mixed
@@ -166,7 +154,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: ' . count($this->events) . ($totalTime === NULL ? '' : ', time: ' . sprintf('%0.3f', $totalTime * 1000) . ' ms') . '</h1>
+			<h1>Queries: ' . count($this->events) . ($totalTime === NULL ? '' : sprintf(', time: %0.3f ms', $totalTime * 1000)) . '</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

@@ -4,9 +4,6 @@
  * dibi - smart database abstraction layer (http://dibiphp.com)
  *
  * Copyright (c) 2005, 2012 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -17,9 +14,6 @@ if (version_compare(PHP_VERSION, '5.2.0', '<')) {
 	throw new Exception('dibi needs PHP 5.2.0 or newer.');
 }
 
-@set_magic_quotes_runtime(FALSE); // intentionally @
-
-
 
 require_once dirname(__FILE__) . '/libs/interfaces.php';
 require_once dirname(__FILE__) . '/libs/DibiDateTime.php';
@@ -39,13 +33,10 @@ require_once dirname(__FILE__) . '/libs/DibiEvent.php';
 require_once dirname(__FILE__) . '/libs/DibiFileLogger.php';
 require_once dirname(__FILE__) . '/libs/DibiFirePhpLogger.php';
 if (interface_exists('Nette\Diagnostics\IBarPanel') || interface_exists('IBarPanel')) {
-	require_once dirname(__FILE__) . '/bridges/Nette/DibiNettePanel.php';
+	require_once dirname(__FILE__) . '/bridges/Nette-2.1/DibiNettePanel.php';
 }
 
 
-
-
-
 /**
  * Interface for database drivers.
  *
@@ -80,7 +71,7 @@ class dibi
 		FIELD_TIME = dibi::TIME;
 
 	/** version */
-	const VERSION = '2.1.0',
+	const VERSION = '2.1.2',
 		REVISION = '$WCREV$ released on $WCDATE$';
 
 	/** sorting order */
@@ -112,7 +103,6 @@ class dibi
 	public static $defaultDriver = 'mysql';
 
 
-
 	/**
 	 * Static class - cannot be instantiated.
 	 */
@@ -122,11 +112,9 @@ class dibi
 	}
 
 
-
 	/********************* connections handling ****************d*g**/
 
 
-
 	/**
 	 * Creates a new DibiConnection object and connects it to specified database.
 	 * @param  mixed   connection parameters
@@ -140,7 +128,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Disconnects from database (doesn't destroy DibiConnection object).
 	 * @return void
@@ -151,7 +138,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Returns TRUE when connection was established.
 	 * @return bool
@@ -162,7 +148,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Retrieve active connection.
 	 * @param  string   connection registy name
@@ -187,7 +172,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Sets connection.
 	 * @param  DibiConnection
@@ -199,7 +183,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Change active connection.
 	 * @param  string   connection registy name
@@ -212,11 +195,9 @@ class dibi
 	}
 
 
-
 	/********************* monostate for active connection ****************d*g**/
 
 
-
 	/**
 	 * Generates and executes SQL query - Monostate for DibiConnection::query().
 	 * @param  array|mixed      one or more arguments
@@ -230,7 +211,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Executes the SQL query - Monostate for DibiConnection::nativeQuery().
 	 * @param  string           SQL statement.
@@ -242,7 +222,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Generates and prints SQL query - Monostate for DibiConnection::test().
 	 * @param  array|mixed  one or more arguments
@@ -255,7 +234,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Generates and returns SQL query as DibiDataSource - Monostate for DibiConnection::test().
 	 * @param  array|mixed      one or more arguments
@@ -268,7 +246,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Executes SQL query and fetch result - Monostate for DibiConnection::query() & fetch().
 	 * @param  array|mixed    one or more arguments
@@ -282,11 +259,10 @@ class dibi
 	}
 
 
-
 	/**
 	 * Executes SQL query and fetch results - Monostate for DibiConnection::query() & fetchAll().
 	 * @param  array|mixed    one or more arguments
-	 * @return array of DibiRow
+	 * @return DibiRow[]
 	 * @throws DibiException
 	 */
 	public static function fetchAll($args)
@@ -296,7 +272,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Executes SQL query and fetch first column - Monostate for DibiConnection::query() & fetchSingle().
 	 * @param  array|mixed    one or more arguments
@@ -310,7 +285,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Executes SQL query and fetch pairs - Monostate for DibiConnection::query() & fetchPairs().
 	 * @param  array|mixed    one or more arguments
@@ -324,7 +298,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows.
 	 * Monostate for DibiConnection::getAffectedRows()
@@ -337,7 +310,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows. Alias for getAffectedRows().
 	 * @return int  number of rows
@@ -349,7 +321,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * Monostate for DibiConnection::getInsertId()
@@ -363,7 +334,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column. Alias for getInsertId().
 	 * @param  string     optional sequence name
@@ -376,7 +346,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Begins a transaction - Monostate for DibiConnection::begin().
 	 * @param  string  optional savepoint name
@@ -389,7 +358,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction - Monostate for DibiConnection::commit($savepoint = NULL).
 	 * @param  string  optional savepoint name
@@ -402,7 +370,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction - Monostate for DibiConnection::rollback().
 	 * @param  string  optional savepoint name
@@ -415,7 +382,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Gets a information about the current database - Monostate for DibiConnection::getDatabaseInfo().
 	 * @return DibiDatabaseInfo
@@ -426,7 +392,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Import SQL dump from file - extreme fast!
 	 * @param  string  filename
@@ -438,7 +403,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * Replacement for majority of dibi::methods() in future.
 	 */
@@ -451,11 +415,9 @@ class dibi
 	}
 
 
-
 	/********************* fluent SQL builders ****************d*g**/
 
 
-
 	/**
 	 * @return DibiFluent
 	 */
@@ -465,7 +427,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * @param  string    column name
 	 * @return DibiFluent
@@ -477,7 +438,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * @param  string   table
 	 * @param  array
@@ -489,7 +449,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * @param  string   table
 	 * @param  array
@@ -501,7 +460,6 @@ class dibi
 	}
 
 
-
 	/**
 	 * @param  string   table
 	 * @return DibiFluent
@@ -512,37 +470,32 @@ class dibi
 	}
 
 
-
 	/********************* data types ****************d*g**/
 
 
-
 	/**
-	 * @return DibiDateTime
+	 * @deprecated
 	 */
 	public static function datetime($time = NULL)
 	{
-		trigger_error(__METHOD__ . '() is deprecated; create DibiDateTime object instead.', E_USER_WARNING);
+		trigger_error(__METHOD__ . '() is deprecated; create DateTime object instead.', E_USER_WARNING);
 		return new DibiDateTime($time);
 	}
 
 
-
 	/**
 	 * @deprecated
 	 */
 	public static function date($date = NULL)
 	{
-		trigger_error(__METHOD__ . '() is deprecated; create DibiDateTime object instead.', E_USER_WARNING);
+		trigger_error(__METHOD__ . '() is deprecated; create DateTime object instead.', E_USER_WARNING);
 		return new DibiDateTime($date);
 	}
 
 
-
 	/********************* substitutions ****************d*g**/
 
 
-
 	/**
 	 * Returns substitution hashmap - Monostate for DibiConnection::getSubstitutes().
 	 * @return DibiHashMap
@@ -553,7 +506,6 @@ class dibi
 	}
 
 
-
 	/** @deprecated */
 	public static function addSubst($expr, $subst)
 	{
@@ -562,7 +514,6 @@ class dibi
 	}
 
 
-
 	/** @deprecated */
 	public static function removeSubst($expr)
 	{
@@ -578,7 +529,6 @@ class dibi
 	}
 
 
-
 	/** @deprecated */
 	public static function setSubstFallback($callback)
 	{
@@ -587,11 +537,9 @@ class dibi
 	}
 
 
-
 	/********************* misc tools ****************d*g**/
 
 
-
 	/**
 	 * Prints out a syntax highlighted version of the SQL command or DibiResult.
 	 * @param  string|DibiResult
@@ -605,7 +553,9 @@ class dibi
 			$sql->dump();
 
 		} else {
-			if ($sql === NULL) $sql = self::$sql;
+			if ($sql === NULL) {
+				$sql = self::$sql;
+			}
 
 			static $keywords1 = 'SELECT|(?:ON\s+DUPLICATE\s+KEY)?UPDATE|INSERT(?:\s+INTO)?|REPLACE(?:\s+INTO)?|DELETE|CALL|UNION|FROM|WHERE|HAVING|GROUP\s+BY|ORDER\s+BY|LIMIT|OFFSET|SET|VALUES|LEFT\s+JOIN|INNER\s+JOIN|TRUNCATE';
 			static $keywords2 = 'ALL|DISTINCT|DISTINCTROW|IGNORE|AS|USING|ON|AND|OR|IN|IS|NOT|NULL|LIKE|RLIKE|REGEXP|TRUE|FALSE';
@@ -643,7 +593,6 @@ class dibi
 	}
 
 
-
 	private static function highlightCallback($matches)
 	{
 		if (!empty($matches[1])) { // comment
@@ -661,7 +610,6 @@ class dibi
 	}
 
 
-
 	private static function cliHighlightCallback($matches)
 	{
 		if (!empty($matches[1])) { // comment

dibi/drivers/DibiFirebirdDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -56,7 +52,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Connects to a database.
 	 * @return void
@@ -71,11 +66,13 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 
 		} else {
 			// default values
-			if (!isset($config['username'])) $config['username'] = ini_get('ibase.default_password');
-			if (!isset($config['password'])) $config['password'] = ini_get('ibase.default_user');
-			if (!isset($config['database'])) $config['database'] = ini_get('ibase.default_db');
-			if (!isset($config['charset'])) $config['charset'] = ini_get('ibase.default_charset');
-			if (!isset($config['buffers'])) $config['buffers'] = 0;
+			$config += array(
+				'username' => ini_get('ibase.default_password'),
+				'password' => ini_get('ibase.default_user'),
+				'database' => ini_get('ibase.default_db'),
+				'charset' => ini_get('ibase.default_charset'),
+				'buffers' => 0,
+			);
 
 			DibiDriverException::tryError();
 			if (empty($config['persistent'])) {
@@ -95,7 +92,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Disconnects from a database.
 	 * @return void
@@ -106,7 +102,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
@@ -138,7 +133,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
 	 * @return int|FALSE  number of rows or FALSE on error
@@ -149,7 +143,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @param  string     generator name
@@ -161,7 +154,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Begins a transaction (if supported).
 	 * @param  string  optional savepoint name
@@ -178,7 +170,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction.
 	 * @param  string  optional savepoint name
@@ -199,7 +190,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction.
 	 * @param  string  optional savepoint name
@@ -220,7 +210,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Is in transaction?
 	 * @return bool
@@ -231,7 +220,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns the connection resource.
 	 * @return resource
@@ -242,7 +230,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns the connection reflector.
 	 * @return IDibiReflector
@@ -253,7 +240,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Result set driver factory.
 	 * @param  resource
@@ -267,11 +253,9 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/********************* SQL ********************/
 
 
-
 	/**
 	 * Encodes data for use in a SQL statement.
 	 * @param  mixed     value
@@ -304,7 +288,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 * @param  string
@@ -317,7 +300,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Decodes data from result set.
 	 * @param  string    value
@@ -334,28 +316,22 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string &$sql  The SQL query that will be modified.
-	 * @param  int $limit
-	 * @param  int $offset
 	 * @return void
 	 */
 	public function applyLimit(& $sql, $limit, $offset)
 	{
-		if ($limit < 0 && $offset < 1) return;
-
+		if ($limit >= 0 && $offset > 0) {
 			// see http://scott.yang.id.au/2004/01/limit-in-select-statements-in-firebird/
 			$sql = 'SELECT FIRST ' . (int) $limit . ($offset > 0 ? ' SKIP ' . (int) $offset : '') . ' * FROM (' . $sql . ')';
 		}
-
+	}
 
 
 	/********************* result set ********************/
 
 
-
 	/**
 	 * Automatically frees the resources allocated for this result set.
 	 * @return void
@@ -366,7 +342,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @return int
@@ -377,7 +352,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
 	 * @param  bool     TRUE for associative array, FALSE for numeric
@@ -402,7 +376,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
@@ -415,7 +388,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Frees the resources allocated for this result set.
 	 * @return void
@@ -427,7 +399,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns the result set resource.
 	 * @return mysqli_result
@@ -439,7 +410,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a result set.
 	 * @return array
@@ -461,11 +431,9 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/********************* IDibiReflector ********************/
 
 
-
 	/**
 	 * Returns list of tables.
 	 * @return array
@@ -489,7 +457,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a table.
 	 * @param  string
@@ -545,7 +512,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns metadata for all indexes in a table (the constraints are included).
 	 * @param  string
@@ -580,7 +546,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns metadata for all foreign keys in a table.
 	 * @param  string
@@ -611,7 +576,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns list of indices in given table (the constraints are not listed).
 	 * @param  string
@@ -634,7 +598,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns list of constraints in given table.
 	 * @param  string
@@ -659,7 +622,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns metadata for all triggers in a table or database.
 	 * (Only if user has permissions on ALTER TABLE, INSERT/UPDATE/DELETE record in table)
@@ -709,7 +671,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns list of triggers for given table.
 	 * (Only if user has permissions on ALTER TABLE, INSERT/UPDATE/DELETE record in table)
@@ -732,7 +693,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns metadata from stored procedures and their input and output parameters.
 	 * @param  string
@@ -786,7 +746,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns list of stored procedures.
 	 * @return array
@@ -805,7 +764,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns list of generators.
 	 * @return array
@@ -825,7 +783,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 	}
 
 
-
 	/**
 	 * Returns list of user defined functions (UDF).
 	 * @return array
@@ -847,8 +804,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 }
 
 
-
-
 /**
  * Database procedure exception.
  *
@@ -875,7 +830,6 @@ class DibiProcedureException extends DibiException
 	}
 
 
-
 	/**
 	 * Gets the exception severity.
 	 * @return string

dibi/drivers/DibiMsSql2005Driver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -44,7 +40,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	private $affectedRows = FALSE;
 
 
-
 	/**
 	 * @throws DibiNotSupportedException
 	 */
@@ -56,7 +51,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Connects to a database.
 	 * @return void
@@ -74,7 +68,9 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 
 		} else {
 			// Default values
-			if (!isset($config['options']['CharacterSet'])) $config['options']['CharacterSet'] = 'UTF-8';
+			if (!isset($config['options']['CharacterSet'])) {
+				$config['options']['CharacterSet'] = 'UTF-8';
+			}
 
 			$this->connection = sqlsrv_connect($config['host'], (array) $config['options']);
 		}
@@ -86,7 +82,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Disconnects from a database.
 	 * @return void
@@ -97,7 +92,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
@@ -120,7 +114,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
 	 * @return int|FALSE  number of rows or FALSE on error
@@ -131,7 +124,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @return int|FALSE  int on success or FALSE on failure
@@ -147,7 +139,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Begins a transaction (if supported).
 	 * @param  string  optional savepoint name
@@ -160,7 +151,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction.
 	 * @param  string  optional savepoint name
@@ -173,7 +163,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction.
 	 * @param  string  optional savepoint name
@@ -186,7 +175,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Returns the connection resource.
 	 * @return mixed
@@ -197,7 +185,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Returns the connection reflector.
 	 * @return IDibiReflector
@@ -208,7 +195,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Result set driver factory.
 	 * @param  resource
@@ -222,11 +208,9 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/********************* SQL ****************d*g**/
 
 
-
 	/**
 	 * Encodes data for use in a SQL statement.
 	 * @param  mixed     value
@@ -260,7 +244,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 * @param  string
@@ -274,7 +257,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Decodes data from result set.
 	 * @param  string    value
@@ -291,12 +273,8 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string &$sql  The SQL query that will be modified.
-	 * @param  int $limit
-	 * @param  int $offset
 	 * @return void
 	 */
 	public function applyLimit(& $sql, $limit, $offset)
@@ -312,11 +290,9 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/********************* result set ****************d*g**/
 
 
-
 	/**
 	 * Automatically frees the resources allocated for this result set.
 	 * @return void
@@ -327,7 +303,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @return int
@@ -338,7 +313,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
 	 * @param  bool     TRUE for associative array, FALSE for numeric
@@ -350,7 +324,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
@@ -362,7 +335,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Frees the resources allocated for this result set.
 	 * @return void
@@ -374,7 +346,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a result set.
 	 * @return array
@@ -393,7 +364,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 	}
 
 
-
 	/**
 	 * Returns the result set resource.
 	 * @return mixed

dibi/drivers/DibiMsSql2005Reflector.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -23,14 +19,12 @@ class DibiMsSql2005Reflector extends DibiObject implements IDibiReflector
 	private $driver;
 
 
-
 	public function __construct(IDibiDriver $driver)
 	{
 		$this->driver = $driver;
 	}
 
 
-
 	/**
 	 * Returns list of tables.
 	 * @return array
@@ -49,7 +43,6 @@ class DibiMsSql2005Reflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a table.
 	 * @param  string
@@ -102,7 +95,6 @@ class DibiMsSql2005Reflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns metadata for all indexes in a table.
 	 * @param  string
@@ -128,7 +120,6 @@ class DibiMsSql2005Reflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns metadata for all foreign keys in a table.
 	 * @param  string

dibi/drivers/DibiMsSqlDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 require_once dirname(__FILE__) . '/DibiMsSqlReflector.php';
@@ -38,7 +34,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	private $autoFree = TRUE;
 
 
-
 	/**
 	 * @throws DibiNotSupportedException
 	 */
@@ -50,7 +45,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Connects to a database.
 	 * @return void
@@ -76,7 +70,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Disconnects from a database.
 	 * @return void
@@ -87,7 +80,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
@@ -107,7 +99,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
 	 * @return int|FALSE  number of rows or FALSE on error
@@ -118,7 +109,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @return int|FALSE  int on success or FALSE on failure
@@ -134,7 +124,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Begins a transaction (if supported).
 	 * @param  string  optional savepoint name
@@ -147,7 +136,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction.
 	 * @param  string  optional savepoint name
@@ -160,7 +148,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction.
 	 * @param  string  optional savepoint name
@@ -173,7 +160,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Returns the connection resource.
 	 * @return mixed
@@ -184,7 +170,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Returns the connection reflector.
 	 * @return IDibiReflector
@@ -195,7 +180,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Result set driver factory.
 	 * @param  resource
@@ -209,11 +193,9 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/********************* SQL ****************d*g**/
 
 
-
 	/**
 	 * Encodes data for use in a SQL statement.
 	 * @param  mixed     value
@@ -247,7 +229,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 * @param  string
@@ -261,7 +242,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Decodes data from result set.
 	 * @param  string    value
@@ -278,12 +258,8 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string &$sql  The SQL query that will be modified.
-	 * @param  int $limit
-	 * @param  int $offset
 	 * @return void
 	 */
 	public function applyLimit(& $sql, $limit, $offset)
@@ -299,11 +275,9 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/********************* result set ****************d*g**/
 
 
-
 	/**
 	 * Automatically frees the resources allocated for this result set.
 	 * @return void
@@ -314,7 +288,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @return int
@@ -325,7 +298,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
 	 * @param  bool     TRUE for associative array, FALSE for numeric
@@ -337,7 +309,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
@@ -349,7 +320,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Frees the resources allocated for this result set.
 	 * @return void
@@ -361,7 +331,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a result set.
 	 * @return array
@@ -383,7 +352,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Returns the result set resource.
 	 * @return mixed

dibi/drivers/DibiMsSqlReflector.php

@@ -5,9 +5,6 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
- *
  * @package    dibi\drivers
  */
 
@@ -25,14 +22,12 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
 	private $driver;
 
 
-
 	public function __construct(IDibiDriver $driver)
 	{
 		$this->driver = $driver;
 	}
 
 
-
 	/**
 	 * Returns list of tables.
 	 * @return array
@@ -54,7 +49,6 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns count of rows in a table
 	 * @param  string
@@ -87,7 +81,6 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a table.
 	 * @param  string
@@ -138,7 +131,6 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns metadata for all indexes in a table.
 	 * @param  string
@@ -180,7 +172,6 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns metadata for all foreign keys in a table.
 	 * @param  string

dibi/drivers/DibiMySqlDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -53,7 +49,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	private $buffered;
 
 
-
 	/**
 	 * @throws DibiNotSupportedException
 	 */
@@ -65,7 +60,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Connects to a database.
 	 * @return void
@@ -79,17 +73,21 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 		} else {
 			// default values
 			DibiConnection::alias($config, 'flags', 'options');
-			if (!isset($config['charset'])) $config['charset'] = 'utf8';
-			if (!isset($config['timezone'])) $config['timezone'] = date('P');
-			if (!isset($config['username'])) $config['username'] = ini_get('mysql.default_user');
-			if (!isset($config['password'])) $config['password'] = ini_get('mysql.default_password');
+			$config += array(
+				'charset' => 'utf8',
+				'timezone' => date('P'),
+				'username' => ini_get('mysql.default_user'),
+				'password' => ini_get('mysql.default_password'),
+			);
 			if (!isset($config['host'])) {
 				$host = ini_get('mysql.default_host');
 				if ($host) {
 					$config['host'] = $host;
 					$config['port'] = ini_get('mysql.default_port');
 				} else {
-					if (!isset($config['socket'])) $config['socket'] = ini_get('mysql.default_socket');
+					if (!isset($config['socket'])) {
+						$config['socket'] = ini_get('mysql.default_socket');
+					}
 					$config['host'] = NULL;
 				}
 			}
@@ -140,7 +138,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Disconnects from a database.
 	 * @return void
@@ -151,7 +148,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
@@ -175,7 +171,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Retrieves information about the most recently executed query.
 	 * @return array
@@ -184,7 +179,9 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	{
 		$res = array();
 		preg_match_all('#(.+?): +(\d+) *#', mysql_info($this->connection), $matches, PREG_SET_ORDER);
-		if (preg_last_error()) throw new DibiPcreException;
+		if (preg_last_error()) {
+			throw new DibiPcreException;
+		}
 
 		foreach ($matches as $m) {
 			$res[$m[1]] = (int) $m[2];
@@ -193,7 +190,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
 	 * @return int|FALSE  number of rows or FALSE on error
@@ -204,7 +200,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @return int|FALSE  int on success or FALSE on failure
@@ -215,7 +210,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Begins a transaction (if supported).
 	 * @param  string  optional savepoint name
@@ -228,7 +222,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction.
 	 * @param  string  optional savepoint name
@@ -241,7 +234,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction.
 	 * @param  string  optional savepoint name
@@ -254,7 +246,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Returns the connection resource.
 	 * @return mixed
@@ -265,7 +256,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Returns the connection reflector.
 	 * @return IDibiReflector
@@ -276,7 +266,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Result set driver factory.
 	 * @param  resource
@@ -290,11 +279,9 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/********************* SQL ****************d*g**/
 
 
-
 	/**
 	 * Encodes data for use in a SQL statement.
 	 * @param  mixed     value
@@ -336,7 +323,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 * @param  string
@@ -350,7 +336,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Decodes data from result set.
 	 * @param  string    value
@@ -367,29 +352,23 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string &$sql  The SQL query that will be modified.
-	 * @param  int $limit
-	 * @param  int $offset
 	 * @return void
 	 */
 	public function applyLimit(& $sql, $limit, $offset)
 	{
-		if ($limit < 0 && $offset < 1) return;
-
+		if ($limit >= 0 || $offset > 0) {
 			// see http://dev.mysql.com/doc/refman/5.0/en/select.html
 			$sql .= ' LIMIT ' . ($limit < 0 ? '18446744073709551615' : (int) $limit)
 				. ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
 		}
-
+	}
 
 
 	/********************* result set ****************d*g**/
 
 
-
 	/**
 	 * Automatically frees the resources allocated for this result set.
 	 * @return void
@@ -400,7 +379,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @return int
@@ -414,7 +392,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
 	 * @param  bool     TRUE for associative array, FALSE for numeric
@@ -426,7 +403,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
@@ -443,7 +419,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Frees the resources allocated for this result set.
 	 * @return void
@@ -455,7 +430,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a result set.
 	 * @return array
@@ -478,7 +452,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 	}
 
 
-
 	/**
 	 * Returns the result set resource.
 	 * @return mixed

dibi/drivers/DibiMySqlReflector.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -23,14 +19,12 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector
 	private $driver;
 
 
-
 	public function __construct(IDibiDriver $driver)
 	{
 		$this->driver = $driver;
 	}
 
 
-
 	/**
 	 * Returns list of tables.
 	 * @return array
@@ -54,7 +48,6 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a table.
 	 * @param  string
@@ -88,7 +81,6 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns metadata for all indexes in a table.
 	 * @param  string
@@ -115,7 +107,6 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns metadata for all foreign keys in a table.
 	 * @param  string

dibi/drivers/DibiMySqliDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -54,7 +50,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	private $buffered;
 
 
-
 	/**
 	 * @throws DibiNotSupportedException
 	 */
@@ -66,7 +61,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Connects to a database.
 	 * @return void
@@ -80,12 +74,14 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 
 		} else {
 			// default values
-			if (!isset($config['charset'])) $config['charset'] = 'utf8';
-			if (!isset($config['timezone'])) $config['timezone'] = date('P');
-			if (!isset($config['username'])) $config['username'] = ini_get('mysqli.default_user');
-			if (!isset($config['password'])) $config['password'] = ini_get('mysqli.default_pw');
-			if (!isset($config['socket'])) $config['socket'] = ini_get('mysqli.default_socket');
-			if (!isset($config['port'])) $config['port'] = NULL;
+			$config += array(
+				'charset' => 'utf8',
+				'timezone' => date('P'),
+				'username' => ini_get('mysqli.default_user'),
+				'password' => ini_get('mysqli.default_pw'),
+				'socket' => ini_get('mysqli.default_socket'),
+				'port' => NULL,
+			);
 			if (!isset($config['host'])) {
 				$host = ini_get('mysqli.default_host');
 				if ($host) {
@@ -141,7 +137,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Disconnects from a database.
 	 * @return void
@@ -152,7 +147,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
@@ -172,7 +166,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Retrieves information about the most recently executed query.
 	 * @return array
@@ -181,7 +174,9 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	{
 		$res = array();
 		preg_match_all('#(.+?): +(\d+) *#', mysqli_info($this->connection), $matches, PREG_SET_ORDER);
-		if (preg_last_error()) throw new DibiPcreException;
+		if (preg_last_error()) {
+			throw new DibiPcreException;
+		}
 
 		foreach ($matches as $m) {
 			$res[$m[1]] = (int) $m[2];
@@ -190,7 +185,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
 	 * @return int|FALSE  number of rows or FALSE on error
@@ -201,7 +195,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @return int|FALSE  int on success or FALSE on failure
@@ -212,7 +205,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Begins a transaction (if supported).
 	 * @param  string  optional savepoint name
@@ -225,7 +217,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction.
 	 * @param  string  optional savepoint name
@@ -238,7 +229,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction.
 	 * @param  string  optional savepoint name
@@ -251,7 +241,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns the connection resource.
 	 * @return mysqli
@@ -262,7 +251,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns the connection reflector.
 	 * @return IDibiReflector
@@ -273,7 +261,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Result set driver factory.
 	 * @param  mysqli_result
@@ -287,11 +274,9 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/********************* SQL ****************d*g**/
 
 
-
 	/**
 	 * Encodes data for use in a SQL statement.
 	 * @param  mixed     value
@@ -326,7 +311,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 * @param  string
@@ -340,7 +324,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Decodes data from result set.
 	 * @param  string    value
@@ -357,29 +340,23 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string &$sql  The SQL query that will be modified.
-	 * @param  int $limit
-	 * @param  int $offset
 	 * @return void
 	 */
 	public function applyLimit(& $sql, $limit, $offset)
 	{
-		if ($limit < 0 && $offset < 1) return;
-
+		if ($limit >= 0 || $offset > 0) {
 			// see http://dev.mysql.com/doc/refman/5.0/en/select.html
 			$sql .= ' LIMIT ' . ($limit < 0 ? '18446744073709551615' : (int) $limit)
 				. ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
 		}
-
+	}
 
 
 	/********************* result set ****************d*g**/
 
 
-
 	/**
 	 * Automatically frees the resources allocated for this result set.
 	 * @return void
@@ -390,7 +367,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @return int
@@ -404,7 +380,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
 	 * @param  bool     TRUE for associative array, FALSE for numeric
@@ -416,7 +391,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
@@ -432,7 +406,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Frees the resources allocated for this result set.
 	 * @return void
@@ -444,7 +417,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a result set.
 	 * @return array
@@ -478,7 +450,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns the result set resource.
 	 * @return mysqli_result
@@ -486,7 +457,7 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	public function getResultResource()
 	{
 		$this->autoFree = FALSE;
-		return @$this->resultSet->type === NULL ? NULL : $this->resultSet;
+		return $this->resultSet === NULL || $this->resultSet->type === NULL ? NULL : $this->resultSet;
 	}
 
 }

dibi/drivers/DibiOdbcDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -42,7 +38,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	private $row = 0;
 
 
-
 	/**
 	 * @throws DibiNotSupportedException
 	 */
@@ -54,7 +49,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Connects to a database.
 	 * @return void
@@ -66,9 +60,11 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 			$this->connection = $config['resource'];
 		} else {
 			// default values
-			if (!isset($config['username'])) $config['username'] = ini_get('odbc.default_user');
-			if (!isset($config['password'])) $config['password'] = ini_get('odbc.default_pw');
-			if (!isset($config['dsn'])) $config['dsn'] = ini_get('odbc.default_db');
+			$config += array(
+				'username' => ini_get('odbc.default_user'),
+				'password' => ini_get('odbc.default_pw'),
+				'dsn' => ini_get('odbc.default_db'),
+			);
 
 			if (empty($config['persistent'])) {
 				$this->connection = @odbc_connect($config['dsn'], $config['username'], $config['password']); // intentionally @
@@ -83,7 +79,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Disconnects from a database.
 	 * @return void
@@ -94,7 +89,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
@@ -116,7 +110,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
 	 * @return int|FALSE  number of rows or FALSE on error
@@ -127,7 +120,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @return int|FALSE  int on success or FALSE on failure
@@ -138,7 +130,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Begins a transaction (if supported).
 	 * @param  string  optional savepoint name
@@ -153,7 +144,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction.
 	 * @param  string  optional savepoint name
@@ -169,7 +159,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction.
 	 * @param  string  optional savepoint name
@@ -185,7 +174,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Is in transaction?
 	 * @return bool
@@ -196,7 +184,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Returns the connection resource.
 	 * @return mixed
@@ -207,7 +194,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Returns the connection reflector.
 	 * @return IDibiReflector
@@ -218,7 +204,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Result set driver factory.
 	 * @param  resource
@@ -232,11 +217,9 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/********************* SQL ****************d*g**/
 
 
-
 	/**
 	 * Encodes data for use in a SQL statement.
 	 * @param  mixed     value
@@ -269,7 +252,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 * @param  string
@@ -283,7 +265,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Decodes data from result set.
 	 * @param  string    value
@@ -300,12 +281,8 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string &$sql  The SQL query that will be modified.
-	 * @param  int $limit
-	 * @param  int $offset
 	 * @return void
 	 */
 	public function applyLimit(& $sql, $limit, $offset)
@@ -315,15 +292,15 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 			$sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ')';
 		}
 
-		if ($offset) throw new DibiNotSupportedException('Offset is not implemented in driver odbc.');
+		if ($offset) {
+			throw new DibiNotSupportedException('Offset is not implemented in driver odbc.');
+		}
 	}
 
 
-
 	/********************* result set ****************d*g**/
 
 
-
 	/**
 	 * Automatically frees the resources allocated for this result set.
 	 * @return void
@@ -334,7 +311,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @return int
@@ -346,7 +322,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
 	 * @param  bool     TRUE for associative array, FALSE for numeric
@@ -358,7 +333,9 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 			return odbc_fetch_array($this->resultSet, ++$this->row);
 		} else {
 			$set = $this->resultSet;
-			if (!odbc_fetch_row($set, ++$this->row)) return FALSE;
+			if (!odbc_fetch_row($set, ++$this->row)) {
+				return FALSE;
+			}
 			$count = odbc_num_fields($set);
 			$cols = array();
 			for ($i = 1; $i <= $count; $i++) $cols[] = odbc_result($set, $i);
@@ -367,7 +344,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
@@ -380,7 +356,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Frees the resources allocated for this result set.
 	 * @return void
@@ -392,7 +367,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a result set.
 	 * @return array
@@ -413,7 +387,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Returns the result set resource.
 	 * @return mixed
@@ -425,11 +398,9 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/********************* IDibiReflector ****************d*g**/
 
 
-
 	/**
 	 * Returns list of tables.
 	 * @return array
@@ -451,7 +422,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a table.
 	 * @param  string
@@ -478,7 +448,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Returns metadata for all indexes in a table.
 	 * @param  string
@@ -490,7 +459,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	}
 
 
-
 	/**
 	 * Returns metadata for all foreign keys in a table.
 	 * @param  string

dibi/drivers/DibiOracleDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -45,7 +41,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	private $fmtDate, $fmtDateTime;
 
 
-
 	/**
 	 * @throws DibiNotSupportedException
 	 */
@@ -57,7 +52,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Connects to a database.
 	 * @return void
@@ -84,7 +78,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Disconnects from a database.
 	 * @return void
@@ -95,7 +88,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
@@ -121,7 +113,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
 	 * @return int|FALSE  number of rows or FALSE on error
@@ -132,7 +123,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @return int|FALSE  int on success or FALSE on failure
@@ -144,7 +134,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Begins a transaction (if supported).
 	 * @param  string  optional savepoint name
@@ -156,7 +145,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction.
 	 * @param  string  optional savepoint name
@@ -173,7 +161,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction.
 	 * @param  string  optional savepoint name
@@ -190,7 +177,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns the connection resource.
 	 * @return mixed
@@ -201,7 +187,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns the connection reflector.
 	 * @return IDibiReflector
@@ -212,7 +197,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Result set driver factory.
 	 * @param  resource
@@ -226,11 +210,9 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/********************* SQL ****************d*g**/
 
 
-
 	/**
 	 * Encodes data for use in a SQL statement.
 	 * @param  mixed     value
@@ -264,7 +246,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 * @param  string
@@ -279,7 +260,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Decodes data from result set.
 	 * @param  string    value
@@ -296,19 +276,17 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string &$sql  The SQL query that will be modified.
-	 * @param  int $limit
-	 * @param  int $offset
 	 * @return void
 	 */
 	public function applyLimit(& $sql, $limit, $offset)
 	{
 		if ($offset > 0) {
 			// see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
-			$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t ' . ($limit >= 0 ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '') . ') WHERE "__rnum" > '. (int) $offset;
+			$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
+				. ($limit >= 0 ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '')
+				. ') WHERE "__rnum" > '. (int) $offset;
 
 		} elseif ($limit >= 0) {
 			$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . (int) $limit;
@@ -316,11 +294,9 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/********************* result set ****************d*g**/
 
 
-
 	/**
 	 * Automatically frees the resources allocated for this result set.
 	 * @return void
@@ -331,7 +307,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @return int
@@ -342,7 +317,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
 	 * @param  bool     TRUE for associative array, FALSE for numeric
@@ -354,7 +328,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
@@ -366,7 +339,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Frees the resources allocated for this result set.
 	 * @return void
@@ -378,7 +350,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a result set.
 	 * @return array
@@ -399,7 +370,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns the result set resource.
 	 * @return mixed
@@ -411,11 +381,9 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/********************* IDibiReflector ****************d*g**/
 
 
-
 	/**
 	 * Returns list of tables.
 	 * @return array
@@ -436,7 +404,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a table.
 	 * @param  string
@@ -448,7 +415,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns metadata for all indexes in a table.
 	 * @param  string
@@ -460,7 +426,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns metadata for all foreign keys in a table.
 	 * @param  string

dibi/drivers/DibiPdoDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -43,7 +39,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	private $driverName;
 
 
-
 	/**
 	 * @throws DibiNotSupportedException
 	 */
@@ -55,7 +50,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Connects to a database.
 	 * @return void
@@ -85,7 +79,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Disconnects from a database.
 	 * @return void
@@ -96,7 +89,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
@@ -131,7 +123,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
 	 * @return int|FALSE  number of rows or FALSE on error
@@ -142,7 +133,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @return int|FALSE  int on success or FALSE on failure
@@ -153,7 +143,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Begins a transaction (if supported).
 	 * @param  string  optional savepoint name
@@ -169,7 +158,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction.
 	 * @param  string  optional savepoint name
@@ -185,7 +173,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction.
 	 * @param  string  optional savepoint name
@@ -201,7 +188,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Returns the connection resource.
 	 * @return PDO
@@ -212,7 +198,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Returns the connection reflector.
 	 * @return IDibiReflector
@@ -233,7 +218,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Result set driver factory.
 	 * @param  PDOStatement
@@ -247,11 +231,9 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/********************* SQL ****************d*g**/
 
 
-
 	/**
 	 * Encodes data for use in a SQL statement.
 	 * @param  mixed     value
@@ -307,7 +289,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 * @param  string
@@ -320,7 +301,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Decodes data from result set.
 	 * @param  string    value
@@ -337,17 +317,15 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string &$sql  The SQL query that will be modified.
-	 * @param  int $limit
-	 * @param  int $offset
 	 * @return void
 	 */
 	public function applyLimit(& $sql, $limit, $offset)
 	{
-		if ($limit < 0 && $offset < 1) return;
+		if ($limit < 0 && $offset < 1) {
+			return;
+		}
 
 		switch ($this->driverName) {
 			case 'mysql':
@@ -356,8 +334,12 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 				break;
 
 			case 'pgsql':
-			if ($limit >= 0) $sql .= ' LIMIT ' . (int) $limit;
-			if ($offset > 0) $sql .= ' OFFSET ' . (int) $offset;
+				if ($limit >= 0) {
+					$sql .= ' LIMIT ' . (int) $limit;
+				}
+				if ($offset > 0) {
+					$sql .= ' OFFSET ' . (int) $offset;
+				}
 				break;
 
 			case 'sqlite':
@@ -367,7 +349,9 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 
 			case 'oci':
 				if ($offset > 0) {
-				$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t ' . ($limit >= 0 ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '') . ') WHERE "__rnum" > '. (int) $offset;
+					$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
+						. ($limit >= 0 ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '')
+						. ') WHERE "__rnum" > '. (int) $offset;
 				} elseif ($limit >= 0) {
 					$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . (int) $limit;
 				}
@@ -388,11 +372,9 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/********************* result set ****************d*g**/
 
 
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @return int
@@ -403,7 +385,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
 	 * @param  bool     TRUE for associative array, FALSE for numeric
@@ -415,7 +396,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
@@ -427,7 +407,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Frees the resources allocated for this result set.
 	 * @return void
@@ -438,7 +417,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a result set.
 	 * @return array
@@ -472,7 +450,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	}
 
 
-
 	/**
 	 * Returns the result set resource.
 	 * @return PDOStatement

dibi/drivers/DibiPostgreDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -43,7 +39,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	private $escMethod = FALSE;
 
 
-
 	/**
 	 * @throws DibiNotSupportedException
 	 */
@@ -55,7 +50,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Connects to a database.
 	 * @return void
@@ -67,7 +61,9 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 			$this->connection = $config['resource'];
 
 		} else {
-			if (!isset($config['charset'])) $config['charset'] = 'utf8';
+			$config += array(
+				'charset' => 'utf8',
+			);
 			if (isset($config['string'])) {
 				$string = $config['string'];
 			} else {
@@ -75,7 +71,9 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 				DibiConnection::alias($config, 'user', 'username');
 				DibiConnection::alias($config, 'dbname', 'database');
 				foreach (array('host','hostaddr','port','dbname','user','password','connect_timeout','options','sslmode','service') as $key) {
-					if (isset($config[$key])) $string .= $key . '=' . $config[$key] . ' ';
+					if (isset($config[$key])) {
+						$string .= $key . '=' . $config[$key] . ' ';
+					}
 				}
 			}
 
@@ -110,7 +108,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Disconnects from a database.
 	 * @return void
@@ -121,7 +118,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
@@ -145,7 +141,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
 	 * @return int|FALSE  number of rows or FALSE on error
@@ -156,7 +151,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @return int|FALSE  int on success or FALSE on failure
@@ -170,14 +164,15 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 			$res = $this->query("SELECT CURRVAL('$sequence')");
 		}
 
-		if (!$res) return FALSE;
+		if (!$res) {
+			return FALSE;
+		}
 
 		$row = $res->fetch(FALSE);
 		return is_array($row) ? $row[0] : FALSE;
 	}
 
 
-
 	/**
 	 * Begins a transaction (if supported).
 	 * @param  string  optional savepoint name
@@ -190,7 +185,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction.
 	 * @param  string  optional savepoint name
@@ -203,7 +197,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction.
 	 * @param  string  optional savepoint name
@@ -216,7 +209,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Is in transaction?
 	 * @return bool
@@ -227,7 +219,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns the connection resource.
 	 * @return mixed
@@ -238,7 +229,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns the connection reflector.
 	 * @return IDibiReflector
@@ -249,7 +239,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Result set driver factory.
 	 * @param  resource
@@ -263,11 +252,9 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/********************* SQL ****************d*g**/
 
 
-
 	/**
 	 * Encodes data for use in a SQL statement.
 	 * @param  mixed     value
@@ -317,7 +304,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 * @param  string
@@ -337,7 +323,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Decodes data from result set.
 	 * @param  string    value
@@ -354,29 +339,25 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string &$sql  The SQL query that will be modified.
-	 * @param  int $limit
-	 * @param  int $offset
 	 * @return void
 	 */
 	public function applyLimit(& $sql, $limit, $offset)
 	{
-		if ($limit >= 0)
+		if ($limit >= 0) {
 			$sql .= ' LIMIT ' . (int) $limit;
+		}
 
-		if ($offset > 0)
+		if ($offset > 0) {
 			$sql .= ' OFFSET ' . (int) $offset;
 		}
+	}
 
 
-
 	/********************* result set ****************d*g**/
 
 
-
 	/**
 	 * Automatically frees the resources allocated for this result set.
 	 * @return void
@@ -387,7 +368,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @return int
@@ -398,7 +378,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
 	 * @param  bool     TRUE for associative array, FALSE for numeric
@@ -410,7 +389,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
@@ -422,7 +400,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Frees the resources allocated for this result set.
 	 * @return void
@@ -434,7 +411,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a result set.
 	 * @return array
@@ -457,7 +433,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns the result set resource.
 	 * @return mixed
@@ -469,11 +444,9 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/********************* IDibiReflector ****************d*g**/
 
 
-
 	/**
 	 * Returns list of tables.
 	 * @return array
@@ -502,7 +475,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a table.
 	 * @param  string
@@ -543,7 +515,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns metadata for all indexes in a table.
 	 * @param  string
@@ -585,7 +556,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns metadata for all foreign keys in a table.
 	 * @param  string

dibi/drivers/DibiSqlite3Driver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -46,7 +42,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	private $dbcharset, $charset;
 
 
-
 	/**
 	 * @throws DibiNotSupportedException
 	 */
@@ -58,7 +53,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Connects to a database.
 	 * @return void
@@ -93,7 +87,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Disconnects from a database.
 	 * @return void
@@ -104,7 +97,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
@@ -127,7 +119,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
 	 * @return int|FALSE  number of rows or FALSE on error
@@ -138,7 +129,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @return int|FALSE  int on success or FALSE on failure
@@ -149,7 +139,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Begins a transaction (if supported).
 	 * @param  string  optional savepoint name
@@ -162,7 +151,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction.
 	 * @param  string  optional savepoint name
@@ -175,7 +163,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction.
 	 * @param  string  optional savepoint name
@@ -188,7 +175,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns the connection resource.
 	 * @return mixed
@@ -199,7 +185,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns the connection reflector.
 	 * @return IDibiReflector
@@ -210,7 +195,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Result set driver factory.
 	 * @param  SQLite3Result
@@ -224,11 +208,9 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/********************* SQL ****************d*g**/
 
 
-
 	/**
 	 * Encodes data for use in a SQL statement.
 	 * @param  mixed     value
@@ -263,7 +245,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 * @param  string
@@ -277,7 +258,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Decodes data from result set.
 	 * @param  string    value
@@ -294,26 +274,21 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string &$sql  The SQL query that will be modified.
-	 * @param  int $limit
-	 * @param  int $offset
 	 * @return void
 	 */
 	public function applyLimit(& $sql, $limit, $offset)
 	{
-		if ($limit < 0 && $offset < 1) return;
-		$sql .= ' LIMIT ' . $limit . ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
+		if ($limit >= 0 || $offset > 0) {
+			$sql .= ' LIMIT ' . (int) $limit . ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
+		}
 	}
 
 
-
 	/********************* result set ****************d*g**/
 
 
-
 	/**
 	 * Automatically frees the resources allocated for this result set.
 	 * @return void
@@ -324,7 +299,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @return int
@@ -336,7 +310,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
 	 * @param  bool     TRUE for associative array, FALSE for numeric
@@ -360,7 +333,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
@@ -373,7 +345,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Frees the resources allocated for this result set.
 	 * @return void
@@ -385,7 +356,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a result set.
 	 * @return array
@@ -407,7 +377,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Returns the result set resource.
 	 * @return mixed
@@ -419,11 +388,9 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/********************* user defined functions ****************d*g**/
 
 
-
 	/**
 	 * Registers an user defined function for use in SQL statements.
 	 * @param  string  function name
@@ -437,7 +404,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
-
 	/**
 	 * Registers an aggregating user defined function for use in SQL statements.
 	 * @param  string  function name

dibi/drivers/DibiSqliteDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -48,7 +44,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	private $dbcharset, $charset;
 
 
-
 	/**
 	 * @throws DibiNotSupportedException
 	 */
@@ -60,7 +55,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Connects to a database.
 	 * @return void
@@ -95,7 +89,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Disconnects from a database.
 	 * @return void
@@ -106,7 +99,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
@@ -134,7 +126,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
 	 * @return int|FALSE  number of rows or FALSE on error
@@ -145,7 +136,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @return int|FALSE  int on success or FALSE on failure
@@ -156,7 +146,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Begins a transaction (if supported).
 	 * @param  string  optional savepoint name
@@ -169,7 +158,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction.
 	 * @param  string  optional savepoint name
@@ -182,7 +170,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction.
 	 * @param  string  optional savepoint name
@@ -195,7 +182,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns the connection resource.
 	 * @return mixed
@@ -206,7 +192,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns the connection reflector.
 	 * @return IDibiReflector
@@ -217,7 +202,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Result set driver factory.
 	 * @param  resource
@@ -231,11 +215,9 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/********************* SQL ****************d*g**/
 
 
-
 	/**
 	 * Encodes data for use in a SQL statement.
 	 * @param  mixed     value
@@ -268,7 +250,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 * @param  string
@@ -281,7 +262,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Decodes data from result set.
 	 * @param  string    value
@@ -298,26 +278,21 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string &$sql  The SQL query that will be modified.
-	 * @param  int $limit
-	 * @param  int $offset
 	 * @return void
 	 */
 	public function applyLimit(& $sql, $limit, $offset)
 	{
-		if ($limit < 0 && $offset < 1) return;
-		$sql .= ' LIMIT ' . $limit . ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
+		if ($limit >= 0 || $offset > 0) {
+			$sql .= ' LIMIT ' . (int) $limit . ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
+		}
 	}
 
 
-
 	/********************* result set ****************d*g**/
 
 
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @return int
@@ -331,7 +306,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
 	 * @param  bool     TRUE for associative array, FALSE for numeric
@@ -355,7 +329,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
@@ -371,7 +344,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Frees the resources allocated for this result set.
 	 * @return void
@@ -382,7 +354,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a result set.
 	 * @return array
@@ -405,7 +376,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Returns the result set resource.
 	 * @return mixed
@@ -416,11 +386,9 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/********************* user defined functions ****************d*g**/
 
 
-
 	/**
 	 * Registers an user defined function for use in SQL statements.
 	 * @param  string  function name
@@ -434,7 +402,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	}
 
 
-
 	/**
 	 * Registers an aggregating user defined function for use in SQL statements.
 	 * @param  string  function name

dibi/drivers/DibiSqliteReflector.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -23,14 +19,12 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
 	private $driver;
 
 
-
 	public function __construct(IDibiDriver $driver)
 	{
 		$this->driver = $driver;
 	}
 
 
-
 	/**
 	 * Returns list of tables.
 	 * @return array
@@ -51,7 +45,6 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns metadata for all columns in a table.
 	 * @param  string
@@ -87,7 +80,6 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns metadata for all indexes in a table.
 	 * @param  string
@@ -139,7 +131,6 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
 	}
 
 
-
 	/**
 	 * Returns metadata for all foreign keys in a table.
 	 * @param  string

dibi/libs/DibiConnection.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * dibi connection.
  *
@@ -45,7 +40,6 @@ class DibiConnection extends DibiObject
 	private $substitutes;
 
 
-
 	/**
 	 * Connection options: (see driver-specific options too)
 	 *   - lazy (bool) => if TRUE, connection will be established only when required
@@ -139,7 +133,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Automatically frees the resources allocated for this result set.
 	 * @return void
@@ -151,7 +144,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Connects to a database.
 	 * @return void
@@ -171,7 +163,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Disconnects from a database.
 	 * @return void
@@ -183,7 +174,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Returns TRUE when connection was established.
 	 * @return bool
@@ -194,7 +184,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Returns configuration variable. If no $key is passed, returns the entire array.
 	 * @see self::__construct
@@ -216,7 +205,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Apply configuration alias or default values.
 	 * @param  array  connect configuration
@@ -227,7 +215,9 @@ class DibiConnection extends DibiObject
 	public static function alias(& $config, $key, $alias)
 	{
 		$foo = & $config;
-		foreach (explode('|', $key) as $key) $foo = & $foo[$key];
+		foreach (explode('|', $key) as $key) {
+			$foo = & $foo[$key];
+		}
 
 		if (!isset($foo) && isset($config[$alias])) {
 			$foo = $config[$alias];
@@ -236,7 +226,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Returns the driver and connects to a database in lazy mode.
 	 * @return IDibiDriver
@@ -248,7 +237,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Generates (translates) and executes SQL query.
 	 * @param  array|mixed      one or more arguments
@@ -262,7 +250,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Generates SQL query.
 	 * @param  array|mixed      one or more arguments
@@ -276,7 +263,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Generates and prints SQL query.
 	 * @param  array|mixed  one or more arguments
@@ -300,7 +286,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Generates (translates) and returns SQL query as DibiDataSource.
 	 * @param  array|mixed      one or more arguments
@@ -314,7 +299,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Generates SQL query.
 	 * @param  array
@@ -327,7 +311,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Executes the SQL query.
 	 * @param  string           SQL statement.
@@ -359,7 +342,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
 	 * @return int  number of rows
@@ -369,12 +351,13 @@ class DibiConnection extends DibiObject
 	{
 		$this->connected || $this->connect();
 		$rows = $this->driver->getAffectedRows();
-		if (!is_int($rows) || $rows < 0) throw new DibiException('Cannot retrieve number of affected rows.');
+		if (!is_int($rows) || $rows < 0) {
+			throw new DibiException('Cannot retrieve number of affected rows.');
+		}
 		return $rows;
 	}
 
 
-
 	/**
 	 * Gets the number of affected rows. Alias for getAffectedRows().
 	 * @return int  number of rows
@@ -386,7 +369,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @param  string     optional sequence name
@@ -397,12 +379,13 @@ class DibiConnection extends DibiObject
 	{
 		$this->connected || $this->connect();
 		$id = $this->driver->getInsertId($sequence);
-		if ($id < 1) throw new DibiException('Cannot retrieve last generated ID.');
+		if ($id < 1) {
+			throw new DibiException('Cannot retrieve last generated ID.');
+		}
 		return (int) $id;
 	}
 
 
-
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column. Alias for getInsertId().
 	 * @param  string     optional sequence name
@@ -415,7 +398,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Begins a transaction (if supported).
 	 * @param  string  optional savepoint name
@@ -436,7 +418,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Commits statements in a transaction.
 	 * @param  string  optional savepoint name
@@ -457,7 +438,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Rollback changes in a transaction.
 	 * @param  string  optional savepoint name
@@ -478,7 +458,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Result set factory.
 	 * @param  IDibiResultDriver
@@ -492,11 +471,9 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/********************* fluent SQL builders ****************d*g**/
 
 
-
 	/**
 	 * @return DibiFluent
 	 */
@@ -506,7 +483,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * @param  string    column name
 	 * @return DibiFluent
@@ -518,7 +494,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * @param  string   table
 	 * @param  array
@@ -533,7 +508,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * @param  string   table
 	 * @param  array
@@ -551,7 +525,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * @param  string   table
 	 * @return DibiFluent
@@ -562,11 +535,9 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/********************* substitutions ****************d*g**/
 
 
-
 	/**
 	 * Returns substitution hashmap.
 	 * @return DibiHashMap
@@ -577,7 +548,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Provides substitution.
 	 * @return string
@@ -588,7 +558,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Substitution callback.
 	 */
@@ -598,11 +567,9 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/********************* shortcuts ****************d*g**/
 
 
-
 	/**
 	 * Executes SQL query and fetch result - shortcut for query() & fetch().
 	 * @param  array|mixed    one or more arguments
@@ -616,11 +583,10 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Executes SQL query and fetch results - shortcut for query() & fetchAll().
 	 * @param  array|mixed    one or more arguments
-	 * @return array of DibiRow
+	 * @return DibiRow[]
 	 * @throws DibiException
 	 */
 	public function fetchAll($args)
@@ -630,7 +596,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Executes SQL query and fetch first column - shortcut for query() & fetchSingle().
 	 * @param  array|mixed    one or more arguments
@@ -644,7 +609,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Executes SQL query and fetch pairs - shortcut for query() & fetchPairs().
 	 * @param  array|mixed    one or more arguments
@@ -658,11 +622,9 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/********************* misc ****************d*g**/
 
 
-
 	/**
 	 * Import SQL dump from file - extreme fast!
 	 * @param  string  filename
@@ -698,7 +660,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Gets a information about the current database.
 	 * @return DibiDatabaseInfo
@@ -710,7 +671,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Prevents unserialization.
 	 */
@@ -720,7 +680,6 @@ class DibiConnection extends DibiObject
 	}
 
 
-
 	/**
 	 * Prevents serialization.
 	 */

dibi/libs/DibiDataSource.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * Default implementation of IDataSource for dibi.
  *
@@ -55,7 +50,6 @@ class DibiDataSource extends DibiObject implements IDataSource
 	private $limit;
 
 
-
 	/**
 	 * @param  string  SQL command or table or view name, as data source
 	 * @param  DibiConnection  connection
@@ -71,12 +65,11 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Selects columns to query.
 	 * @param  string|array  column name or array of column names
 	 * @param  string        column alias
-	 * @return DibiDataSource  provides a fluent interface
+	 * @return self
 	 */
 	public function select($col, $as = NULL)
 	{
@@ -90,11 +83,10 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Adds conditions to query.
 	 * @param  mixed  conditions
-	 * @return DibiDataSource  provides a fluent interface
+	 * @return self
 	 */
 	public function where($cond)
 	{
@@ -109,12 +101,11 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Selects columns to order by.
 	 * @param  string|array  column name or array of column names
 	 * @param  string        sorting direction
-	 * @return DibiDataSource  provides a fluent interface
+	 * @return self
 	 */
 	public function orderBy($row, $sorting = 'ASC')
 	{
@@ -128,12 +119,11 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Limits number of rows.
 	 * @param  int limit
 	 * @param  int offset
-	 * @return DibiDataSource  provides a fluent interface
+	 * @return self
 	 */
 	public function applyLimit($limit, $offset = NULL)
 	{
@@ -144,7 +134,6 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Returns the dibi connection.
 	 * @return DibiConnection
@@ -155,11 +144,9 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/********************* executing ****************d*g**/
 
 
-
 	/**
 	 * Returns (and queries) DibiResult.
 	 * @return DibiResult
@@ -173,7 +160,6 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * @return DibiResultIterator
 	 */
@@ -183,7 +169,6 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Generates, executes SQL query and fetches the single row.
 	 * @return DibiRow|FALSE  array on success, FALSE if no next record
@@ -194,7 +179,6 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Like fetch(), but returns only first field.
 	 * @return mixed  value on success, FALSE if no next record
@@ -205,7 +189,6 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Fetches all records from table.
 	 * @return array
@@ -216,7 +199,6 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Fetches all records from table and returns associative tree.
 	 * @param  string  associative descriptor
@@ -228,7 +210,6 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Fetches all records from table like $key => $value pairs.
 	 * @param  string  associative key
@@ -241,7 +222,6 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Discards the internal cache.
 	 * @return void
@@ -252,11 +232,9 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/********************* exporting ****************d*g**/
 
 
-
 	/**
 	 * Returns this data source wrapped in DibiFluent object.
 	 * @return DibiFluent
@@ -267,7 +245,6 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Returns this data source wrapped in DibiDataSource object.
 	 * @return DibiDataSource
@@ -278,7 +255,6 @@ class DibiDataSource extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Returns SQL query.
 	 * @return string
@@ -299,11 +275,9 @@ FROM %SQL', $this->sql, '
 	}
 
 
-
 	/********************* counting ****************d*g**/
 
 
-
 	/**
 	 * Returns the number of rows in a given data source.
 	 * @return int
@@ -321,7 +295,6 @@ FROM %SQL', $this->sql, '
 	}
 
 
-
 	/**
 	 * Returns the number of rows in a given data source.
 	 * @return int

dibi/libs/DibiDatabaseInfo.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * Reflection metadata class for a database.
  *
@@ -33,7 +28,6 @@ class DibiDatabaseInfo extends DibiObject
 	private $tables;
 
 
-
 	public function __construct(IDibiReflector $reflector, $name)
 	{
 		$this->reflector = $reflector;
@@ -41,7 +35,6 @@ class DibiDatabaseInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return string
 	 */
@@ -51,9 +44,8 @@ class DibiDatabaseInfo extends DibiObject
 	}
 
 
-
 	/**
-	 * @return array of DibiTableInfo
+	 * @return DibiTableInfo[]
 	 */
 	public function getTables()
 	{
@@ -62,9 +54,8 @@ class DibiDatabaseInfo extends DibiObject
 	}
 
 
-
 	/**
-	 * @return array of string
+	 * @return string[]
 	 */
 	public function getTableNames()
 	{
@@ -77,7 +68,6 @@ class DibiDatabaseInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @param  string
 	 * @return DibiTableInfo
@@ -95,7 +85,6 @@ class DibiDatabaseInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @param  string
 	 * @return bool
@@ -107,7 +96,6 @@ class DibiDatabaseInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return void
 	 */
@@ -124,8 +112,6 @@ class DibiDatabaseInfo extends DibiObject
 }
 
 
-
-
 /**
  * Reflection metadata class for a database table.
  *
@@ -164,7 +150,6 @@ class DibiTableInfo extends DibiObject
 	private $primaryKey;
 
 
-
 	public function __construct(IDibiReflector $reflector, array $info)
 	{
 		$this->reflector = $reflector;
@@ -173,7 +158,6 @@ class DibiTableInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return string
 	 */
@@ -183,7 +167,6 @@ class DibiTableInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return bool
 	 */
@@ -193,9 +176,8 @@ class DibiTableInfo extends DibiObject
 	}
 
 
-
 	/**
-	 * @return array of DibiColumnInfo
+	 * @return DibiColumnInfo[]
 	 */
 	public function getColumns()
 	{
@@ -204,9 +186,8 @@ class DibiTableInfo extends DibiObject
 	}
 
 
-
 	/**
-	 * @return array of string
+	 * @return string[]
 	 */
 	public function getColumnNames()
 	{
@@ -219,7 +200,6 @@ class DibiTableInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @param  string
 	 * @return DibiColumnInfo
@@ -237,7 +217,6 @@ class DibiTableInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @param  string
 	 * @return bool
@@ -249,9 +228,8 @@ class DibiTableInfo extends DibiObject
 	}
 
 
-
 	/**
-	 * @return array of DibiForeignKeyInfo
+	 * @return DibiForeignKeyInfo[]
 	 */
 	public function getForeignKeys()
 	{
@@ -260,9 +238,8 @@ class DibiTableInfo extends DibiObject
 	}
 
 
-
 	/**
-	 * @return array of DibiIndexInfo
+	 * @return DibiIndexInfo[]
 	 */
 	public function getIndexes()
 	{
@@ -271,7 +248,6 @@ class DibiTableInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return DibiIndexInfo
 	 */
@@ -282,7 +258,6 @@ class DibiTableInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return void
 	 */
@@ -297,7 +272,6 @@ class DibiTableInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return void
 	 */
@@ -319,7 +293,6 @@ class DibiTableInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return void
 	 */
@@ -331,8 +304,6 @@ class DibiTableInfo extends DibiObject
 }
 
 
-
-
 /**
  * Reflection metadata class for a result set.
  *
@@ -354,16 +325,14 @@ class DibiResultInfo extends DibiObject
 	private $names;
 
 
-
 	public function __construct(IDibiResultDriver $driver)
 	{
 		$this->driver = $driver;
 	}
 
 
-
 	/**
-	 * @return array of DibiColumnInfo
+	 * @return DibiColumnInfo[]
 	 */
 	public function getColumns()
 	{
@@ -372,10 +341,9 @@ class DibiResultInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @param  bool
-	 * @return array of string
+	 * @return string[]
 	 */
 	public function getColumnNames($fullNames = FALSE)
 	{
@@ -388,7 +356,6 @@ class DibiResultInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @param  string
 	 * @return DibiColumnInfo
@@ -406,7 +373,6 @@ class DibiResultInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @param  string
 	 * @return bool
@@ -418,7 +384,6 @@ class DibiResultInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return void
 	 */
@@ -436,8 +401,6 @@ class DibiResultInfo extends DibiObject
 }
 
 
-
-
 /**
  * Reflection metadata class for a table or result set column.
  *
@@ -467,7 +430,6 @@ class DibiColumnInfo extends DibiObject
 	private $info;
 
 
-
 	public function __construct(IDibiReflector $reflector = NULL, array $info)
 	{
 		$this->reflector = $reflector;
@@ -475,7 +437,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return string
 	 */
@@ -485,7 +446,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return string
 	 */
@@ -495,7 +455,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return bool
 	 */
@@ -505,7 +464,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return DibiTableInfo
 	 */
@@ -518,7 +476,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return string
 	 */
@@ -528,7 +485,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return string
 	 */
@@ -538,7 +494,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return mixed
 	 */
@@ -548,7 +503,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return int
 	 */
@@ -558,7 +512,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return bool
 	 */
@@ -568,7 +521,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return bool
 	 */
@@ -578,7 +530,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return bool
 	 */
@@ -588,7 +539,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return mixed
 	 */
@@ -598,7 +548,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @param  string
 	 * @return mixed
@@ -609,7 +558,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * Heuristic type detection.
 	 * @param  string
@@ -639,7 +587,6 @@ class DibiColumnInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @internal
 	 */
@@ -654,8 +601,6 @@ class DibiColumnInfo extends DibiObject
 }
 
 
-
-
 /**
  * Reflection metadata class for a foreign key.
  *
@@ -675,7 +620,6 @@ class DibiForeignKeyInfo extends DibiObject
 	private $references;
 
 
-
 	public function __construct($name, array $references)
 	{
 		$this->name = $name;
@@ -683,7 +627,6 @@ class DibiForeignKeyInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return string
 	 */
@@ -693,7 +636,6 @@ class DibiForeignKeyInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return array
 	 */
@@ -705,8 +647,6 @@ class DibiForeignKeyInfo extends DibiObject
 }
 
 
-
-
 /**
  * Reflection metadata class for a index or primary key.
  *
@@ -730,7 +670,6 @@ class DibiIndexInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return string
 	 */
@@ -740,7 +679,6 @@ class DibiIndexInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return array
 	 */
@@ -750,7 +688,6 @@ class DibiIndexInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return bool
 	 */
@@ -760,7 +697,6 @@ class DibiIndexInfo extends DibiObject
 	}
 
 
-
 	/**
 	 * @return bool
 	 */

dibi/libs/DibiDateTime.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * DateTime with serialization and timestamp support for PHP 5.2.
  *
@@ -33,7 +28,6 @@ class DibiDateTime extends DateTime
 	}
 
 
-
 	public function modifyClone($modify = '')
 	{
 		$dolly = clone($this);
@@ -41,7 +35,6 @@ class DibiDateTime extends DateTime
 	}
 
 
-
 	public function modify($modify)
 	{
 		parent::modify($modify);
@@ -49,7 +42,6 @@ class DibiDateTime extends DateTime
 	}
 
 
-
 	public function __sleep()
 	{
 		$this->fix = array($this->format('Y-m-d H:i:s'), $this->getTimezone()->getName());
@@ -57,7 +49,6 @@ class DibiDateTime extends DateTime
 	}
 
 
-
 	public function __wakeup()
 	{
 		$this->__construct($this->fix[0], new DateTimeZone($this->fix[1]));
@@ -65,21 +56,18 @@ class DibiDateTime extends DateTime
 	}
 
 
-
 	public function getTimestamp()
 	{
 		return (int) $this->format('U');
 	}
 
 
-
 	public function setTimestamp($timestamp)
 	{
 		return $this->__construct(date('Y-m-d H:i:s', $timestamp), new DateTimeZone($this->getTimezone()->getName())); // getTimeZone() crashes in PHP 5.2.6
 	}
 
 
-
 	public function __toString()
 	{
 		return $this->format('Y-m-d H:i:s');

dibi/libs/DibiEvent.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * Profiler & logger event.
  *
@@ -54,7 +49,6 @@ class DibiEvent
 	public $source;
 
 
-
 	public function __construct(DibiConnection $connection, $type, $sql = NULL)
 	{
 		$this->connection = $connection;
@@ -85,7 +79,6 @@ class DibiEvent
 	}
 
 
-
 	public function done($result = NULL)
 	{
 		$this->result = $result;

dibi/libs/DibiException.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * dibi common exception.
  *
@@ -36,7 +31,6 @@ class DibiException extends Exception
 	}
 
 
-
 	/**
 	 * @return string  The SQL passed to the constructor
 	 */
@@ -46,7 +40,6 @@ class DibiException extends Exception
 	}
 
 
-
 	/**
 	 * @return string  string represenation of exception with SQL command
 	 */
@@ -58,8 +51,6 @@ class DibiException extends Exception
 }
 
 
-
-
 /**
  * database server exception.
  *
@@ -72,12 +63,10 @@ class DibiDriverException extends DibiException
 	/********************* error catching ****************d*g**/
 
 
-
 	/** @var string */
 	private static $errorMsg;
 
 
-
 	/**
 	 * Starts catching potential errors/warnings.
 	 * @return void
@@ -89,7 +78,6 @@ class DibiDriverException extends DibiException
 	}
 
 
-
 	/**
 	 * Returns catched error/warning message.
 	 * @param  string  catched message
@@ -104,7 +92,6 @@ class DibiDriverException extends DibiException
 	}
 
 
-
 	/**
 	 * Internal error handler. Do not call directly.
 	 * @internal
@@ -124,8 +111,6 @@ class DibiDriverException extends DibiException
 }
 
 
-
-
 /**
  * PCRE exception.
  *
@@ -149,7 +134,6 @@ class DibiPcreException extends Exception {
 }
 
 
-
 /**
  * @package    dibi
  */
@@ -157,7 +141,6 @@ class DibiNotImplementedException extends DibiException
 {}
 
 
-
 /**
  * @package    dibi
  */

dibi/libs/DibiFileLogger.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * dibi file logger.
  *
@@ -26,7 +21,6 @@ class DibiFileLogger extends DibiObject
 	public $filter;
 
 
-
 	public function __construct($file, $filter = NULL)
 	{
 		$this->file = $file;
@@ -34,7 +28,6 @@ class DibiFileLogger extends DibiObject
 	}
 
 
-
 	/**
 	 * After event notification.
 	 * @return void
@@ -46,7 +39,9 @@ class DibiFileLogger extends DibiObject
 		}
 
 		$handle = fopen($this->file, 'a');
-		if (!$handle) return; // or throw exception?
+		if (!$handle) {
+			return; // or throw exception?
+		}
 		flock($handle, LOCK_EX);
 
 		if ($event->result instanceof Exception) {
@@ -65,7 +60,7 @@ class DibiFileLogger extends DibiObject
 			fwrite($handle,
 				"OK: " . $event->sql
 				. ($event->count ? ";\n-- rows: " . $event->count : '')
-				. "\n-- takes: " . sprintf('%0.3f', $event->time * 1000) . ' ms'
+				. "\n-- takes: " . sprintf('%0.3f ms', $event->time * 1000)
 				. "\n-- source: " . implode(':', $event->source)
 				. "\n-- driver: " . $event->connection->getConfig('driver') . '/' . $event->connection->getConfig('name')
 				. "\n-- " . date('Y-m-d H:i:s')

dibi/libs/DibiFirePhpLogger.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * dibi FirePHP logger.
  *
@@ -38,7 +33,6 @@ class DibiFirePhpLogger extends DibiObject
 	private static $fireTable = array(array('Time', 'SQL Statement', 'Rows', 'Connection'));
 
 
-
 	/**
 	 * @return bool
 	 */
@@ -48,14 +42,12 @@ class DibiFirePhpLogger extends DibiObject
 	}
 
 
-
 	public function __construct($filter = NULL)
 	{
 		$this->filter = $filter ? (int) $filter : DibiEvent::QUERY;
 	}
 
 
-
 	/**
 	 * After event notification.
 	 * @return void

dibi/libs/DibiFluent.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * dibi SQL builder via fluent interfaces. EXPERIMENTAL!
  *
@@ -101,7 +96,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	private static $normalizer;
 
 
-
 	/**
 	 * @param  DibiConnection
 	 */
@@ -115,12 +109,11 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Appends new argument to the clause.
 	 * @param  string clause name
 	 * @param  array  arguments
-	 * @return DibiFluent  provides a fluent interface
+	 * @return self
 	 */
 	public function __call($clause, $args)
 	{
@@ -205,11 +198,10 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Switch to a clause.
 	 * @param  string clause name
-	 * @return DibiFluent  provides a fluent interface
+	 * @return self
 	 */
 	public function clause($clause, $remove = FALSE)
 	{
@@ -227,11 +219,10 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Removes a clause.
 	 * @param  string clause name
-	 * @return DibiFluent  provides a fluent interface
+	 * @return self
 	 */
 	public function removeClause($clause)
 	{
@@ -240,12 +231,11 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Change a SQL flag.
 	 * @param  string  flag name
 	 * @param  bool  value
-	 * @return DibiFluent  provides a fluent interface
+	 * @return self
 	 */
 	public function setFlag($flag, $value = TRUE)
 	{
@@ -259,7 +249,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Is a flag set?
 	 * @param  string  flag name
@@ -271,7 +260,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Returns SQL command.
 	 * @return string
@@ -282,7 +270,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Returns the dibi connection.
 	 * @return DibiConnection
@@ -293,12 +280,11 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Adds DibiResult setup.
 	 * @param  string  method
 	 * @param  mixed   args
-	 * @return DibiFluent  provides a fluent interface
+	 * @return self
 	 */
 	public function setupResult($method)
 	{
@@ -307,11 +293,9 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/********************* executing ****************d*g**/
 
 
-
 	/**
 	 * Generates and executes SQL query.
 	 * @param  mixed what to return?
@@ -325,7 +309,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Generates, executes SQL query and fetches the single row.
 	 * @return DibiRow|FALSE  array on success, FALSE if no next record
@@ -340,7 +323,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Like fetch(), but returns only first field.
 	 * @return mixed  value on success, FALSE if no next record
@@ -355,7 +337,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Fetches all records from table.
 	 * @param  int  offset
@@ -368,7 +349,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Fetches all records from table and returns associative tree.
 	 * @param  string  associative descriptor
@@ -380,7 +360,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Fetches all records from table like $key => $value pairs.
 	 * @param  string  associative key
@@ -393,7 +372,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Required by the IteratorAggregate interface.
 	 * @param  int  offset
@@ -406,7 +384,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Generates and prints SQL query or it's part.
 	 * @param  string clause name
@@ -418,7 +395,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * @return int
 	 */
@@ -430,7 +406,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * @return DibiResult
 	 */
@@ -444,11 +419,9 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/********************* exporting ****************d*g**/
 
 
-
 	/**
 	 * @return DibiDataSource
 	 */
@@ -458,7 +431,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Returns SQL query.
 	 * @return string
@@ -473,7 +445,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Generates parameters for DibiTranslator.
 	 * @param  string clause name
@@ -499,7 +470,9 @@ class DibiFluent extends DibiObject implements IDataSource
 				if ($clause === $this->command && $this->flags) {
 					$args[] = implode(' ', array_keys($this->flags));
 				}
-				foreach ($statement as $arg) $args[] = $arg;
+				foreach ($statement as $arg) {
+					$args[] = $arg;
+				}
 			}
 		}
 
@@ -507,7 +480,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Format camelCase clause name to UPPER CASE.
 	 * @param  string
@@ -524,7 +496,6 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 
-
 	public function __clone()
 	{
 		// remove references

dibi/libs/DibiHashMap.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * Lazy cached storage.
  *
@@ -29,7 +24,6 @@ abstract class DibiHashMapBase
 	}
 
 
-
 	public function setCallback($callback)
 	{
 		if (!is_callable($callback)) {
@@ -40,7 +34,6 @@ abstract class DibiHashMapBase
 	}
 
 
-
 	public function getCallback()
 	{
 		return $this->callback;
@@ -49,7 +42,6 @@ abstract class DibiHashMapBase
 }
 
 
-
 /**
  * Lazy cached storage.
  *
@@ -68,7 +60,6 @@ final class DibiHashMap extends DibiHashMapBase
 	}
 
 
-
 	public function __get($nm)
 	{
 		if ($nm == '') {

dibi/libs/DibiLiteral.php

@@ -2,19 +2,15 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * SQL literal value.
  *
  * @author     David Grudl
+ * @package    dibi
  */
 class DibiLiteral extends DibiObject
 {
@@ -28,7 +24,6 @@ class DibiLiteral extends DibiObject
 	}
 
 
-
 	/**
 	 * @return string
 	 */

dibi/libs/DibiObject.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * DibiObject is the ultimate ancestor of all instantiable classes.
  *
@@ -58,7 +53,6 @@ abstract class DibiObject
 	private static $extMethods;
 
 
-
 	/**
 	 * Returns the name of the class of this object.
 	 * @return string
@@ -69,7 +63,6 @@ abstract class DibiObject
 	}
 
 
-
 	/**
 	 * Access to reflection.
 	 * @return \ReflectionObject
@@ -80,7 +73,6 @@ abstract class DibiObject
 	}
 
 
-
 	/**
 	 * Call to undefined method.
 	 * @param  string  method name
@@ -125,7 +117,6 @@ abstract class DibiObject
 	}
 
 
-
 	/**
 	 * Call to undefined static method.
 	 * @param  string  method name (in lower case!)
@@ -140,7 +131,6 @@ abstract class DibiObject
 	}
 
 
-
 	/**
 	 * Adding method to class.
 	 * @param  string  method name
@@ -158,7 +148,9 @@ abstract class DibiObject
 					self::$extMethods[$pair[1]][''] = NULL;
 				}
 			}
-			if ($name === NULL) return NULL;
+			if ($name === NULL) {
+				return NULL;
+			}
 		}
 
 		$name = strtolower($name);
@@ -202,7 +194,6 @@ abstract class DibiObject
 	}
 
 
-
 	/**
 	 * Returns property value. Do not call directly.
 	 * @param  string  property name
@@ -239,7 +230,6 @@ abstract class DibiObject
 	}
 
 
-
 	/**
 	 * Sets value of a property. Do not call directly.
 	 * @param  string  property name
@@ -274,7 +264,6 @@ abstract class DibiObject
 	}
 
 
-
 	/**
 	 * Is property defined?
 	 * @param  string  property name
@@ -287,7 +276,6 @@ abstract class DibiObject
 	}
 
 
-
 	/**
 	 * Access to undeclared property.
 	 * @param  string  property name
@@ -301,7 +289,6 @@ abstract class DibiObject
 	}
 
 
-
 	/**
 	 * Has property an accessor?
 	 * @param  string  class name

dibi/libs/DibiResult.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * dibi result set.
  *
@@ -61,7 +56,6 @@ class DibiResult extends DibiObject implements IDataSource
 	private $formats = array();
 
 
-
 	/**
 	 * @param  IDibiResultDriver
 	 */
@@ -72,7 +66,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * @deprecated
 	 */
@@ -82,7 +75,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Frees the resources allocated for this result set.
 	 * @return void
@@ -96,7 +88,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Safe access to property $driver.
 	 * @return IDibiResultDriver
@@ -112,11 +103,9 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/********************* rows ****************d*g**/
 
 
-
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
@@ -129,7 +118,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Required by the Countable interface.
 	 * @return int
@@ -140,7 +128,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @return int
@@ -151,7 +138,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Returns the number of rows in a result set. Alias for getRowCount().
 	 * @deprecated
@@ -163,7 +149,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Required by the IteratorAggregate interface.
 	 * @return DibiResultIterator
@@ -177,15 +162,13 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/********************* fetching rows ****************d*g**/
 
 
-
 	/**
 	 * Set fetched object class. This class should extend the DibiRow class.
 	 * @param  string
-	 * @return DibiResult  provides a fluent interface
+	 * @return self
 	 */
 	public function setRowClass($class)
 	{
@@ -194,7 +177,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Returns fetched object class name.
 	 * @return string
@@ -205,11 +187,10 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Set a factory to create fetched object instances. These should extend the DibiRow class.
 	 * @param  callback
-	 * @return DibiResult  provides a fluent interface
+	 * @return self
 	 */
 	public function setRowFactory($callback)
 	{
@@ -218,7 +199,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Fetches the row at current position, process optional type conversion.
 	 * and moves the internal cursor to the next position
@@ -241,7 +221,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Like fetch(), but returns only first field.
 	 * @return mixed  value on success, FALSE if no next record
@@ -258,23 +237,26 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Fetches all records from table.
 	 * @param  int  offset
 	 * @param  int  limit
-	 * @return array of DibiRow
+	 * @return DibiRow[]
 	 */
 	final public function fetchAll($offset = NULL, $limit = NULL)
 	{
 		$limit = $limit === NULL ? -1 : (int) $limit;
 		$this->seek((int) $offset);
 		$row = $this->fetch();
-		if (!$row) return array();  // empty result set
+		if (!$row) {
+			return array();  // empty result set
+		}
 
 		$data = array();
 		do {
-			if ($limit === 0) break;
+			if ($limit === 0) {
+				break;
+			}
 			$limit--;
 			$data[] = $row;
 		} while ($row = $this->fetch());
@@ -283,7 +265,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Fetches all records from table and returns associative tree.
 	 * Examples:
@@ -303,7 +284,9 @@ class DibiResult extends DibiObject implements IDataSource
 
 		$this->seek(0);
 		$row = $this->fetch();
-		if (!$row) return array();  // empty result set
+		if (!$row) {
+			return array();  // empty result set
+		}
 
 		$data = NULL;
 		$assoc = preg_split('#(\[\]|->|=|\|)#', $assoc, NULL, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
@@ -362,7 +345,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * @deprecated
 	 */
@@ -370,7 +352,9 @@ class DibiResult extends DibiObject implements IDataSource
 	{
 		$this->seek(0);
 		$row = $this->fetch();
-		if (!$row) return array();  // empty result set
+		if (!$row) {
+			return array();  // empty result set
+		}
 
 		$data = NULL;
 		$assoc = explode(',', $assoc);
@@ -435,7 +419,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Fetches all records from table like $key => $value pairs.
 	 * @param  string  associative key
@@ -447,7 +430,9 @@ class DibiResult extends DibiObject implements IDataSource
 	{
 		$this->seek(0);
 		$row = $this->fetch();
-		if (!$row) return array();  // empty result set
+		if (!$row) {
+			return array();  // empty result set
+		}
 
 		$data = array();
 
@@ -486,18 +471,16 @@ class DibiResult extends DibiObject implements IDataSource
 		}
 
 		do {
-			$data[ $row[$key] ] = $row[$value];
+			$data[ (string) $row[$key] ] = $row[$value];
 		} while ($row = $this->fetch());
 
 		return $data;
 	}
 
 
-
 	/********************* column types ****************d*g**/
 
 
-
 	/**
 	 * Autodetect column types.
 	 * @return void
@@ -513,7 +496,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Converts values to specified type and format.
 	 * @param  array
@@ -532,13 +514,13 @@ class DibiResult extends DibiObject implements IDataSource
 				$row[$key] = is_float($tmp = $value * 1) ? $value : $tmp;
 
 			} elseif ($type === dibi::FLOAT) {
-				$row[$key] = (string) ($tmp = (float) $value) === rtrim(rtrim($value, '0'), '.') ? $tmp : $value;
+				$row[$key] = ltrim((string) ($tmp = (float) $value), '0') === ltrim(rtrim(rtrim($value, '0'), '.'), '0') ? $tmp : $value;
 
 			} elseif ($type === dibi::BOOL) {
 				$row[$key] = ((bool) $value) && $value !== 'f' && $value !== 'F';
 
 			} elseif ($type === dibi::DATE || $type === dibi::DATETIME) {
-				if ((int) $value === 0) { // '', NULL, FALSE, '0000-00-00', ...
+				if ((int) $value === 0 && substr((string) $value, 0, 3) !== '00:') { // '', NULL, FALSE, '0000-00-00', ...
 
 				} elseif (empty($this->formats[$type])) { // return DateTime object (default)
 					$row[$key] = new DibiDateTime(is_numeric($value) ? date('Y-m-d H:i:s', $value) : $value);
@@ -561,12 +543,11 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Define column type.
 	 * @param  string  column
 	 * @param  string  type (use constant Dibi::*)
-	 * @return DibiResult  provides a fluent interface
+	 * @return self
 	 */
 	final public function setType($col, $type)
 	{
@@ -575,7 +556,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Returns column type.
 	 * @return string
@@ -586,12 +566,11 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Sets data format.
 	 * @param  string  type (use constant Dibi::*)
 	 * @param  string  format
-	 * @return DibiResult  provides a fluent interface
+	 * @return self
 	 */
 	final public function setFormat($type, $format)
 	{
@@ -600,7 +579,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * Returns data format.
 	 * @return string
@@ -611,11 +589,9 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/********************* meta info ****************d*g**/
 
 
-
 	/**
 	 * Returns a meta information about the current result set.
 	 * @return DibiResultInfo
@@ -629,7 +605,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/**
 	 * @deprecated
 	 */
@@ -639,7 +614,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/** @deprecated */
 	public function getColumnNames($fullNames = FALSE)
 	{
@@ -648,11 +622,9 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-
 	/********************* misc tools ****************d*g**/
 
 
-
 	/**
 	 * Displays complete result set as HTML or text table for debug purposes.
 	 * @return void
@@ -668,7 +640,7 @@ class DibiResult extends DibiObject implements IDataSource
 				if ($i === 0) {
 					foreach ($row as $col => $foo) {
 						$len = mb_strlen($col);
-						if ($len > $maxLen) $maxLen = $len;
+						$maxLen = max($len, $maxLen);
 					}
 				}
 
@@ -687,7 +659,9 @@ class DibiResult extends DibiObject implements IDataSource
 				$i++;
 			}
 
-			if ($i === 0) echo "empty result set\n";
+			if ($i === 0) {
+				echo "empty result set\n";
+			}
 			echo "\n";
 
 		} else {

dibi/libs/DibiResultIterator.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * External result set iterator.
  *
@@ -47,7 +42,6 @@ class DibiResultIterator implements Iterator, Countable
 	}
 
 
-
 	/**
 	 * Rewinds the iterator to the first element.
 	 * @return void
@@ -60,7 +54,6 @@ class DibiResultIterator implements Iterator, Countable
 	}
 
 
-
 	/**
 	 * Returns the key of the current element.
 	 * @return mixed
@@ -71,7 +64,6 @@ class DibiResultIterator implements Iterator, Countable
 	}
 
 
-
 	/**
 	 * Returns the current element.
 	 * @return mixed
@@ -82,7 +74,6 @@ class DibiResultIterator implements Iterator, Countable
 	}
 
 
-
 	/**
 	 * Moves forward to next element.
 	 * @return void
@@ -94,7 +85,6 @@ class DibiResultIterator implements Iterator, Countable
 	}
 
 
-
 	/**
 	 * Checks if there is a current element after calls to rewind() or next().
 	 * @return bool
@@ -105,7 +95,6 @@ class DibiResultIterator implements Iterator, Countable
 	}
 
 
-
 	/**
 	 * Required by the Countable interface.
 	 * @return int

dibi/libs/DibiRow.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * Result set single row.
  *
@@ -22,9 +17,10 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
 
 	public function __construct($arr)
 	{
-		foreach ($arr as $k => $v) $this->$k = $v;
+		foreach ($arr as $k => $v) {
+			$this->$k = $v;
+		}
 	}
-
 
 
 	public function toArray()
@@ -33,7 +29,6 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
 	}
 
 
-
 	/**
 	 * Converts value to DateTime object.
 	 * @param  string key
@@ -44,7 +39,7 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
 	{
 		$time = $this[$key];
 		if (!$time instanceof DibiDateTime) {
-			if ((int) $time === 0) { // '', NULL, FALSE, '0000-00-00', ...
+			if ((int) $time === 0 && substr((string) $time, 0, 3) !== '00:') { // '', NULL, FALSE, '0000-00-00', ...
 				return NULL;
 			}
 			$time = new DibiDateTime(is_numeric($time) ? date('Y-m-d H:i:s', $time) : $time);
@@ -53,7 +48,6 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
 	}
 
 
-
 	/**
 	 * Converts value to UNIX timestamp.
 	 * @param  string key
@@ -62,14 +56,10 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
 	public function asTimestamp($key)
 	{
 		trigger_error(__METHOD__ . '() is deprecated.', E_USER_WARNING);
-		$time = $this[$key];
-		return (int) $time === 0 // '', NULL, FALSE, '0000-00-00', ...
-			? NULL
-			: (is_numeric($time) ? (int) $time : strtotime($time));
+		return $this->asDateTime($key, 'U');
 	}
 
 
-
 	/**
 	 * Converts value to boolean.
 	 * @param  string key
@@ -82,7 +72,6 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
 	}
 
 
-
 	/** @deprecated */
 	public function asDate($key, $format = NULL)
 	{
@@ -95,46 +84,39 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
 	}
 
 
-
 	/********************* interfaces ArrayAccess, Countable & IteratorAggregate ****************d*g**/
 
 
-
 	final public function count()
 	{
 		return count((array) $this);
 	}
 
 
-
 	final public function getIterator()
 	{
 		return new ArrayIterator($this);
 	}
 
 
-
 	final public function offsetSet($nm, $val)
 	{
 		$this->$nm = $val;
 	}
 
 
-
 	final public function offsetGet($nm)
 	{
 		return $this->$nm;
 	}
 
 
-
 	final public function offsetExists($nm)
 	{
 		return isset($this->$nm);
 	}
 
 
-
 	final public function offsetUnset($nm)
 	{
 		unset($this->$nm);

dibi/libs/DibiTranslator.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * dibi SQL translator.
  *
@@ -53,14 +48,12 @@ final class DibiTranslator extends DibiObject
 	private $identifiers;
 
 
-
 	public function __construct(DibiConnection $connection)
 	{
 		$this->connection = $connection;
 	}
 
 
-
 	/**
 	 * Generates SQL.
 	 * @param  array
@@ -94,8 +87,7 @@ final class DibiTranslator extends DibiObject
 
 		// iterate
 		$sql = array();
-		while ($cursor < count($this->args))
-		{
+		while ($cursor < count($this->args)) {
 			$arg = $this->args[$cursor];
 			$cursor++;
 
@@ -126,7 +118,9 @@ final class DibiTranslator extends DibiObject
 							array($this, 'cb'),
 							substr($arg, $toSkip)
 					);
-					if (preg_last_error()) throw new DibiPcreException;
+					if (preg_last_error()) {
+						throw new DibiPcreException;
+					}
 				}
 				continue;
 			}
@@ -148,7 +142,9 @@ final class DibiTranslator extends DibiObject
 						$commandIns = $commandIns === 'INSERT' || $commandIns === 'REPLAC';
 						$sql[] = $this->formatValue($arg, $commandIns ? 'v' : 'a');
 					} else {
-						if ($lastArr === $cursor - 1) $sql[] = ',';
+						if ($lastArr === $cursor - 1) {
+							$sql[] = ',';
+						}
 						$sql[] = $this->formatValue($arg, $commandIns ? 'l' : 'a');
 					}
 					$lastArr = $cursor;
@@ -161,7 +157,9 @@ final class DibiTranslator extends DibiObject
 		} // while
 
 
-		if ($comment) $sql[] = "*/";
+		if ($comment) {
+			$sql[] = "*/";
+		}
 
 		$sql = implode(' ', $sql);
 
@@ -178,7 +176,6 @@ final class DibiTranslator extends DibiObject
 	}
 
 
-
 	/**
 	 * Apply modifier to single value.
 	 * @param  mixed
@@ -347,7 +344,9 @@ final class DibiTranslator extends DibiObject
 
 				case 'iN': // signed int or NULL
 				case 'in': // deprecated
-				if ($value == '') $value = NULL;
+					if ($value == '') {
+						$value = NULL;
+					}
 					// intentionally break omitted
 
 				case 'i':  // signed int
@@ -397,7 +396,9 @@ final class DibiTranslator extends DibiObject
 							array($this, 'cb'),
 							substr($value, $toSkip)
 						);
-					if (preg_last_error()) throw new DibiPcreException;
+						if (preg_last_error()) {
+							throw new DibiPcreException;
+						}
 					}
 					return $value;
 
@@ -457,7 +458,6 @@ final class DibiTranslator extends DibiObject
 	}
 
 
-
 	/**
 	 * PREG callback from translate() or formatValue().
 	 * @param  array
@@ -536,12 +536,16 @@ final class DibiTranslator extends DibiObject
 				return '';
 
 			} elseif ($mod === 'lmt') { // apply limit
-				if ($this->args[$cursor] !== NULL) $this->limit = (int) $this->args[$cursor];
+				if ($this->args[$cursor] !== NULL) {
+					$this->limit = (int) $this->args[$cursor];
+				}
 				$cursor++;
 				return '';
 
 			} elseif ($mod === 'ofs') { // apply offset
-				if ($this->args[$cursor] !== NULL) $this->offset = (int) $this->args[$cursor];
+				if ($this->args[$cursor] !== NULL) {
+					$this->offset = (int) $this->args[$cursor];
+				}
 				$cursor++;
 				return '';
 
@@ -551,21 +555,23 @@ final class DibiTranslator extends DibiObject
 			}
 		}
 
-		if ($this->comment) return '...';
+		if ($this->comment) {
+			return '...';
+		}
 
-		if ($matches[1])  // SQL identifiers: `ident`
+		if ($matches[1]) { // SQL identifiers: `ident`
 			return $this->identifiers->{$matches[1]};
 
-		if ($matches[2])  // SQL identifiers: [ident]
+		} elseif ($matches[2]) { // SQL identifiers: [ident]
 			return $this->identifiers->{$matches[2]};
 
-		if ($matches[3])  // SQL strings: '...'
+		} elseif ($matches[3]) { // SQL strings: '...'
 			return $this->driver->escape( str_replace("''", "'", $matches[4]), dibi::TEXT);
 
-		if ($matches[5])  // SQL strings: "..."
+		} elseif ($matches[5]) { // SQL strings: "..."
 			return $this->driver->escape( str_replace('""', '"', $matches[6]), dibi::TEXT);
 
-		if ($matches[7]) { // string quote
+		} elseif ($matches[7]) { // string quote
 			$this->hasError = TRUE;
 			return '**Alone quote**';
 		}
@@ -580,7 +586,6 @@ final class DibiTranslator extends DibiObject
 	}
 
 
-
 	/**
 	 * Apply substitutions to indentifier and delimites it.
 	 * @param  string indentifier
@@ -592,7 +597,9 @@ final class DibiTranslator extends DibiObject
 		$value = $this->connection->substitute($value);
 		$parts = explode('.', $value);
 		foreach ($parts as & $v) {
-			if ($v !== '*') $v = $this->driver->escape($v, dibi::IDENTIFIER);
+			if ($v !== '*') {
+				$v = $this->driver->escape($v, dibi::IDENTIFIER);
+			}
 		}
 		return implode('.', $parts);
 	}

dibi/libs/interfaces.php

@@ -2,15 +2,10 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
-
 /**
  * Provides an interface between a dataset and data-aware components.
  * @package    dibi
@@ -22,7 +17,6 @@ interface IDataSource extends Countable, IteratorAggregate
 }
 
 
-
 /**
  * dibi driver interface.
  * @package    dibi
@@ -120,9 +114,6 @@ interface IDibiDriver
 
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string &$sql  The SQL query that will be modified.
-	 * @param  int $limit
-	 * @param  int $offset
 	 * @return void
 	 */
 	function applyLimit(& $sql, $limit, $offset);
@@ -130,9 +121,6 @@ interface IDibiDriver
 }
 
 
-
-
-
 /**
  * dibi result set driver interface.
  * @package    dibi
@@ -193,9 +181,6 @@ interface IDibiResultDriver
 }
 
 
-
-
-
 /**
  * dibi driver reflection.
  *

examples/Nette/Debugger.php

@@ -23,7 +23,6 @@ render(){$obLevel=ob_get_level();$panels=array();foreach($this->panels
 as$id=>$panel){try{$panels[]=array('id'=>preg_replace('#[^a-z0-9]+#i','-',$id),'tab'=>$tab=(string)$panel->getTab(),'panel'=>$tab?(string)$panel->getPanel():NULL);}catch(Exception$e){$panels[]=array('id'=>"error-$id",'tab'=>"Error: $id",'panel'=>nl2br(htmlSpecialChars((string)$e)));while(ob_get_level()>$obLevel){ob_end_clean();}}}?>
 
 
-
 <!-- Nette Debug Bar -->
 
 <?php ob_start()?>
@@ -130,7 +129,6 @@ htmlspecialchars('; caused by '.get_class($ex).' '.$ex->getMessage().($ex->getCo
 </head>
 
 
-
 <body>
 <div id="netteBluescreen">
 	<a id="netteBluescreenIcon" href="#" rel="next"><abbr>&#x25bc;</abbr></a
@@ -146,7 +144,6 @@ urlencode($title.' '.preg_replace('#\'.*\'|".*"#Us','',$exception->getMessage())
 		</div>
 
 
-
 		<?php $ex=$exception;$level=0;?>
 		<?php do{?>
 
@@ -165,7 +162,6 @@ htmlspecialchars($ex->getMessage())?></b></p>
 			<?php endif?>
 
 
-
 			<?php foreach($panels
 as$panel):?>
 			<?php $panel=call_user_func($panel,$ex);if(empty($panel['tab'])||empty($panel['panel']))continue;?>
@@ -180,7 +176,6 @@ htmlSpecialChars($panel['tab'])?> <abbr>&#x25bc;</abbr></a></h2>
 			<?php endforeach?>
 
 
-
 			<?php $stack=$ex->getTrace();$expanded=NULL?>
 			<?php if(strpos($ex->getFile(),$expandPath)===0){foreach($stack
 as$key=>$row){if(isset($row['file'])&&strpos($row['file'],$expandPath)!==0){$expanded=$key;break;}}}?>
@@ -196,7 +191,6 @@ self::highlightFile($ex->getFile(),$ex->getLine(),15,isset($ex->context)?$ex->co
 			</div></div>
 
 
-
 			<?php if(isset($stack[0]['class'])&&$stack[0]['class']==='NDebugger'&&($stack[0]['function']==='_shutdownHandler'||$stack[0]['function']==='_errorHandler'))unset($stack[0])?>
 			<?php if($stack):?>
 			<div class="panel">
@@ -251,7 +245,6 @@ self::highlightFile($row['file'],$row['line'])?></div>
 			<?php endif?>
 
 
-
 			<?php if(isset($ex->context)&&is_array($ex->context)):?>
 			<div class="panel">
 			<h2><a href="#" rel="netteBsPnl<?php echo++$counter?>">Variables <abbr>&#x25ba;</abbr></a></h2>
@@ -272,7 +265,6 @@ as$k=>$v){echo'<tr><th>$',htmlspecialchars($k),'</th><td>',NDebugHelpers::clicka
 		<?php while(--$level)echo'</div></div>'?>
 
 
-
 		<?php $bottomPanels=array()?>
 		<?php foreach($panels
 as$panel):?>
@@ -288,7 +280,6 @@ htmlSpecialChars($panel['tab'])?> <abbr>&#x25ba;</abbr></a></h2>
 		<?php endforeach?>
 
 
-
 		<div class="panel">
 		<h2><a href="#" rel="netteBsPnl<?php echo++$counter?>">Environment <abbr>&#x25ba;</abbr></a></h2>
 
@@ -336,7 +327,6 @@ as$k=>$v)echo'<tr><th>',htmlspecialchars($k),'</th><td>',NDebugHelpers::clickabl
 		</div></div>
 
 
-
 		<div class="panel">
 		<h2><a href="#" rel="netteBsPnl<?php echo++$counter?>">HTTP request <abbr>&#x25ba;</abbr></a></h2>
 
@@ -371,7 +361,6 @@ foreach($GLOBALS[$name]as$k=>$v)echo'<tr><th>',htmlspecialchars($k),'</th><td>',
 		</div></div>
 
 
-
 		<div class="panel">
 		<h2><a href="#" rel="netteBsPnl<?php echo++$counter?>">HTTP response <abbr>&#x25ba;</abbr></a></h2>
 
@@ -388,7 +377,6 @@ htmlspecialchars($s),'<br>';?></pre>
 		</div></div>
 
 
-
 		<?php foreach($bottomPanels
 as$panel):?>
 		<div class="panel">
@@ -401,7 +389,6 @@ htmlSpecialChars($panel['tab'])?> <abbr>&#x25bc;</abbr></a></h2>
 		<?php endforeach?>
 
 
-
 		<ul>
 			<li>Report generated at <?php echo@date('Y/m/d H:i:s',NDebugger::$time)?></li>
 			<?php if(preg_match('#^https?://#',NDebugger::$source)):?>

examples/Nette/license.txt

@@ -18,7 +18,6 @@ project or top-level domain, and choose a name that stands on its own merits.
 If your stuff is good, it will not take long to establish a reputation for yourselves.
 
 
-
 New BSD License
 ---------------
 
@@ -51,7 +50,6 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-
 GNU General Public License
 --------------------------
 

examples/connecting-to-databases.php

@@ -12,8 +12,8 @@ require dirname(__FILE__) . '/../dibi/dibi.php';
 echo '<p>Connecting to Sqlite: ';
 try {
 	dibi::connect(array(
-		'driver'   => 'sqlite',
-		'database' => 'data/sample.sdb',
+		'driver'   => 'sqlite3',
+		'database' => 'data/sample.s3db',
 	));
 	echo 'OK';
 
@@ -23,14 +23,12 @@ try {
 echo "</p>\n";
 
 
-
-
 // connects to SQlite using DibiConnection object
 echo '<p>Connecting to Sqlite: ';
 try {
 	$connection = new DibiConnection(array(
-		'driver'   => 'sqlite',
-		'database' => 'data/sample.sdb',
+		'driver'   => 'sqlite3',
+		'database' => 'data/sample.s3db',
 	));
 	echo 'OK';
 
@@ -40,8 +38,6 @@ try {
 echo "</p>\n";
 
 
-
-
 // connects to MySQL using DSN
 echo '<p>Connecting to MySQL: ';
 try {
@@ -54,8 +50,6 @@ try {
 echo "</p>\n";
 
 
-
-
 // connects to MySQLi using array
 echo '<p>Connecting to MySQLi: ';
 try {
@@ -78,8 +72,6 @@ try {
 echo "</p>\n";
 
 
-
-
 // connects to ODBC
 echo '<p>Connecting to ODBC: ';
 try {
@@ -97,8 +89,6 @@ try {
 echo "</p>\n";
 
 
-
-
 // connects to PostgreSql
 echo '<p>Connecting to PostgreSql: ';
 try {
@@ -115,8 +105,6 @@ try {
 echo "</p>\n";
 
 
-
-
 // connects to PDO
 echo '<p>Connecting to Sqlite via PDO: ';
 try {
@@ -132,7 +120,6 @@ try {
 echo "</p>\n";
 
 
-
 // connects to MS SQL
 echo '<p>Connecting to MS SQL: ';
 try {
@@ -150,7 +137,6 @@ try {
 echo "</p>\n";
 
 
-
 // connects to MS SQL 2005
 echo '<p>Connecting to MS SQL 2005: ';
 try {
@@ -169,7 +155,6 @@ try {
 echo "</p>\n";
 
 
-
 // connects to Oracle
 echo '<p>Connecting to Oracle: ';
 try {

examples/database-reflection.php

@@ -9,12 +9,11 @@ require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 
-
 // retrieve database reflection
 $database = dibi::getDatabaseInfo();
 
@@ -26,7 +25,6 @@ foreach ($database->getTables() as $table) {
 echo "</ul>\n";
 
 
-
 // table reflection
 $table = $database->getTable('products');
 
@@ -40,7 +38,6 @@ foreach ($table->getColumns() as $column) {
 echo "</ul>\n";
 
 
-
 echo "Indexes";
 echo "<ul>\n";
 foreach ($table->getIndexes() as $index) {

examples/dumping-sql-and-result-set.php

@@ -9,12 +9,11 @@ require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 
-
 $res = dibi::query('
 	SELECT * FROM products
 	INNER JOIN orders USING (product_id)

examples/fetching-examples.php

@@ -10,8 +10,8 @@ require dirname(__FILE__) . '/../dibi/dibi.php';
 ndebug();
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 

examples/importing-dump-from-file.php

@@ -9,8 +9,8 @@ require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 

examples/nette-debug-and-exceptions.php

@@ -19,8 +19,8 @@ ndebug();
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 	'profiler' => array(
 		'run' => TRUE,
 	)
@@ -31,10 +31,9 @@ dibi::connect(array(
 dibi::query('SELECT * FROM customers WHERE customer_id < ?', 38);
 
 
-
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 	'profiler' => array(
 		'run' => TRUE,
 	)

examples/nette-debug-and-variables.php

@@ -21,8 +21,8 @@ NDebugger::enable();
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 	'profiler' => array(
 		'run' => TRUE,
 	)

examples/query-language-and-conditions.php

@@ -32,8 +32,6 @@ dibi::test('
 // -> SELECT * FROM customers WHERE name LIKE 'K%'
 
 
-
-
 // if & else & (optional) end
 dibi::test("
 	SELECT *
@@ -45,7 +43,6 @@ dibi::test("
 // -> SELECT * FROM people WHERE id > 0 AND bar=2
 
 
-
 // nested condition
 dibi::test('
 	SELECT *
@@ -58,7 +55,6 @@ dibi::test('
 // -> SELECT * FROM customers WHERE LIMIT 10
 
 
-
 // IF()
 dibi::test('UPDATE products SET', array(
 	'price' => array('IF(price_fixed, price, ?)', 123),

examples/query-language-basic-examples.php

@@ -29,7 +29,6 @@ dibi::test('
 // -> SELECT COUNT(*) as [count] FROM [comments] WHERE [ip] LIKE '192.168.%' AND [date] > 876693600
 
 
-
 // dibi detects INSERT or REPLACE command
 dibi::test('
 	REPLACE INTO products', array(
@@ -40,7 +39,6 @@ dibi::test('
 // -> REPLACE INTO products ([title], [price], [active]) VALUES ('Super product', 318, 1)
 
 
-
 // multiple INSERT command
 $array = array(
 	'title' => 'Super Product',
@@ -52,7 +50,6 @@ dibi::test("INSERT INTO products", $array, $array, $array);
 // -> INSERT INTO products ([title], [price], [brand], [created]) VALUES ('Super Product', ...) , (...) , (...)
 
 
-
 // dibi detects UPDATE command
 dibi::test("
 	UPDATE colors SET", array(
@@ -63,7 +60,6 @@ dibi::test("
 // -> UPDATE colors SET [color]='blue', [order]=12 WHERE id=123
 
 
-
 // modifier applied to array
 $array = array(1, 2, 3);
 dibi::test("
@@ -74,7 +70,6 @@ dibi::test("
 // -> SELECT * FROM people WHERE id IN ( 1, 2, 3 )
 
 
-
 // modifier %by for ORDER BY
 $order = array(
 	'field1' => 'asc',
@@ -88,7 +83,6 @@ dibi::test("
 // -> SELECT * FROM people ORDER BY [field1] ASC, [field2] DESC
 
 
-
 // indentifiers and strings syntax mix
 dibi::test('UPDATE [table] SET `item` = "5 1/4"" diskette"');
 // -> UPDATE [table] SET [item] = '5 1/4" diskette'

examples/result-set-data-types.php

@@ -12,8 +12,8 @@ date_default_timezone_set('Europe/Prague');
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 
@@ -33,7 +33,6 @@ dump( $res->fetch() );
 //    added => "2007-03-11 17:20:03" (19)
 
 
-
 // using auto-detection (works well with MySQL or other strictly typed databases)
 $res = dibi::query('SELECT * FROM [customers]');
 

examples/using-datetime.php

@@ -10,17 +10,15 @@ require dirname(__FILE__) . '/../dibi/dibi.php';
 date_default_timezone_set('Europe/Prague');
 
 
-
 // CHANGE TO REAL PARAMETERS!
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 	'formatDate' => "'Y-m-d'",
 	'formatDateTime' => "'Y-m-d H-i-s'",
 ));
 
 
-
 // generate and dump SQL
 dibi::test("
 	INSERT INTO [mytable]", array(

examples/using-extension-methods.php

@@ -10,12 +10,11 @@ require dirname(__FILE__) . '/../dibi/dibi.php';
 ndebug();
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 
-
 // using the "prototype" to add custom method to class DibiResult
 function DibiResult_prototype_fetchShuffle(DibiResult $obj)
 {

examples/using-fluent-syntax.php

@@ -11,8 +11,8 @@ date_default_timezone_set('Europe/Prague');
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 
@@ -35,7 +35,6 @@ dibi::select('product_id')->as('id')
 //    USING (product_id) INNER JOIN customers USING (customer_id) ORDER BY [title]
 
 
-
 // SELECT ...
 echo dibi::select('title')->as('id')
 	->from('products')
@@ -43,7 +42,6 @@ echo dibi::select('title')->as('id')
 // -> Chair (as result of query: SELECT [title] AS [id] FROM [products])
 
 
-
 // INSERT ...
 dibi::insert('products', $record)
 	->setFlag('IGNORE')
@@ -51,7 +49,6 @@ dibi::insert('products', $record)
 // -> INSERT IGNORE INTO [products] ([title], [price], [active]) VALUES ('Super product', 318, 1)
 
 
-
 // UPDATE ...
 dibi::update('products', $record)
 	->where('product_id = ?', $id)
@@ -59,7 +56,6 @@ dibi::update('products', $record)
 // -> UPDATE [products] SET [title]='Super product', [price]=318, [active]=1 WHERE product_id = 10
 
 
-
 // DELETE ...
 dibi::delete('products')
 	->where('product_id = ?', $id)
@@ -67,7 +63,6 @@ dibi::delete('products')
 // -> DELETE FROM [products] WHERE product_id = 10
 
 
-
 // custom commands
 dibi::command()
 	->update('products')
@@ -77,7 +72,6 @@ dibi::command()
 // -> UPDATE [products] SET [title]='Super product', [price]=318, [active]=1 WHERE product_id = 10
 
 
-
 dibi::command()
 	->truncate('products')
 	->test();

examples/using-limit-and-offset.php

@@ -9,8 +9,8 @@ require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 
@@ -19,13 +19,11 @@ dibi::test('SELECT * FROM [products]');
 // -> SELECT * FROM [products]
 
 
-
 // with limit = 2
 dibi::test('SELECT * FROM [products] %lmt', 2);
 // -> SELECT * FROM [products] LIMIT 2
 
 
-
 // with limit = 2, offset = 1
 dibi::test('SELECT * FROM [products] %lmt %ofs', 2, 1);
 // -> SELECT * FROM [products] LIMIT 2 OFFSET 1

examples/using-logger.php

@@ -11,8 +11,8 @@ date_default_timezone_set('Europe/Prague');
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 	// enable query logging to this file
 	'profiler' => array(
 		'run' => TRUE,
@@ -21,7 +21,6 @@ dibi::connect(array(
 ));
 
 
-
 try {
 	$res = dibi::query('SELECT * FROM [customers] WHERE [customer_id] = ?', 1);
 

examples/using-profiler.php

@@ -1,4 +1,4 @@
-<?php ob_start(1) // needed by FirePHP ?>
+<?php ob_start() // needed by FirePHP ?>
 
 <!DOCTYPE html><link rel="stylesheet" href="data/style.css">
 
@@ -11,8 +11,8 @@ require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 	'profiler' => array(
 		'run' => TRUE,
 	)

examples/using-substitutions.php

@@ -9,13 +9,11 @@ require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 
-
-
 // create new substitution :blog:  ==>  wp_
 dibi::getSubstitutes()->blog = 'wp_';
 
@@ -23,9 +21,6 @@ dibi::test("SELECT * FROM [:blog:items]");
 // -> SELECT * FROM [wp_items]
 
 
-
-
-
 // create new substitution :: (empty)  ==>  my_
 dibi::getSubstitutes()->{''} = 'my_';
 
@@ -33,9 +28,6 @@ dibi::test("UPDATE ::table SET [text]='Hello World'");
 // -> UPDATE my_table SET [text]='Hello World'
 
 
-
-
-
 // create substitutions using fallback callback
 function substFallBack($expr)
 {

examples/using-transactions.php

@@ -9,8 +9,8 @@ require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 

license.md

@@ -13,11 +13,10 @@ use Dibi in commercial projects as long as the copyright header
 remains intact.
 
 
-
 New BSD License
 ---------------
 
-Copyright (c) 2004, 2013 David Grudl (http://davidgrudl.com)
+Copyright (c) 2004, 2014 David Grudl (http://davidgrudl.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -46,7 +45,6 @@ any theory of liability, whether in contract, strict liability, or tort
 software, even if advised of the possibility of such damage.
 
 
-
 GNU General Public License
 --------------------------
 

readme.md

@@ -2,17 +2,125 @@
 =========================================================
 
 Database access functions in PHP are not standardised. This library
-hides the differences between them, a above all, it gives you a very handy interface.
+hides the differences between them, and above all, it gives you a very handy interface.
 
-The best way how to install Dibi is to use a [Composer](http://getcomposer.org/download):
+The best way to install Dibi is to use a [Composer](http://getcomposer.org/download):
 
     php composer.phar require dibi/dibi
 
-Or you can download a latest package from http://dibiphp.com. In this
+Or you can download the latest package from http://dibiphp.com. In this
 package is also `Dibi.minified`, shrinked single-file version of whole Dibi,
-useful when you don't want to modify library, but just use it.
+useful when you don't want to modify the library, but just use it.
+
+Dibi requires PHP 5.2.0 or later. It has been tested with PHP 5.5 too.
+
+
+Examples
+--------
 
 Refer to the `examples` directory for examples. Dibi documentation is
 available on the [homepage](http://dibiphp.com).
 
-Dibi requires PHP 5.2.0 or later. It has been tested with PHP 5.5 too.
+Connect to database:
+
+```php
+// connect to database (static way)
+dibi::connect(array(
+    'driver'   => 'mysql',
+    'host'     => 'localhost',
+    'username' => 'root',
+    'password' => '***',
+));
+
+// or object way; in all other examples use $connection-> instead of dibi::
+$connection = new DibiConnection($options);
+```
+
+SELECT, INSERT, UPDATE
+
+```php
+dibi::query('SELECT * FROM users WHERE id = ?', $id);
+
+$arr = array(
+    'name' => 'John',
+    'is_admin'  => TRUE,
+);
+dibi::query('INSERT INTO users', $arr);
+// INSERT INTO users (`name`, `is_admin`) VALUES ('John', 1)
+
+dibi::query('UPDATE users SET', $arr, 'WHERE `id`=?', $x);
+// UPDATE users SET `name`='John', `is_admin`=1 WHERE `id` = 123
+
+dibi::query('UPDATE users SET', array(
+	'title' => array('SHA1(?)', 'tajneheslo'),
+));
+// UPDATE users SET 'title' = SHA1('tajneheslo')
+```
+
+Getting results
+
+```php
+$result = dibi::query('SELECT * FROM users');
+
+$value = $result->fetchSingle(); // single value
+$all = $result->fetchAll(); // all rows
+$assoc = $result->fetchAssoc('id'); // all rows as associative array
+$pairs = $result->fetchPairs('customerID', 'name'); // all rows as key => value pairs
+
+// iterating
+foreach ($result as $n => $row) {
+    print_r($row);
+}
+```
+
+Modifiers for arrays:
+
+```php
+dibi::query('SELECT * FROM users WHERE %and', array(
+	array('number > ?', 10),
+	array('number < ?', 100),
+));
+// SELECT * FROM users WHERE (number > 10) AND (number < 100)
+```
+
+<table>
+<tr><td> %and </td><td>  </td><td> `[key]=val AND [key2]="val2" AND ...` </td></tr>
+<tr><td> %or </td><td>  </td><td> `[key]=val OR [key2]="val2" OR ...` </td></tr>
+<tr><td> %a </td><td> assoc </td><td> `[key]=val, [key2]="val2", ...` </td></tr>
+<tr><td> %l %in </td><td> list </td><td> `(val, "val2", ...)` </td></tr>
+<tr><td> %v </td><td> values </td><td> `([key], [key2], ...) VALUES (val, "val2", ...)` </td></tr>
+<tr><td> %m </td><td> multivalues </td><td> `([key], [key2], ...) VALUES (val, "val2", ...), (val, "val2", ...), ...` </td></tr>
+<tr><td> %by </td><td> ordering </td><td> `[key] ASC, [key2] DESC ...` </td></tr>
+<tr><td> %n </td><td> identifiers </td><td> `[key], [key2] AS alias, ...` </td></tr>
+<tr><td> other  </td><td> - </td><td> `val, val2, ...` </td></tr>
+</table>
+
+
+Modifiers for LIKE
+
+```php
+dibi::query("SELECT * FROM table WHERE name LIKE %like~", $query);
+```
+
+<table>
+<tr><td> %like~	</td><td> begins with </td></tr>
+<tr><td> %~like	</td><td> ends with </td></tr>
+<tr><td> %~like~ </td><td> contains </td></tr>
+</table>
+
+DateTime:
+
+```php
+dibi::query('UPDATE users SET', array(
+    'time' => new DateTime,
+));
+// UPDATE users SET ('2008-01-01 01:08:10')
+```
+
+Testing:
+
+```php
+echo dibi::$sql; // last SQL query
+echo dibi::$elapsedTime;
+echo dibi::$numOfQueries;
+echo dibi::$totalTime;

tests/DibiFluent.cloning.phpt

@@ -7,7 +7,6 @@
  */
 
 
-
 require dirname(__FILE__) . '/bootstrap.php';
 
 
@@ -25,7 +24,6 @@ Assert::same( 'SELECT * FROM [table] WHERE x=1', (string) $fluent );
 Assert::same( 'SELECT * FROM [table] WHERE x=1 AND y=1 FOO', (string) $dolly );
 
 
-
 $fluent = dibi::select('id')->from('table')->where('id = %i',1);
 $dolly = clone $fluent;
 $dolly->where('cd = %i',5);
@@ -34,7 +32,6 @@ Assert::same( 'SELECT [id] FROM [table] WHERE id = 1', (string) $fluent );
 Assert::same( 'SELECT [id] FROM [table] WHERE id = 1 AND cd = 5', (string) $dolly );
 
 
-
 $fluent = dibi::select("*")->from("table");
 $dolly = clone $fluent;
 $dolly->removeClause("select")->select("count(*)");

tests/bootstrap.php

@@ -1,18 +1,20 @@
 <?php
 
-/**
- * Test initialization and helpers.
- *
- * @author     David Grudl
- * @package    Nette\Test
- */
+// The Nette Tester command-line runner can be
+// invoked through the command: ../../vendor/bin/tester .
 
-require dirname(__FILE__) . '/../vendor/nette/tester/Tester/bootstrap.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	echo 'Install Nette Tester using `composer update --dev`';
+	exit(1);
+}
 
+
+// configure environment
+Tester\Environment::setup();
 date_default_timezone_set('Europe/Prague');
 class_alias('Tester\Assert', 'Assert');
 
+
 // load connections
 define('DIR', dirname(__FILE__));
 $config = parse_ini_file(dirname(__FILE__) . '/config.ini', TRUE);

version.txt

@@ -1 +1 @@
-Dibi 2.1.0 (revision $WCREV$ released on $WCDATE$)
+Dibi 2.1.2 (revision $WCREV$ released on $WCDATE$)