Released version 2.3.0

Fix DibiPostgreDriver::escapeLike()

.travis.yml

@@ -10,12 +10,21 @@ matrix:
     allow_failures:
         - php: hhvm
 
-script: vendor/bin/tester tests -s -c tests/php-unix.ini
+script:
+    - vendor/bin/tester tests -s -p php -c tests/php-unix.ini
+    - php code-checker/src/code-checker.php
 
 after_failure:
     # Print *.actual content
     - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done
 
 before_script:
-    # Install Nette Tester
+    # Install Nette Tester & Code Checker
     - composer install --no-interaction --dev --prefer-source
+    - composer create-project nette/code-checker code-checker ~2.3 --no-interaction --prefer-source
+
+    # Create databases.ini
+    - cp ./tests/databases.sample.ini ./tests/databases.ini
+
+    # Create Postgre database
+    - psql -c 'CREATE DATABASE dibi_test' -U postgres

composer.json

@@ -15,7 +15,7 @@
 	},
 	"require-dev": {
 		"tracy/tracy": "~2.2",
-		"nette/tester": "~1.1"
+		"nette/tester": "~1.3"
 	},
 	"replace": {
 		"dg/dibi": "self.version"
@@ -25,7 +25,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.2-dev"
+			"dev-master": "2.3-dev"
 		}
 	}
 }

dibi/bridges/Nette-2.0/DibiNette20Extension.php

@@ -1,55 +0,0 @@
-<?php
-
-/**
- * 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.0. Creates 'connection' service.
- *
- * @author     David Grudl
- * @package    dibi\nette
- * @phpversion 5.3
- */
-class DibiNette20Extension extends Nette\Config\CompilerExtension
-{
-
-	public function loadConfiguration()
-	{
-		$container = $this->getContainerBuilder();
-		$config = $this->getConfig();
-
-		$useProfiler = isset($config['profiler'])
-			? $config['profiler']
-			: !$container->parameters['productionMode'];
-
-		unset($config['profiler']);
-
-		if (isset($config['flags'])) {
-			$flags = 0;
-			foreach ((array) $config['flags'] as $flag) {
-				$flags |= constant($flag);
-			}
-			$config['flags'] = $flags;
-		}
-
-		$connection = $container->addDefinition($this->prefix('connection'))
-			->setClass('DibiConnection', array($config));
-
-		if ($useProfiler) {
-			$panel = $container->addDefinition($this->prefix('panel'))
-				->setClass('DibiNettePanel')
-				->addSetup('Nette\Diagnostics\Debugger::$bar->addPanel(?)', array('@self'))
-				->addSetup('Nette\Diagnostics\Debugger::$blueScreen->addPanel(?)', array('DibiNettePanel::renderException'));
-
-			$connection->addSetup('$service->onEvent[] = ?', array(array($panel, 'logEvent')));
-		}
-	}
-
-}

dibi/bridges/Nette-2.0/config.sample.neon

@@ -1,17 +0,0 @@
-#    Requires Nette Framework 2.0 for PHP 5.3
-#
-#    In bootstrap.php append these lines after line $configurator = new Nette\Config\Configurator;
-#
-#        $configurator->onCompile[] = function($configurator, $compiler) {
-#            $compiler->addExtension('dibi', new DibiNette20Extension);
-#        };
-#
-#    This will create service named 'dibi.connection'.
-
-common:
-	dibi:
-		host: localhost
-		username: root
-		password: ***
-		database: foo
-		lazy: TRUE

dibi/bridges/Nette-2.1/DibiNettePanel.php

@@ -5,10 +5,7 @@
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
  */
 
-
-if (interface_exists('Nette\Diagnostics\IBarPanel')) {
-	class_alias('Nette\Diagnostics\IBarPanel', 'IBarPanel');
-}
+use Nette\Diagnostics\Debugger;
 
 
 /**
@@ -17,7 +14,7 @@ if (interface_exists('Nette\Diagnostics\IBarPanel')) {
  * @author     David Grudl
  * @package    dibi\nette
  */
-class DibiNettePanel extends DibiObject implements IBarPanel
+class DibiNettePanel extends DibiObject implements Nette\Diagnostics\IBarPanel
 {
 	/** @var int maximum SQL length */
 	static public $maxLength = 1000;
@@ -41,24 +38,9 @@ class DibiNettePanel extends DibiObject implements IBarPanel
 
 	public function register(DibiConnection $connection)
 	{
-		if (is_callable('Nette\Diagnostics\Debugger::enable') && !class_exists('NDebugger')) {
-			class_alias('Nette\Diagnostics\Debugger', 'NDebugger'); // PHP 5.2 code compatibility
-		}
-		if (is_callable('NDebugger::enable') && is_callable('NDebugger::getBlueScreen')) { // Nette Framework 2.1
-			NDebugger::getBar()->addPanel($this);
-			NDebugger::getBlueScreen()->addPanel(array(__CLASS__, 'renderException'));
-			$connection->onEvent[] = array($this, 'logEvent');
-
-		} elseif (is_callable('NDebugger::enable')) { // Nette Framework 2.0 (for PHP 5.3 or PHP 5.2 prefixed)
-			NDebugger::$bar && NDebugger::$bar->addPanel($this);
-			NDebugger::$blueScreen && NDebugger::$blueScreen->addPanel(array(__CLASS__, 'renderException'), __CLASS__);
-			$connection->onEvent[] = array($this, 'logEvent');
-
-		} elseif (is_callable('Debugger::enable') && !is_callable('Debugger::getBlueScreen')) { // Nette Framework 2.0 for PHP 5.2 non-prefixed
-			Debugger::$bar && Debugger::$bar->addPanel($this);
-			Debugger::$blueScreen && Debugger::$blueScreen->addPanel(array(__CLASS__, 'renderException'), __CLASS__);
-			$connection->onEvent[] = array($this, 'logEvent');
-		}
+		Debugger::getBar()->addPanel($this);
+		Debugger::getBlueScreen()->addPanel(array(__CLASS__, 'renderException'));
+		$connection->onEvent[] = array($this, 'logEvent');
 	}
 
 

dibi/dibi.php

@@ -33,7 +33,3 @@ require_once dirname(__FILE__) . '/libs/DibiDatabaseInfo.php';
 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-2.1/DibiNettePanel.php';
-}

dibi/drivers/DibiFirebirdDriver.php

@@ -402,7 +402,7 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 
 	/**
 	 * Returns the result set resource.
-	 * @return mysqli_result
+	 * @return resource
 	 */
 	public function getResultResource()
 	{

dibi/drivers/DibiMySqliDriver.php

@@ -79,7 +79,7 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 				'timezone' => date('P'),
 				'username' => ini_get('mysqli.default_user'),
 				'password' => ini_get('mysqli.default_pw'),
-				'socket' => ini_get('mysqli.default_socket'),
+				'socket' => (string) ini_get('mysqli.default_socket'),
 				'port' => NULL,
 			);
 			if (!isset($config['host'])) {
@@ -420,9 +420,10 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	public function getResultColumns()
 	{
 		static $types;
-		if (empty($types)) {
+		if ($types === NULL) {
 			$consts = get_defined_constants(TRUE);
-			foreach ($consts['mysqli'] as $key => $value) {
+			$types = array();
+			foreach (isset($consts['mysqli']) ? $consts['mysqli'] : array() as $key => $value) {
 				if (strncmp($key, 'MYSQLI_TYPE_', 12) === 0) {
 					$types[$value] = substr($key, 12);
 				}
@@ -438,7 +439,7 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 				'name' => $row['name'],
 				'table' => $row['orgtable'],
 				'fullname' => $row['table'] ? $row['table'] . '.' . $row['name'] : $row['name'],
-				'nativetype' => $types[$row['type']],
+				'nativetype' => isset($types[$row['type']]) ? $types[$row['type']] : $row['type'],
 				'vendor' => $row,
 			);
 		}
@@ -453,7 +454,7 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	public function getResultResource()
 	{
 		$this->autoFree = FALSE;
-		return $this->resultSet === NULL || $this->resultSet->type === NULL ? NULL : $this->resultSet;
+		return $this->resultSet;
 	}
 
 }

dibi/drivers/DibiOdbcDriver.php

@@ -290,7 +290,7 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 	{
 		// offset support is missing
 		if ($limit >= 0) {
-			$sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ')';
+			$sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ') t';
 		}
 
 		if ($offset) {

dibi/drivers/DibiOracleDriver.php

@@ -14,6 +14,7 @@
  *   - username (or user)
  *   - password (or pass)
  *   - charset => character encoding to set
+ *   - schema => alters session schema
  *   - formatDate => how to format date in SQL (@see date)
  *   - formatDateTime => how to format datetime in SQL (@see date)
  *   - resource (resource) => existing connection resource
@@ -75,6 +76,10 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 			$err = oci_error();
 			throw new DibiDriverException($err['message'], $err['code']);
 		}
+
+		if (isset($config['schema'])) {
+			$this->query('ALTER SESSION SET CURRENT_SCHEMA=' . $config['schema']);
+		}
 	}
 
 

dibi/drivers/DibiPdoDriver.php

@@ -68,13 +68,12 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 			$this->connection = new PDO($config['dsn'], $config['username'], $config['password'], $config['options']);
 
 		} catch (PDOException $e) {
+			if ($e->getMessage() === 'could not find driver') {
+				throw new DibiNotSupportedException("PHP extension for PDO is not loaded.");
+			}
 			throw new DibiDriverException($e->getMessage(), $e->getCode());
 		}
 
-		if (!$this->connection) {
-			throw new DibiDriverException('Connecting error.');
-		}
-
 		$this->driverName = $this->connection->getAttribute(PDO::ATTR_DRIVER_NAME);
 	}
 
@@ -245,16 +244,19 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	{
 		switch ($type) {
 			case dibi::TEXT:
-				return $this->connection->quote($value, PDO::PARAM_STR);
-
 			case dibi::BINARY:
-				return $this->connection->quote($value, PDO::PARAM_LOB);
+				if ($this->driverName === 'odbc') {
+					return "'" . str_replace("'", "''", $value) . "'";
+				} else {
+					return $this->connection->quote($value, $type === dibi::TEXT ? PDO::PARAM_STR : PDO::PARAM_LOB);
+				}
 
 			case dibi::IDENTIFIER:
 				switch ($this->driverName) {
 					case 'mysql':
 						return '`' . str_replace('`', '``', $value) . '`';
 
+					case 'oci':
 					case 'pgsql':
 						return '"' . str_replace('"', '""', $value) . '"';
 
@@ -263,7 +265,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 						return '[' . strtr($value, '[]', '  ') . ']';
 
 					case 'odbc':
-					case 'oci': // TODO: not tested
 					case 'mssql':
 						return '[' . str_replace(array('[', ']'), array('[[', ']]'), $value) . ']';
 
@@ -275,14 +276,22 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 				}
 
 			case dibi::BOOL:
-				return $this->connection->quote($value, PDO::PARAM_BOOL);
+				if ($this->driverName === 'pgsql') {
+					return $value ? 'TRUE' : 'FALSE';
+				} else {
+					return $value ? 1 : 0;
+				}
 
 			case dibi::DATE:
 			case dibi::DATETIME:
 				if (!$value instanceof DateTime && !$value instanceof DateTimeInterface) {
 					$value = new DibiDateTime($value);
 				}
-				return $value->format($type === dibi::DATETIME ? "'Y-m-d H:i:s'" : "'Y-m-d'");
+				if ($this->driverName === 'odbc') {
+					return $value->format($type === dibi::DATETIME ? "#m/d/Y H:i:s#" : "#m/d/Y#");
+				} else {
+					return $value->format($type === dibi::DATETIME ? "'Y-m-d H:i:s'" : "'Y-m-d'");
+				}
 
 			default:
 				throw new InvalidArgumentException('Unsupported type.');
@@ -298,7 +307,36 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 	 */
 	public function escapeLike($value, $pos)
 	{
-		throw new DibiNotImplementedException;
+		switch ($this->driverName) {
+			case 'mysql':
+				$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\n\r\\'%_");
+				return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+
+			case 'oci':
+				$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\\%_");
+				$value = str_replace("'", "''", $value);
+				return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+
+			case 'pgsql':
+				$bs = substr($this->connection->quote('\\', PDO::PARAM_STR), 1, -1); // standard_conforming_strings = on/off
+				$value = substr($this->connection->quote($value, PDO::PARAM_STR), 1, -1);
+				$value = strtr($value, array('%' => $bs . '%', '_' => $bs . '_', '\\' => '\\\\'));
+				return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+
+			case 'sqlite':
+			case 'sqlite2':
+				$value = addcslashes(substr($this->connection->quote($value, PDO::PARAM_STR), 1, -1), '%_\\');
+				return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'") . " ESCAPE '\\'";
+
+			case 'odbc':
+			case 'mssql':
+			case 'sqlsrv':
+				$value = strtr($value, array("'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]'));
+				return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+
+			default:
+				throw new DibiNotImplementedException;
+		}
 	}
 
 
@@ -359,6 +397,7 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 				break;
 
 			case 'odbc':
+			case 'dblib':
 			case 'mssql':
 			case 'sqlsrv':
 				if ($offset < 1) {

dibi/drivers/DibiPostgreDriver.php

@@ -113,6 +113,16 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	}
 
 
+	/**
+	 * Pings database.
+	 * @return boolean
+	 */
+	public function ping()
+	{
+		return pg_ping($this->connection);
+	}
+
+
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
@@ -300,8 +310,9 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	 */
 	public function escapeLike($value, $pos)
 	{
+		$bs = pg_escape_string($this->connection, '\\'); // standard_conforming_strings = on/off
 		$value = pg_escape_string($this->connection, $value);
-		$value = strtr($value, array( '%' => '\\\\%', '_' => '\\\\_'));
+		$value = strtr($value, array('%' => $bs . '%', '_' => $bs . '_', '\\' => '\\\\'));
 		return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
 	}
 
@@ -450,7 +461,7 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 			FROM
 				information_schema.tables
 			WHERE
-				table_schema = current_schema()";
+				table_schema = ANY (current_schemas(false))";
 
 		if ($version >= 9.3) {
 			$query .= "
@@ -460,7 +471,7 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 				FROM
 					pg_matviews
 				WHERE
-					schemaname = current_schema()";
+					schemaname = ANY (current_schemas(false))";
 		}
 
 		$res = $this->query($query);
@@ -476,20 +487,22 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	 */
 	public function getColumns($table)
 	{
-		$_table = $this->escape($table, dibi::TEXT);
+		$_table = $this->escape($this->escape($table, dibi::IDENTIFIER), dibi::TEXT);
 		$res = $this->query("
 			SELECT indkey
 			FROM pg_class
 			LEFT JOIN pg_index on pg_class.oid = pg_index.indrelid AND pg_index.indisprimary
-			WHERE pg_class.relname = $_table
+			WHERE pg_class.oid = $_table::regclass
 		");
 		$primary = (int) pg_fetch_object($res->resultSet)->indkey;
 
 		$res = $this->query("
 			SELECT *
-			FROM information_schema.columns
-			WHERE table_name = $_table AND table_schema = current_schema()
-			ORDER BY ordinal_position
+			FROM information_schema.columns c
+			JOIN pg_class ON pg_class.relname = c.table_name
+			JOIN pg_namespace nsp ON nsp.oid = pg_class.relnamespace AND nsp.nspname = c.table_schema
+			WHERE pg_class.oid = $_table::regclass
+			ORDER BY c.ordinal_position
 		");
 
 		if (!$res->getRowCount()) {
@@ -541,11 +554,18 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	 */
 	public function getIndexes($table)
 	{
-		$_table = $this->escape($table, dibi::TEXT);
+		$_table = $this->escape($this->escape($table, dibi::IDENTIFIER), dibi::TEXT);
 		$res = $this->query("
-			SELECT ordinal_position, column_name
-			FROM information_schema.columns
-			WHERE table_name = $_table AND table_schema = current_schema()
+			SELECT
+				a.attnum AS ordinal_position,
+				a.attname AS column_name
+			FROM
+				pg_attribute a
+				JOIN pg_class cls ON a.attrelid = cls.oid
+			WHERE
+				a.attrelid = $_table::regclass
+				AND a.attnum > 0
+				AND NOT a.attisdropped
 			ORDER BY ordinal_position
 		");
 
@@ -559,7 +579,7 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 			FROM pg_class
 			LEFT JOIN pg_index on pg_class.oid = pg_index.indrelid
 			INNER JOIN pg_class as pg_class2 on pg_class2.oid = pg_index.indexrelid
-			WHERE pg_class.relname = $_table
+			WHERE pg_class.oid = $_table::regclass
 		");
 
 		$indexes = array();
@@ -582,7 +602,7 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	 */
 	public function getForeignKeys($table)
 	{
-		$_table = $this->escape($table, dibi::TEXT);
+		$_table = $this->escape($this->escape($table, dibi::IDENTIFIER), dibi::TEXT);
 
 		$res = $this->query("
 			SELECT

dibi/drivers/DibiSqliteReflector.php

@@ -62,7 +62,6 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
 		$columns = array();
 		while ($row = $res->fetch(TRUE)) {
 			$column = $row['name'];
-			$pattern = "/(\"$column\"|\[$column\]|$column)\\s+[^,]+\\s+PRIMARY\\s+KEY\\s+AUTOINCREMENT/Ui";
 			$type = explode('(', $row['type']);
 			$columns[] = array(
 				'name' => $column,
@@ -72,7 +71,7 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
 				'size' => isset($type[1]) ? (int) $type[1] : NULL,
 				'nullable' => $row['notnull'] == '0',
 				'default' => $row['dflt_value'],
-				'autoincrement' => (bool) preg_match($pattern, $meta['sql']),
+				'autoincrement' => $row['pk'] && $type[0] === 'INTEGER',
 				'vendor' => $row,
 			);
 		}

dibi/libs/Dibi.php

@@ -39,8 +39,8 @@ class dibi
 		FIELD_TIME = dibi::TIME;
 
 	/** version */
-	const VERSION = '2.2.2',
-		REVISION = 'released on 2014-06-30';
+	const VERSION = '2.3.0',
+		REVISION = 'released on 2015-01-23';
 
 	/** sorting order */
 	const ASC = 'ASC',
@@ -68,7 +68,7 @@ class dibi
 	public static $numOfQueries = 0;
 
 	/** @var string  Default dibi driver */
-	public static $defaultDriver = 'mysql';
+	public static $defaultDriver = 'mysqli';
 
 
 	/**
@@ -86,12 +86,14 @@ class dibi
 	/**
 	 * Creates a new DibiConnection object and connects it to specified database.
 	 * @param  mixed   connection parameters
-	 * @param  string  connection name
 	 * @return DibiConnection
 	 * @throws DibiException
 	 */
 	public static function connect($config = array(), $name = 0)
 	{
+		if ($name) {
+			trigger_error(__METHOD__ . '(): named connections are deprecated.', E_USER_DEPRECATED);
+		}
 		return self::$connection = self::$registry[$name] = new DibiConnection($config, $name);
 	}
 
@@ -118,7 +120,6 @@ class dibi
 
 	/**
 	 * Retrieve active connection.
-	 * @param  string   connection registy name
 	 * @return DibiConnection
 	 * @throws DibiException
 	 */
@@ -132,6 +133,8 @@ class dibi
 			return self::$connection;
 		}
 
+		trigger_error(__METHOD__ . '(): named connections are deprecated.', E_USER_DEPRECATED);
+
 		if (!isset(self::$registry[$name])) {
 			throw new DibiException("There is no connection named '$name'.");
 		}
@@ -152,13 +155,11 @@ class dibi
 
 
 	/**
-	 * Change active connection.
-	 * @param  string   connection registy name
-	 * @return void
-	 * @throws DibiException
+	 * @deprecated
 	 */
 	public static function activate($name)
 	{
+		trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED);
 		self::$connection = self::getConnection($name);
 	}
 
@@ -471,7 +472,7 @@ class dibi
 				$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 $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|START\s+TRANSACTION|BEGIN|COMMIT|ROLLBACK(?:\s+TO\s+SAVEPOINT)?|(?:RELEASE\s+)?SAVEPOINT';
 			static $keywords2 = 'ALL|DISTINCT|DISTINCTROW|IGNORE|AS|USING|ON|AND|OR|IN|IS|NOT|NULL|LIKE|RLIKE|REGEXP|TRUE|FALSE';
 
 			// insert new lines

dibi/libs/DibiConnection.php

@@ -111,7 +111,7 @@ class DibiConnection extends DibiObject
 				$this->onEvent[] = array(new DibiFirePhpLogger($filter), 'logEvent');
 			}
 
-			if (!interface_exists('Tracy\IBarPanel') && (interface_exists('Nette\Diagnostics\IBarPanel') || interface_exists('IBarPanel'))) {
+			if (!interface_exists('Tracy\IBarPanel') && interface_exists('Nette\Diagnostics\IBarPanel') && class_exists('DibiNettePanel')) {
 				$panel = new DibiNettePanel(isset($profilerCfg['explain']) ? $profilerCfg['explain'] : TRUE, $filter);
 				$panel->register($this);
 			}

dibi/libs/DibiDatabaseInfo.php

@@ -481,7 +481,7 @@ class DibiColumnInfo extends DibiObject
 	 */
 	public function getTableName()
 	{
-		return isset($this->info['table']) ? $this->info['table'] : NULL;
+		return isset($this->info['table']) && $this->info['table'] != NULL ? $this->info['table'] : NULL; // intentionally ==
 	}
 
 

dibi/libs/DibiDateTime.php

@@ -44,7 +44,7 @@ class DibiDateTime extends DateTime
 
 	public function setTimestamp($timestamp)
 	{
-		$zone = PHP_VERSION_ID === 50206 ? new \DateTimeZone($this->getTimezone()->getName()) : $this->getTimezone();
+		$zone = PHP_VERSION_ID === 50206 ? new DateTimeZone($this->getTimezone()->getName()) : $this->getTimezone();
 		$this->__construct('@' . $timestamp);
 		$this->setTimeZone($zone);
 		return $this;

dibi/libs/DibiFirePhpLogger.php

@@ -20,6 +20,9 @@ class DibiFirePhpLogger extends DibiObject
 	/** maximum SQL length */
 	static public $maxLength = 1000;
 
+	/** size of json stream chunk */
+	static public $streamChunkSize = 4990;
+
 	/** @var int */
 	public $filter;
 
@@ -58,6 +61,11 @@ class DibiFirePhpLogger extends DibiObject
 			return;
 		}
 
+		if (!$this->numOfQueries) {
+			header('X-Wf-Protocol-dibi: http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
+			header('X-Wf-dibi-Plugin-1: http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.2.0');
+			header('X-Wf-dibi-Structure-1: http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
+		}
 		$this->totalTime += $event->time;
 		$this->numOfQueries++;
 		self::$fireTable[] = array(
@@ -67,10 +75,6 @@ class DibiFirePhpLogger extends DibiObject
 			$event->connection->getConfig('driver') . '/' . $event->connection->getConfig('name')
 		);
 
-		header('X-Wf-Protocol-dibi: http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
-		header('X-Wf-dibi-Plugin-1: http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.2.0');
-		header('X-Wf-dibi-Structure-1: http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
-
 		$payload = json_encode(array(
 			array(
 				'Type' => 'TABLE',
@@ -78,7 +82,7 @@ class DibiFirePhpLogger extends DibiObject
 			),
 			self::$fireTable,
 		));
-		foreach (str_split($payload, 4990) as $num => $s) {
+		foreach (str_split($payload, self::$streamChunkSize) as $num => $s) {
 			$num++;
 			header("X-Wf-dibi-1-1-d$num: |$s|\\"); // protocol-, structure-, plugin-, message-index
 		}

dibi/libs/DibiFluent.php

@@ -24,6 +24,8 @@
  * @method DibiFluent orderBy($field)
  * @method DibiFluent limit(int $limit)
  * @method DibiFluent offset(int $offset)
+ * @method DibiFluent leftJoin($table)
+ * @method DibiFluent on($cond)
  */
 class DibiFluent extends DibiObject implements IDataSource
 {

dibi/libs/DibiResult.php

@@ -500,7 +500,7 @@ class DibiResult extends DibiObject implements IDataSource
 				$row[$key] = is_float($tmp = $value * 1) ? $value : $tmp;
 
 			} elseif ($type === dibi::FLOAT) {
-				$row[$key] = ltrim((string) ($tmp = (float) $value), '0') === ltrim(rtrim(rtrim($value, '0'), '.'), '0') ? $tmp : $value;
+				$row[$key] = str_replace(',', '.', 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';

dibi/libs/DibiTranslator.php

@@ -542,17 +542,23 @@ final class DibiTranslator extends DibiObject
 				return '';
 
 			} elseif ($mod === 'lmt') { // apply limit
-				if ($this->args[$cursor] !== NULL) {
-					$this->limit = (int) $this->args[$cursor];
+				$arg = $this->args[$cursor++];
+				if ($arg === NULL) {
+				} elseif ($this->comment) {
+					return "(limit $arg)";
+				} else {
+					$this->limit = (int) $arg;
 				}
-				$cursor++;
 				return '';
 
 			} elseif ($mod === 'ofs') { // apply offset
-				if ($this->args[$cursor] !== NULL) {
-					$this->offset = (int) $this->args[$cursor];
+				$arg = $this->args[$cursor++];
+				if ($arg === NULL) {
+				} elseif ($this->comment) {
+					return "(offset $arg)";
+				} else {
+					$this->offset = (int) $arg;
 				}
-				$cursor++;
 				return '';
 
 			} else { // default processing

examples/tracy-and-exceptions.php

@@ -2,11 +2,7 @@
 
 <h1>Tracy & SQL Exceptions | dibi</h1>
 
-<p>Dibi can display and log exceptions via Tracy, part of Nette Framework.</p>
-
-<ul>
-	<li>Tracy Debugger: http://tracy.nette.org
-</ul>
+<p>Dibi can display and log exceptions via <a href="http://tracy.nette.org">Tracy</a>.</p>
 
 <?php
 
@@ -15,10 +11,11 @@ if (@!include __DIR__ . '/../vendor/autoload.php') {
 }
 
 
+// enable Tracy
 Tracy\Debugger::enable();
 
 
-dibi::connect(array(
+$connection = dibi::connect(array(
 	'driver'   => 'sqlite3',
 	'database' => 'data/sample.s3db',
 	'profiler' => array(
@@ -27,17 +24,9 @@ dibi::connect(array(
 ));
 
 
-// throws error because SQL is bad
-dibi::query('SELECT * FROM customers WHERE customer_id < ?', 38);
-
-
-dibi::connect(array(
-	'driver'   => 'sqlite3',
-	'database' => 'data/sample.s3db',
-	'profiler' => array(
-		'run' => TRUE,
-	)
-));
+// add panel to debug bar
+$panel = new Dibi\Bridges\Tracy\Panel;
+$panel->register($connection);
 
 
 // throws error because SQL is bad

examples/tracy.php

@@ -2,13 +2,9 @@
 
 <style> html { background: url(data/arrow.png) no-repeat bottom right; height: 100%; } </style>
 
-<h1>Tracy & Variables | dibi</h1>
+<h1>Tracy | dibi</h1>
 
-<p>Dibi can dump variables via Tracy, part of Nette Framework.</p>
-
-<ul>
-	<li>Tracy Debugger: http://tracy.nette.org
-</ul>
+<p>Dibi can log queries and dump variables to the <a href="http://tracy.nette.org">Tracy</a>.</p>
 
 <?php
 
@@ -17,10 +13,11 @@ if (@!include __DIR__ . '/../vendor/autoload.php') {
 }
 
 
+// enable Tracy
 Tracy\Debugger::enable();
 
 
-dibi::connect(array(
+$connection = dibi::connect(array(
 	'driver'   => 'sqlite3',
 	'database' => 'data/sample.s3db',
 	'profiler' => array(
@@ -29,4 +26,13 @@ dibi::connect(array(
 ));
 
 
+// add panel to debug bar
+$panel = new Dibi\Bridges\Tracy\Panel;
+$panel->register($connection);
+
+
+// query will be logged
+dibi::query('SELECT 123');
+
+// result set will be dumped
 Tracy\Debugger::barDump( dibi::fetchAll('SELECT * FROM customers WHERE customer_id < ?', 38), '[customers]' );

tests/.gitignore

@@ -1,4 +1,4 @@
-/*/output
-/coverage.dat
-/test.log
+output
 /tmp
+/test.log
+/databases.ini

tests/databases.sample.ini

@@ -0,0 +1,76 @@
+[mysql]
+driver = mysql
+host = 127.0.0.1
+username = root
+password =
+charset = utf8
+system = mysql
+
+[mysqli]
+driver = mysqli
+host = 127.0.0.1
+username = root
+password =
+charset = utf8
+system = mysql
+
+[sqlite2]
+driver = sqlite
+database = :memory:
+system = sqlite
+
+[sqlite3] ; default
+driver = sqlite3
+database = :memory:
+system = sqlite
+
+[pgsql]
+driver = postgre
+host = 127.0.0.1
+username = postgres
+password =
+system = pgsql
+
+[odbc]
+driver = odbc
+dsn = "Driver={Microsoft Access Driver (*.mdb)}Dbq=data/odbc_tmp.mdb"
+system = odbc
+
+[mssql]
+driver = mssql
+host = 127.0.0.1
+username = dibi
+password =
+system = mssql
+
+[mssql2005]
+driver = mssql2005
+host = (local)
+username = dibi
+password =
+system = mssql
+
+[oracle]
+driver = oracle
+username = dibi
+password =
+system = oracle
+
+[sqlite-pdo]
+driver = pdo
+dsn = "sqlite::memory:"
+system = sqlite
+
+[mysql-pdo]
+driver = pdo
+dsn = "mysql:host=127.0.0.1"
+username = root
+password =
+system = mysql
+
+[pgsql-pdo]
+driver = pdo
+dsn = "pgsql:host=127.0.0.1;dbname=dibi_test"
+username = postgres
+password =
+system = pgsql

tests/dibi/DataSource.phpt

@@ -0,0 +1,159 @@
+<?php
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+$conn = new DibiConnection($config);
+$conn->loadFile(__DIR__ . "/data/$config[system].sql");
+
+
+$ds = $conn->dataSource('SELECT * FROM products');
+Assert::match(
+	reformat("
+SELECT *
+FROM (SELECT * FROM products) t"),
+	(string) $ds
+);
+
+
+Assert::same(3, $ds->count());
+Assert::same(3, $ds->getTotalCount());
+Assert::same(
+	reformat('SELECT COUNT(*) FROM (SELECT * FROM products) t'),
+	dibi::$sql
+);
+
+
+$ds->select('title');
+$ds->orderBy('title', dibi::DESC);
+$ds->where('title like "%a%"');
+Assert::match(
+	reformat("
+SELECT [title]
+FROM (SELECT * FROM products) t
+ WHERE (title like '%a%')
+ ORDER BY [title] DESC
+ "),
+	(string) $ds
+);
+
+
+$ds->select('product_id');
+$ds->orderBy('product_id', dibi::ASC);
+$ds->where('product_id = %i', 1);
+Assert::match(
+	reformat("
+SELECT [title], [product_id]
+FROM (SELECT * FROM products) t
+ WHERE (title like '%a%') AND (product_id = 1)
+ ORDER BY [title] DESC, [product_id] ASC
+ "),
+	(string) $ds
+);
+
+
+$ds->select(array('product_id'));
+$ds->orderBy(array('product_id' => dibi::ASC));
+$ds->where(array('product_id = 1'));
+Assert::match(
+	reformat("
+SELECT [product_id]
+FROM (SELECT * FROM products) t
+ WHERE (title like '%a%') AND (product_id = 1) AND (product_id = 1)
+ ORDER BY [product_id] ASC
+ "),
+	(string) $ds
+);
+
+
+Assert::same(1, $ds->count());
+Assert::same(3, $ds->getTotalCount());
+Assert::match(reformat("SELECT COUNT(*) FROM (
+SELECT [product_id]
+FROM (SELECT * FROM products) t
+ WHERE (title like '%a%') AND (product_id = 1) AND (product_id = 1)
+ ORDER BY [product_id] ASC
+ ) t"), dibi::$sql);
+Assert::same(1, $ds->toDataSource()->count());
+
+
+Assert::equal(array(
+	new DibiRow(array(
+		'product_id' => 1,
+	)),
+), iterator_to_array($ds));
+
+Assert::match(
+	reformat("
+SELECT [product_id]
+FROM (SELECT * FROM products) t
+ WHERE (title like '%a%') AND (product_id = 1) AND (product_id = 1)
+ ORDER BY [product_id] ASC
+ "),
+	dibi::$sql
+);
+
+
+$fluent = $ds->toFluent();
+Assert::same(1, $fluent->count());
+Assert::match(
+	reformat("SELECT * FROM (
+SELECT [product_id]
+FROM (SELECT * FROM products) t
+ WHERE (title like '%a%') AND (product_id = 1) AND (product_id = 1)
+ ORDER BY [product_id] ASC
+ ) t"),
+	(string) $fluent
+);
+
+
+$ds = $conn->select('title')->from('products')->toDataSource();
+Assert::match(
+	reformat("
+SELECT *
+FROM (SELECT [title] FROM [products]) t"),
+	(string) $ds
+);
+
+Assert::equal(new DibiRow(array(
+	'product_id' => 1,
+	'title' => 'Chair',
+)), $conn->dataSource('SELECT * FROM products ORDER BY product_id')->fetch());
+
+Assert::same(1, $conn->dataSource('SELECT * FROM products ORDER BY product_id')->fetchSingle());
+
+Assert::same(
+	array(1 => 'Chair', 'Table', 'Computer'),
+	$conn->dataSource('SELECT * FROM products ORDER BY product_id')->fetchPairs()
+);
+
+Assert::equal(array(
+	1 => new DibiRow(array(
+		'product_id' => 1,
+		'title' => 'Chair',
+	)),
+	new DibiRow(array(
+		'product_id' => 2,
+		'title' => 'Table',
+	)),
+	new DibiRow(array(
+		'product_id' => 3,
+		'title' => 'Computer',
+	)),
+), $conn->dataSource('SELECT * FROM products ORDER BY product_id')->fetchAssoc('product_id'));
+
+
+$ds = new DibiDataSource('products', $conn);
+
+Assert::match(
+	reformat("
+SELECT *
+FROM [products]"),
+	(string) $ds
+);
+
+Assert::same(3, $ds->count());
+Assert::same(3, $ds->getTotalCount());
+Assert::same(reformat('SELECT COUNT(*) FROM [products]'), dibi::$sql);

tests/dibi/DibiConnection.affectedRows.phpt

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @dataProvider ../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+$conn = new DibiConnection($config);
+$conn->loadFile(__DIR__ . "/data/$config[system].sql");
+
+
+$conn->query('INSERT INTO products', array(
+	'title' => 'Test product',
+));
+Assert::same(1, $conn->getAffectedRows());
+
+
+$conn->query('UPDATE products SET title="xxx" WHERE product_id > 100');
+Assert::same(0, $conn->getAffectedRows());
+
+
+$conn->query('UPDATE products SET title="xxx"');
+Assert::same(4, $conn->getAffectedRows());
+
+
+$conn->query('DELETE FROM orders');
+$conn->query('DELETE FROM products WHERE product_id > 100');
+Assert::same(0, $conn->getAffectedRows());
+
+
+$conn->query('DELETE FROM products WHERE product_id < 3');
+Assert::same(2, $conn->getAffectedRows());

tests/dibi/DibiConnection.connect.phpt

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @dataProvider ../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+test(function() use ($config) {
+	$conn = new DibiConnection($config);
+	Assert::true($conn->isConnected());
+
+	$conn->disconnect();
+	Assert::false($conn->isConnected());
+});
+
+
+test(function() use ($config) { // lazy
+	$conn = new DibiConnection($config + array('lazy' => TRUE));
+	Assert::false($conn->isConnected());
+
+	$conn->query('SELECT 1');
+	Assert::true($conn->isConnected());
+});
+
+
+test(function() use ($config) { // query string
+	$conn = new DibiConnection(http_build_query($config, NULL, '&'));
+	Assert::true($conn->isConnected());
+
+	Assert::null($conn->getConfig('lazy'));
+	Assert::same($config['driver'], $conn->getConfig('driver'));
+	Assert::type('IDibiDriver', $conn->getDriver());
+});

tests/dibi/DibiConnection.fetch.phpt

@@ -0,0 +1,329 @@
+<?php
+
+/**
+ * @dataProvider ../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+$conn = new DibiConnection($config);
+$conn->loadFile(__DIR__ . "/data/$config[system].sql");
+
+
+function num($n)
+{
+	global $config;
+	if (substr(@$config['dsn'], 0, 5) === 'odbc:' || $config['driver'] === 'sqlite') {
+		$n = is_float($n) ? "$n.0" : (string) $n;
+	}
+	return $n;
+}
+
+
+// fetch a single value
+$res = $conn->query('SELECT [title] FROM [products]');
+Assert::same('Chair', $res->fetchSingle());
+
+
+// fetch complete result set
+$res = $conn->query('SELECT * FROM [products] ORDER BY product_id');
+Assert::equal(array(
+	new DibiRow(array('product_id' => num(1), 'title' => 'Chair')),
+	new DibiRow(array('product_id' => num(2), 'title' => 'Table')),
+	new DibiRow(array('product_id' => num(3), 'title' => 'Computer')),
+), $res->fetchAll());
+
+
+// fetch complete result set like pairs key => value
+$res = $conn->query('SELECT * FROM [products] ORDER BY product_id');
+Assert::same(
+	array(1 => 'Chair', 'Table', 'Computer'),
+	$res->fetchPairs('product_id', 'title')
+);
+
+$res = $conn->query('SELECT * FROM [products] ORDER BY product_id');
+Assert::same(
+	array(1 => 'Chair', 'Table', 'Computer'),
+	$res->fetchPairs()
+);
+
+
+// fetch row by row
+$res = $conn->query('SELECT * FROM [products] ORDER BY product_id');
+Assert::equal(array(
+	new DibiRow(array('product_id' => num(1), 'title' => 'Chair')),
+	new DibiRow(array('product_id' => num(2), 'title' => 'Table')),
+	new DibiRow(array('product_id' => num(3), 'title' => 'Computer')),
+), iterator_to_array($res));
+
+
+// fetch complete result set like association array
+$res = $conn->query('SELECT * FROM [products] ORDER BY product_id');
+Assert::equal(array(
+	'Chair' => new DibiRow(array('product_id' => num(1), 'title' => 'Chair')),
+	'Table' => new DibiRow(array('product_id' => num(2), 'title' => 'Table')),
+	'Computer' => new DibiRow(array('product_id' => num(3), 'title' => 'Computer')),
+), $res->fetchAssoc('title'));
+
+
+
+// more complex association array
+function query($conn) {
+
+	return $conn->query($conn->getConfig('system') === 'odbc' ? '
+		SELECT products.title, customers.name, orders.amount
+		FROM ([products]
+		INNER JOIN [orders] ON [products.product_id] = [orders.product_id])
+		INNER JOIN [customers] ON [orders.customer_id] = [customers.customer_id]
+		ORDER BY orders.order_id
+	' : '
+		SELECT products.title AS title, customers.name AS name, orders.amount AS amount
+		FROM [products]
+		INNER JOIN [orders] USING ([product_id])
+		INNER JOIN [customers] USING ([customer_id])
+		ORDER BY orders.order_id
+	');
+}
+
+
+Assert::equal(array(
+	'Arnold Rimmer' => array(
+		'Chair' => new DibiRow(array('title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0))),
+		'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0))),
+	),
+	'Dave Lister' => array(
+		'Table' => new DibiRow(array('title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0))),
+	),
+	'Kristine Kochanski' => array(
+		'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0))),
+	),
+), query($conn)->fetchAssoc('name,title'));
+
+
+Assert::equal(array(
+	'Arnold Rimmer' => array(
+		array(
+			'Chair' => new DibiRow(array('title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0))),
+		),
+		array(
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0))),
+		),
+	),
+	'Dave Lister' => array(
+		array(
+			'Table' => new DibiRow(array('title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0))),
+		),
+	),
+	'Kristine Kochanski' => array(
+		array(
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0))),
+		),
+	),
+), query($conn)->fetchAssoc('name,#,title'));
+
+
+Assert::equal(array(
+	'Arnold Rimmer' => array(
+		'title' => array(
+			'Chair' => new DibiRow(array('title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0))),
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0))),
+		),
+		'name' => 'Arnold Rimmer',
+		'amount' => num(7.0),
+	),
+	'Dave Lister' => array(
+		'title' => array(
+			'Table' => new DibiRow(array('title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0))),
+		),
+		'name' => 'Dave Lister',
+		'amount' => num(3.0),
+	),
+	'Kristine Kochanski' => array(
+		'title' => array(
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0))),
+		),
+		'name' => 'Kristine Kochanski',
+		'amount' => num(5.0),
+	),
+), query($conn)->fetchAssoc('name,=,title'));
+
+
+Assert::equal(array(
+	'Arnold Rimmer' => new DibiRow(array(
+		'title' => array(
+			'Chair' => new DibiRow(array('title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0))),
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0))),
+		),
+		'name' => 'Arnold Rimmer',
+		'amount' => num(7.0),
+	)),
+	'Dave Lister' => new DibiRow(array(
+		'title' => array(
+			'Table' => new DibiRow(array('title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0))),
+		),
+		'name' => 'Dave Lister',
+		'amount' => num(3.0),
+	)),
+	'Kristine Kochanski' => new DibiRow(array(
+		'title' => array(
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0))),
+		),
+		'name' => 'Kristine Kochanski',
+		'amount' => num(5.0),
+	)),
+), query($conn)->fetchAssoc('name,@,title'));
+
+
+Assert::equal(array(
+	new DibiRow(array('title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0))),
+	new DibiRow(array(
+		'title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0))),
+	new DibiRow(array(
+		'title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0))),
+	new DibiRow(array(
+		'title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0))),
+), query($conn)->fetchAssoc('@,='));
+
+
+Assert::equal(array(
+	'Arnold Rimmer' => array(
+		'title' => array(
+			'Chair' => new DibiRow(array('title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0))),
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0))),
+		),
+		'name' => 'Arnold Rimmer',
+		'amount' => num(7.0),
+	),
+	'Dave Lister' => array(
+		'title' => array(
+			'Table' => new DibiRow(array('title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0))),
+		),
+		'name' => 'Dave Lister',
+		'amount' => num(3.0),
+	),
+	'Kristine Kochanski' => array(
+		'title' => array(
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0))),
+		),
+		'name' => 'Kristine Kochanski',
+		'amount' => num(5.0),
+	),
+), query($conn)->fetchAssoc('name,=,title,@'));
+
+
+// old syntax
+Assert::equal(array(
+	'Arnold Rimmer' => array(
+		'Chair' => new DibiRow(array('title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0))),
+		'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0))),
+	),
+	'Dave Lister' => array(
+		'Table' => new DibiRow(array('title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0))),
+	),
+	'Kristine Kochanski' => array(
+		'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0))),
+	),
+), query($conn)->fetchAssoc('name|title'));
+
+
+Assert::equal(array(
+	'Arnold Rimmer' => array(
+		array(
+			'Chair' => new DibiRow(array('title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0))),
+		),
+		array(
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0))),
+		),
+	),
+	'Dave Lister' => array(
+		array(
+			'Table' => new DibiRow(array('title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0))),
+		),
+	),
+	'Kristine Kochanski' => array(
+		array(
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0))),
+		),
+	),
+), query($conn)->fetchAssoc('name[]title'));
+
+
+Assert::equal(array(
+	'Arnold Rimmer' => new DibiRow(array(
+		'title' => array(
+			'Chair' => new DibiRow(array('title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0))),
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0))),
+		),
+		'name' => 'Arnold Rimmer',
+		'amount' => num(7.0),
+	)),
+	'Dave Lister' => new DibiRow(array(
+		'title' => array(
+			'Table' => new DibiRow(array('title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0))),
+		),
+		'name' => 'Dave Lister',
+		'amount' => num(3.0),
+	)),
+	'Kristine Kochanski' => new DibiRow(array(
+		'title' => array(
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0))),
+		),
+		'name' => 'Kristine Kochanski',
+		'amount' => num(5.0),
+	)),
+), query($conn)->fetchAssoc('name->title'));
+
+
+Assert::equal(array(
+	'Arnold Rimmer' => new DibiRow(array(
+		'title' => array('Chair' => 'Arnold Rimmer', 'Computer' => 'Arnold Rimmer'),
+		'name' => 'Arnold Rimmer',
+		'amount' => num(7.0),
+	)),
+	'Dave Lister' => new DibiRow(array(
+		'title' => array('Table' => 'Dave Lister'),
+		'name' => 'Dave Lister',
+		'amount' => num(3.0),
+	)),
+	'Kristine Kochanski' => new DibiRow(array(
+		'title' => array('Computer' => 'Kristine Kochanski'),
+		'name' => 'Kristine Kochanski',
+		'amount' => num(5.0),
+	)),
+), query($conn)->fetchAssoc('name->title=name'));
+
+
+Assert::equal(array(
+	new DibiRow(array('title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0))),
+	new DibiRow(array('title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0))),
+	new DibiRow(array('title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0))),
+	new DibiRow(array('title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0))),
+), query($conn)->fetchAssoc('[]'));
+
+
+Assert::equal(array(
+	'Arnold Rimmer' => new DibiRow(array(
+		'title' => array(
+			'Chair' => new DibiRow(array('title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0))),
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0))),
+		),
+		'name' => 'Arnold Rimmer',
+		'amount' => num(7.0),
+	)),
+	'Dave Lister' => new DibiRow(array(
+		'title' => array(
+			'Table' => new DibiRow(array('title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0))),
+		),
+		'name' => 'Dave Lister',
+		'amount' => num(3.0),
+	)),
+	'Kristine Kochanski' => new DibiRow(array(
+		'title' => array(
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0))),
+		),
+		'name' => 'Kristine Kochanski',
+		'amount' => num(5.0),
+	)),
+), query($conn)->fetchAssoc('name->title->'));

tests/dibi/DibiConnection.substitutions.phpt

@@ -0,0 +1,26 @@
+<?php
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+$conn = new DibiConnection($config);
+
+// create new substitution :blog:  ==>  wp_
+$conn->getSubstitutes()->blog = 'wp_';
+
+Assert::same(
+	reformat('UPDATE wp_items SET [text]=\'Hello World\''),
+	$conn->translate("UPDATE :blog:items SET [text]='Hello World'")
+);
+
+Assert::same(
+	reformat('UPDATE \'wp_\' SET [text]=\'Hello World\''),
+	$conn->translate("UPDATE :blog: SET [text]='Hello World'")
+);
+
+Assert::same(
+	reformat('UPDATE \':blg:\' SET [text]=\'Hello World\''),
+	$conn->translate("UPDATE :blg: SET [text]='Hello World'")
+);

tests/dibi/DibiConnection.transactions.phpt

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @dataProvider ../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+$conn = new DibiConnection($config);
+$conn->loadFile(__DIR__ . "/data/$config[system].sql");
+
+
+/*Assert::exception(function() use ($conn) {
+	$conn->rollback();
+}, 'DibiException');
+
+Assert::exception(function() use ($conn) {
+	$conn->commit();
+}, 'DibiException');
+
+$conn->begin();
+Assert::exception(function() use ($conn) {
+	$conn->begin();
+}, 'DibiException');
+*/
+
+
+$conn->begin();
+Assert::same(3, (int) $conn->query('SELECT COUNT(*) FROM [products]')->fetchSingle());
+$conn->query('INSERT INTO [products]', array(
+	'title' => 'Test product',
+));
+Assert::same(4, (int) $conn->query('SELECT COUNT(*) FROM [products]')->fetchSingle());
+$conn->rollback();
+Assert::same(3, (int) $conn->query('SELECT COUNT(*) FROM [products]')->fetchSingle());
+
+
+
+
+$conn->begin();
+$conn->query('INSERT INTO [products]', array(
+	'title' => 'Test product',
+));
+$conn->commit();
+Assert::same(4, (int) $conn->query('SELECT COUNT(*) FROM [products]')->fetchSingle());

tests/dibi/DibiFluent.cloning.phpt

@@ -1,40 +1,35 @@
 <?php
 
-/**
- * Test: Cloning of DibiFluent
- *
- * @author     David Grudl
- */
-
 use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 
 
-dibi::connect($config['sqlite3']);
+$conn = new DibiConnection($config);
 
-
-$fluent = new DibiFluent(dibi::getConnection());
+$fluent = new DibiFluent($conn);
 $fluent->select('*')->from('table')->where('x=1');
 $dolly = clone $fluent;
 $dolly->where('y=1');
 $dolly->clause('FOO');
 
-Assert::same( 'SELECT * FROM [table] WHERE x=1', (string) $fluent );
-Assert::same( 'SELECT * FROM [table] WHERE x=1 AND y=1 FOO', (string) $dolly );
+Assert::same( reformat('SELECT * FROM [table] WHERE x=1'), (string) $fluent );
+Assert::same( reformat('SELECT * FROM [table] WHERE x=1 AND y=1 FOO'), (string) $dolly );
 
 
-$fluent = dibi::select('id')->from('table')->where('id = %i',1);
+$fluent = new DibiFluent($conn);
+$fluent->select('id')->from('table')->where('id = %i',1);
 $dolly = clone $fluent;
 $dolly->where('cd = %i',5);
 
-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 );
+Assert::same( reformat('SELECT [id] FROM [table] WHERE id = 1'), (string) $fluent );
+Assert::same( reformat('SELECT [id] FROM [table] WHERE id = 1 AND cd = 5'), (string) $dolly );
 
 
-$fluent = dibi::select("*")->from("table");
+$fluent = new DibiFluent($conn);
+$fluent->select("*")->from("table");
 $dolly = clone $fluent;
 $dolly->removeClause("select")->select("count(*)");
 
-Assert::same( 'SELECT * FROM [table]', (string) $fluent );
-Assert::same( 'SELECT count(*) FROM [table]', (string) $dolly );
+Assert::same( reformat('SELECT * FROM [table]'), (string) $fluent );
+Assert::same( reformat('SELECT count(*) FROM [table]'), (string) $dolly );

tests/dibi/DibiFluent.delete.phpt

@@ -0,0 +1,45 @@
+<?php
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+$conn = new DibiConnection($config);
+
+
+$fluent = $conn->delete('table')->as('bAlias')
+	->setFlag('IGNORE');
+
+Assert::same(
+	reformat('DELETE IGNORE FROM [table] AS [bAlias]'),
+	(string) $fluent
+);
+
+$fluent->removeClause('from')->from('anotherTable');
+
+Assert::same(
+	reformat('DELETE IGNORE FROM [anotherTable]'),
+	(string) $fluent
+);
+
+$fluent->using('thirdTable');
+
+Assert::same(
+	reformat('DELETE IGNORE FROM [anotherTable] USING [thirdTable]'),
+	(string) $fluent
+);
+
+$fluent->setFlag('IGNORE', FALSE);
+
+Assert::same(
+	reformat('DELETE FROM [anotherTable] USING [thirdTable]'),
+	(string) $fluent
+);
+
+$fluent->limit(10);
+
+Assert::same(
+	reformat('DELETE FROM [anotherTable] USING [thirdTable] LIMIT 10'),
+	(string) $fluent
+);

tests/dibi/DibiFluent.fetch.phpt

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @dataProvider ../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+$conn = new DibiConnection($config);
+$conn->loadFile(__DIR__ . "/data/$config[system].sql");
+
+
+function num($n)
+{
+	global $config;
+	if (substr(@$config['dsn'], 0, 5) === 'odbc:' || $config['driver'] === 'sqlite') {
+		$n = is_float($n) ? "$n.0" : (string) $n;
+	}
+	return $n;
+}
+
+
+// fetch a single value
+$res = $conn->select('title')->from('products')->orderBy('product_id');
+Assert::equal('Chair', $res->fetchSingle());
+
+
+// fetch complete result set
+$res = $conn->select('*')->from('products')->orderBy('product_id');
+Assert::equal(array(
+	new DibiRow(array('product_id' => num(1), 'title' => 'Chair')),
+	new DibiRow(array('product_id' => num(2), 'title' => 'Table')),
+	new DibiRow(array('product_id' => num(3), 'title' => 'Computer')),
+), $res->fetchAll());
+
+
+// more complex association array
+if ($config['system'] !== 'odbc') {
+	$res = $conn->select(array('products.title' => 'title', 'customers.name' => 'name'))->select('orders.amount')->as('amount')
+		->from('products')
+		->innerJoin('orders')->using('(product_id)')
+		->innerJoin('customers')->using('([customer_id])')
+		->orderBy('order_id');
+
+	Assert::equal(array(
+		'Arnold Rimmer' => array(
+			'Chair' => new DibiRow(array('title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0))),
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0))),
+		),
+		'Dave Lister' => array(
+			'Table' => new DibiRow(array('title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0))),
+		),
+		'Kristine Kochanski' => array(
+			'Computer' => new DibiRow(array('title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0))),
+		),
+	), $res->fetchAssoc('name,title'));
+}

tests/dibi/DibiFluent.insert.phpt

@@ -0,0 +1,58 @@
+<?php
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+$conn = new DibiConnection($config);
+
+
+$arr = array(
+	'title'   => 'Super Product',
+	'price'   => 12,
+	'brand'   => NULL,
+);
+
+$fluent = $conn->insert('table', $arr)
+	->setFlag('IGNORE')->setFlag('DELAYED');
+
+Assert::same(
+	reformat('INSERT IGNORE DELAYED INTO [table] ([title], [price], [brand]) VALUES (\'Super Product\', 12, NULL)'),
+	(string) $fluent
+);
+
+$fluent->setFlag('IGNORE', FALSE);
+
+Assert::same(
+	reformat('INSERT DELAYED INTO [table] ([title], [price], [brand]) VALUES (\'Super Product\', 12, NULL)'),
+	(string) $fluent
+);
+
+$fluent->setFlag('HIGH_priority');
+
+Assert::same(
+	reformat('INSERT DELAYED HIGH_PRIORITY INTO [table] ([title], [price], [brand]) VALUES (\'Super Product\', 12, NULL)'),
+	(string) $fluent
+);
+
+$fluent->into('anotherTable');
+
+Assert::same(
+	reformat('INSERT DELAYED HIGH_PRIORITY INTO [anotherTable] VALUES (\'Super Product\', 12, NULL)'),
+	(string) $fluent
+);
+
+$fluent->values('%l', $arr);
+
+Assert::same(
+	reformat('INSERT DELAYED HIGH_PRIORITY INTO [anotherTable] VALUES (\'Super Product\', 12, NULL) , (\'Super Product\', 12, NULL)'),
+	(string) $fluent
+);
+
+$fluent->values($arr);
+
+Assert::same(
+	reformat('INSERT DELAYED HIGH_PRIORITY INTO [anotherTable] VALUES (\'Super Product\', 12, NULL) , (\'Super Product\', 12, NULL) , (\'Super Product\', 12, NULL)'),
+	(string) $fluent
+);

tests/dibi/DibiFluent.select.phpt

@@ -0,0 +1,139 @@
+<?php
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+$conn = new DibiConnection($config);
+
+
+$max = 10;
+$min = 5;
+
+$fluent = $conn->select('*')
+	->select('a')
+	->select('b')->as('bAlias')
+	->select(array('c', 'd', 'e'))
+	->select('%n', 'd');
+
+Assert::same(
+	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d]'),
+	(string) $fluent
+);
+
+$fluent->from('table')->as('tableAlias')
+	->innerJoin('table1')->on('table.col = table1.col')
+	->innerJoin('table2')->on('table.col = table2.col');
+
+Assert::same(
+	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [table] AS [tableAlias] INNER JOIN [table1] ON table.col = table1.col INNER JOIN [table2] ON table.col = table2.col'),
+	(string) $fluent
+);
+
+$fluent->from('anotherTable');
+
+Assert::same(
+	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [table] AS [tableAlias] INNER JOIN [table1] ON table.col = table1.col INNER JOIN [table2] ON table.col = table2.col , [anotherTable]'),
+	(string) $fluent
+);
+
+$fluent->removeClause('from')->from('anotherTable');
+
+Assert::same(
+	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [anotherTable]'),
+	(string) $fluent
+);
+
+$fluent->as('anotherAlias')
+	->clause('from')
+		->innerJoin('table3')
+		->on('table.col = table3.col');
+
+Assert::same(
+	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [anotherTable] AS [anotherAlias] INNER JOIN [table3] ON table.col = table3.col'),
+	(string) $fluent
+);
+
+$fluent->where('col > %i', $max)
+	->or('col < %i', $min)
+	->where('active = 1')
+	->where('col')->in(array(1,2,3))
+	->orderBy('val')->asc()
+	->orderBy('[val2] DESC')
+	->orderBy(array('val3' => -1));
+
+Assert::same(
+	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [anotherTable] AS [anotherAlias] INNER JOIN [table3] ON table.col = table3.col WHERE col > 10 OR col < 5 AND active = 1 AND [col] IN (1, 2, 3) ORDER BY [val] ASC , [val2] DESC , [val3] DESC'),
+	(string) $fluent
+);
+
+$fluent->orderBy(DibiFluent::REMOVE);
+
+Assert::same(
+	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [anotherTable] AS [anotherAlias] INNER JOIN [table3] ON table.col = table3.col WHERE col > 10 OR col < 5 AND active = 1 AND [col] IN (1, 2, 3)'),
+	(string) $fluent
+);
+
+
+try {
+	$fluent = $conn->select('*')->from('table')->fetch();
+} catch (Exception $e) {
+}
+Assert::same(
+	reformat(' SELECT * FROM [table] LIMIT 1'),
+	dibi::$sql
+);
+
+
+$fluent = $conn->select('*')
+	->select(
+		$conn->select('count(*)')
+		->from('precteni')->as('P')
+		->where('P.id_clanku', '=', 'C.id_clanku')
+	)
+	->from('clanky')->as('C')
+	->where('id_clanku=%i', 123)
+	->limit(1)
+	->offset(0);
+
+Assert::same(
+	reformat('SELECT * , (SELECT count(*) FROM [precteni] AS [P] WHERE P.id_clanku = C.id_clanku) FROM [clanky] AS [C] WHERE id_clanku=123 LIMIT 1 OFFSET 0'),
+	(string) $fluent
+);
+
+
+$fluent = $conn->select('*')
+	->select(array('x' => 'xAlias'))
+	->from('products')
+	->innerJoin('orders')->using('(product_id)')
+	->innerJoin('customers')->using('([customer_id])')
+	->innerJoin('items')->using('(%n)', array('customer_id', 'order_id'));
+
+Assert::same(
+	reformat('SELECT * , [x] AS [xAlias] FROM [products] INNER JOIN [orders] USING (product_id) INNER JOIN [customers] USING ([customer_id]) INNER JOIN [items] USING ([customer_id], [order_id])'),
+	(string) $fluent
+);
+
+
+
+$fluent = $conn->command()->select()
+	->from('products')
+	->select('*')
+	->innerJoin('orders')->using('(product_id)');
+
+Assert::same(
+	reformat('SELECT * FROM [products] INNER JOIN [orders] USING (product_id)'),
+	(string) $fluent
+);
+
+
+$fluent = $conn->select('*')
+	->from(array('me' => 't'))
+	->where('col > %i', $max)
+	->where(array('x' => 'a', 'b', 'c'));
+
+Assert::same(
+	reformat('SELECT * FROM [me] AS [t] WHERE col > 10 AND ([x] = \'a\') AND (b) AND (c)'),
+	(string) $fluent
+);

tests/dibi/DibiFluent.update.phpt

@@ -0,0 +1,30 @@
+<?php
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+$conn = new DibiConnection($config);
+
+
+$arr = array(
+	'title'   => 'Super Product',
+	'price'   => 12,
+	'brand'   => NULL,
+);
+
+$fluent = $conn->update('table', $arr)
+	->setFlag('IGNORE')->setFlag('DELAYED');
+
+Assert::same(
+	reformat('UPDATE IGNORE DELAYED [table] SET [title]=\'Super Product\', [price]=12, [brand]=NULL'),
+	(string) $fluent
+);
+
+$fluent->set(array('another' => 123));
+
+Assert::same(
+	reformat('UPDATE IGNORE DELAYED [table] SET [title]=\'Super Product\', [price]=12, [brand]=NULL , [another]=123'),
+	(string) $fluent
+);

tests/dibi/DibiResult.meta.phpt

@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @dataProvider ../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+if ($config['system'] === 'odbc') {
+	Tester\Environment::skip('Not supported.');
+}
+
+$conn = new DibiConnection($config);
+$conn->loadFile(__DIR__ . "/data/$config[system].sql");
+
+$info = $conn->query('
+	SELECT products.product_id, orders.order_id, customers.name, products.product_id + 1 AS xxx
+	FROM products
+	INNER JOIN orders USING (product_id)
+	INNER JOIN customers USING (customer_id)
+')->getInfo();
+
+
+Assert::same(
+	array('product_id', 'order_id', 'name', 'xxx'),
+	$info->getColumnNames()
+);
+
+
+if ($config['driver'] !== 'sqlite3' && $config['driver'] !== 'pdo') {
+	Assert::same(
+		array('products.product_id', 'orders.order_id', 'customers.name', 'xxx'),
+		$info->getColumnNames(TRUE)
+	);
+}
+
+
+$columns = $info->getColumns();
+
+Assert::same('product_id', $columns[0]->name);
+if ($config['driver'] !== 'sqlite3' && $config['driver'] !== 'pdo') {
+	Assert::same('products', $columns[0]->tableName);
+}
+Assert::null($columns[0]->getVendorInfo('xxx'));
+if ($config['system'] !== 'sqlite') {
+	Assert::same('i', $columns[0]->type);
+}
+Assert::null($columns[0]->nullable);
+
+Assert::same('xxx', $columns[3]->name);
+Assert::null($columns[3]->tableName);
+if ($config['system'] !== 'sqlite') {
+	Assert::same('i', $columns[0]->type);
+}
+Assert::null($columns[3]->nullable);

tests/dibi/DibiResult.types.phpt

@@ -0,0 +1,18 @@
+<?php
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+$conn = new DibiConnection($config);
+$conn->loadFile(__DIR__ . "/data/$config[system].sql");
+
+$res = $conn->query('SELECT * FROM [customers]');
+
+// auto-converts this column to integer
+$res->setType('customer_id', Dibi::DATETIME, 'H:i j.n.Y');
+
+Assert::equal(new DibiRow(array(
+	'customer_id' => new DibiDateTime('1970-01-01 01:00:01'),
+	'name' => 'Dave Lister',
+)), $res->fetch());

tests/dibi/DibiTranslator.DateTimeInterface.phpt

@@ -1,9 +1,6 @@
 <?php
 
 /**
- * Test: DateTimeInterface of DibiTranslator
- *
- * @author     Patrik Votoček
  * @phpversion 5.5
  */
 
@@ -11,11 +8,8 @@ use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 
-$connection = new DibiConnection(array(
-	'driver' => 'sqlite3',
-	'database' => ':memory:',
-));
-$translator = new DibiTranslator($connection);
+$conn = new DibiConnection($config);
+$translator = new DibiTranslator($conn);
 
 $datetime = new DateTime('1978-01-23 00:00:00');
 

tests/dibi/DibiTranslator.conditions.phpt

@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * @dataProvider ../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+$conn = new DibiConnection($config);
+
+
+// if & end
+Assert::same(
+	reformat("
+SELECT *
+FROM [customers]
+/* WHERE ... LIKE ... */"),
+
+	$conn->translate('
+SELECT *
+FROM [customers]
+%if', isset($name), 'WHERE [name] LIKE %s', 'xxx', '%end'
+));
+
+
+// if & else & end (last end is optional)
+Assert::same(
+	reformat("
+SELECT *
+FROM  [customers] /* ... */"),
+
+	$conn->translate('
+SELECT *
+FROM %if', TRUE, '[customers] %else [products]'
+));
+
+
+// if & else & (optional) end
+Assert::match(
+	reformat("
+SELECT *
+FROM [people]
+WHERE [id] > 0
+	/* AND ...=...
+	*/  AND [bar]=1
+"),
+
+	$conn->translate("
+SELECT *
+FROM [people]
+WHERE [id] > 0
+	%if", FALSE, "AND [foo]=%i", 1, "
+	%else %if", TRUE, "AND [bar]=%i", 1, "
+"));
+
+
+// nested condition
+Assert::match(
+	reformat("
+SELECT *
+FROM [customers]
+WHERE
+	 [name] LIKE 'xxx'
+		/* AND ...=1 */
+	/* 1 LIMIT 10 */"),
+
+	$conn->translate('
+SELECT *
+FROM [customers]
+WHERE
+	%if', TRUE, '[name] LIKE %s', 'xxx', '
+		%if', FALSE, 'AND [admin]=1 %end
+	%else 1 LIMIT 10 %end'
+));
+
+
+// limit & offset
+Assert::same(
+	'SELECT * FROM foo /* (limit 3) (offset 5) */',
+	$conn->translate(
+	'SELECT * FROM foo',
+	'%if', FALSE,
+		'%lmt', 3,
+		'%ofs', 5,
+	'%end'
+));

tests/dibi/DibiTranslator.identifiers.phpt

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @dataProvider ../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+$conn = new DibiConnection($config);
+
+
+Assert::same(
+	reformat('SELECT * FROM where WHERE select < 2'),
+	$conn->translate('SELECT * FROM where WHERE select < 2')
+);
+
+
+Assert::same(
+	reformat('SELECT * FROM [where] WHERE where.select < 2'),
+	$conn->translate('SELECT * FROM [where] WHERE where.select < 2')
+);
+
+
+Assert::same(
+	reformat('SELECT * FROM [where] WHERE [where].[select] < 2'),
+	$conn->translate('SELECT * FROM [where] WHERE [where.select] < 2')
+);
+
+
+Assert::same(
+	reformat('SELECT * FROM [where] as [temp] WHERE [temp].[select] < 2'),
+	$conn->translate('SELECT * FROM [where] as [temp] WHERE [temp.select] < 2')
+);
+
+
+Assert::same(
+	reformat('SELECT * FROM [where] WHERE [quot\'n\' space] > 2'),
+	$conn->translate("SELECT * FROM [where] WHERE [quot'n' space] > 2")
+);
+
+
+Assert::same(
+	reformat('SELECT * FROM [where] WHERE [where].[quot\'n\' space] > 2'),
+	$conn->translate("SELECT * FROM [where] WHERE [where.quot'n' space] > 2")
+);

tests/dibi/DibiTranslator.phpt

@@ -0,0 +1,531 @@
+<?php
+
+/**
+ * @dataProvider ../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+$conn = new DibiConnection($config + array('formatDateTime' => "'Y-m-d H:i:s'", 'formatDate' => "'Y-m-d'"));
+
+
+// dibi detects INSERT or REPLACE command & booleans
+Assert::same(
+	reformat("REPLACE INTO [products] ([title], [price]) VALUES ('Drticka', 318)"),
+	$conn->translate('REPLACE INTO [products]', array(
+	'title'  => 'Drticka',
+	'price'  => 318,
+)));
+
+
+// multiple INSERT command
+$array = array(
+	'title'   => 'Super Product',
+	'price'   => 12,
+	'brand'   => NULL,
+);
+Assert::same(
+	reformat('INSERT INTO [products] ([title], [price], [brand]) VALUES (\'Super Product\', 12, NULL) , (\'Super Product\', 12, NULL) , (\'Super Product\', 12, NULL)'),
+	$conn->translate("INSERT INTO [products]", $array, $array, $array)
+);
+
+
+// multiple INSERT command II
+$array = array(
+	array('pole' => 'hodnota1', 'bit'  => 1),
+	array('pole' => 'hodnota2', 'bit'  => 1),
+	array('pole' => 'hodnota3', 'bit'  => 1)
+);
+Assert::same(
+	reformat('INSERT INTO [products]  ([pole], [bit]) VALUES (\'hodnota1\', 1) , (\'hodnota2\', 1) , (\'hodnota3\', 1)'),
+	$conn->translate("INSERT INTO [products] %ex", $array)
+);
+
+
+// dibi detects UPDATE command
+Assert::same(
+	reformat("UPDATE [colors] SET [color]='blue', [order]=12 WHERE [id]=123"),
+	$conn->translate('UPDATE [colors] SET', array(
+	'color' => 'blue',
+	'order' => 12,
+), "WHERE [id]=%i", 123));
+
+
+// IN array
+$array = array(1, 2, 3);
+Assert::same(
+	reformat('SELECT * FROM [people] WHERE [id] IN ( 1, 2, 3 )'),
+	$conn->translate("SELECT * FROM [people] WHERE [id] IN (", $array, ")")
+);
+
+
+// long numbers
+Assert::same(
+	reformat('SELECT -123456789123456789123456789'),
+	$conn->translate("SELECT %i", '-123456789123456789123456789')
+);
+
+// long float numbers
+Assert::same(
+	reformat('SELECT -.12345678912345678912345678e10'),
+	$conn->translate("SELECT %f", '-.12345678912345678912345678e10')
+);
+
+// hex numbers
+Assert::same(
+	reformat('SELECT 17'),
+	$conn->translate("SELECT %i", '0x11')
+);
+
+// invalid input
+$e = Assert::exception(function() use ($conn) {
+	$conn->translate("SELECT %s", (object) array(123), ', %m', 123);
+}, 'DibiException', 'SQL translate error');
+Assert::same('SELECT **Unexpected type object** , **Unknown or invalid modifier %m**', $e->getSql());
+
+Assert::same(
+	reformat('SELECT * FROM [table] WHERE id=10 AND name=\'ahoj\''),
+	$conn->translate('SELECT * FROM [table] WHERE id=%i AND name=%s', 10, 'ahoj')
+);
+
+Assert::same(
+	reformat('TEST ([cond] > 2) OR ([cond2] = \'3\') OR (cond3 < RAND())'),
+	$conn->translate('TEST %or', array('[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()'))
+);
+
+Assert::same(
+	reformat('TEST ([cond] > 2) AND ([cond2] = \'3\') AND (cond3 < RAND())'),
+	$conn->translate('TEST %and', array('[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()'))
+);
+
+//
+$where = array();
+$where[] = '[age] > 20';
+$where[] = '[email] IS NOT NULL';
+Assert::same(
+	reformat('SELECT * FROM [table] WHERE ([age] > 20) AND ([email] IS NOT NULL)'),
+	$conn->translate('SELECT * FROM [table] WHERE %and', $where)
+);
+
+
+$where = array();
+$where['age'] = NULL;
+$where['email'] = 'ahoj';
+$where['id%l'] = array(10, 20, 30);
+Assert::same(
+	reformat('SELECT * FROM [table] WHERE ([age] IS NULL) AND ([email] = \'ahoj\') AND ([id] IN (10, 20, 30))'),
+	$conn->translate('SELECT * FROM [table] WHERE %and', $where)
+);
+
+
+$where = array();
+Assert::same(
+	reformat('SELECT * FROM [table] WHERE 1=1'),
+	$conn->translate('SELECT * FROM [table] WHERE %and', $where)
+);
+
+
+// ORDER BY array
+$order = array(
+	'field1' => 'asc',
+	'field2' => 'desc',
+	'field3' => 1,
+	'field4' => -1,
+	'field5' => TRUE,
+	'field6' => FALSE,
+);
+Assert::same(
+	reformat("SELECT * FROM [people] ORDER BY [field1] ASC, [field2] DESC, [field3] ASC, [field4] DESC, [field5] ASC, [field6] DESC"),
+	$conn->translate("SELECT * FROM [people] ORDER BY %by", $order)
+);
+
+
+// with limit = 2
+Assert::same(
+	reformat(array(
+		'odbc' => 'SELECT TOP 2 * FROM (SELECT * FROM [products] ) t',
+		'SELECT * FROM [products]  LIMIT 2',
+	)),
+	$conn->translate('SELECT * FROM [products] %lmt', 2)
+);
+
+if ($config['system'] === 'odbc') {
+	Assert::exception(function() use ($conn) {
+		$conn->translate('SELECT * FROM [products] %lmt %ofs', 2, 1);
+	}, 'DibiException');
+} else {
+	// with limit = 2, offset = 1
+	Assert::same(
+		reformat('SELECT * FROM [products]   LIMIT 2 OFFSET 1'),
+		$conn->translate('SELECT * FROM [products] %lmt %ofs', 2, 1)
+	);
+
+	// with offset = 50
+	Assert::same(
+		reformat(array(
+			'mysql' => 'SELECT * FROM `products`  LIMIT 18446744073709551615 OFFSET 50',
+			'pgsql' => 'SELECT * FROM "products"  OFFSET 50',
+			'SELECT * FROM [products]  LIMIT -1 OFFSET 50',
+		)),
+		$conn->translate('SELECT * FROM [products] %ofs', 50)
+	);
+}
+
+
+
+
+Assert::same(
+	reformat(array(
+		'odbc' => 'INSERT INTO test ([a2], [a4], [b1], [b2], [b3], [b4], [b5], [b6], [b7], [b8], [b9]) VALUES (#09/26/1212 00:00:00#, #12/31/1969 22:13:20#, #09/26/1212#, #09/26/1212 00:00:00#, #12/31/1969#, #12/31/1969 22:13:20#, #09/26/1212 00:00:00#, #09/26/1212#, #09/26/1212 00:00:00#, NULL, NULL)',
+		"INSERT INTO test ([a2], [a4], [b1], [b2], [b3], [b4], [b5], [b6], [b7], [b8], [b9]) VALUES ('1212-09-26 00:00:00', '1969-12-31 22:13:20', '1212-09-26', '1212-09-26 00:00:00', '1969-12-31', '1969-12-31 22:13:20', '1212-09-26 00:00:00', '1212-09-26', '1212-09-26 00:00:00', NULL, NULL)",
+	)),
+	$conn->translate("INSERT INTO test", array(
+	'a2' => new DibiDateTime('1212-09-26'),
+	'a4' => new DibiDateTime(-10000),
+	'b1%d' => '1212-09-26',
+	'b2%t' => '1212-09-26',
+	'b3%d' => -10000,
+	'b4%t' => -10000,
+	'b5' => new DateTime('1212-09-26'),
+	'b6%d' => new DateTime('1212-09-26'),
+	'b7%t' => new DateTime('1212-09-26'),
+	'b8%d' => NULL,
+	'b9%t' => NULL,
+)));
+
+
+
+// like
+$args = array(
+	"SELECT * FROM products WHERE (title LIKE %like~ AND title LIKE %~like) OR title LIKE %~like~",
+	'C',
+	'r',
+	"a\n%_\\'\""
+);
+
+if ($config['system'] === 'pgsql') {
+	$conn->query('SET escape_string_warning = off'); // do not log warnings
+
+	$conn->query('SET standard_conforming_strings = off');
+	Assert::same(
+		"SELECT * FROM products WHERE (title LIKE 'C%' AND title LIKE '%r') OR title LIKE '%a\n\\\\%\\\\_\\\\\\\\''\"%'",
+		$conn->translate($args[0], $args[1], $args[2], $args[3])
+	);
+
+	$conn->query('SET standard_conforming_strings = on');
+	Assert::same(
+		"SELECT * FROM products WHERE (title LIKE 'C%' AND title LIKE '%r') OR title LIKE '%a\n\\%\\_\\\\''\"%'",
+		$conn->translate($args[0], $args[1], $args[2], $args[3])
+	);
+
+} elseif ($config['driver'] !== 'sqlite') { // sqlite2
+	Assert::same(
+		reformat(array(
+			'sqlite' => "SELECT * FROM products WHERE (title LIKE 'C%' ESCAPE '\\' AND title LIKE '%r' ESCAPE '\\') OR title LIKE '%a\n\\%\\_\\\\''\"%' ESCAPE '\\'",
+			'odbc' => "SELECT * FROM products WHERE (title LIKE 'C%' AND title LIKE '%r') OR title LIKE '%a\n[%][_]\\''\"%'",
+			"SELECT * FROM products WHERE (title LIKE 'C%' AND title LIKE '%r') OR title LIKE '%a\\n\\%\\_\\\\\\\\\'\"%'",
+		)),
+		$conn->translate($args[0], $args[1], $args[2], $args[3])
+	);
+}
+
+
+$e = Assert::exception(function() use ($conn) {
+	$conn->translate("SELECT '");
+}, 'DibiException', 'SQL translate error');
+Assert::same('SELECT **Alone quote**', $e->getSql());
+
+Assert::match(
+	reformat(array(
+		'mysql' => "SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
+CONCAT(last_name, ', ', first_name) AS full_name
+GROUP BY `user`
+HAVING MAX(salary) > %i 123
+INTO OUTFILE '/tmp/result\'.txt'
+FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\\\"'
+LINES TERMINATED BY '\\\\n'
+",
+		"SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
+CONCAT(last_name, ', ', first_name) AS full_name
+GROUP BY [user]
+HAVING MAX(salary) > %i 123
+INTO OUTFILE '/tmp/result''.txt'
+FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"'
+LINES TERMINATED BY '\\n'
+"
+	)),
+	$conn->translate('%sql', "SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
+CONCAT(last_name, \", \", first_name) AS full_name
+GROUP BY [user]
+HAVING MAX(salary) > %i", 123, "
+INTO OUTFILE '/tmp/result''.txt'
+FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"'
+LINES TERMINATED BY '\\n'
+")
+);
+
+
+
+
+
+$array1 = array(1, 2, 3);
+$array2 = array('one', 'two', 'three');
+$array3 = array(
+	'col1' => 'one',
+	'col2' => 'two',
+	'col3' => 'three',
+);
+$array4 = array(
+	'a'   => 12,
+	'b'   => NULL,
+	'c'   => new DibiDateTime('12.3.2007'),
+	'd'   => 'any string',
+);
+
+$array5 = array('RAND()', '[col1] > [col2]');
+
+
+Assert::match(
+	reformat(array(
+		'mysql' => "SELECT *
+FROM `db`.`table`
+WHERE (`test`.`a` LIKE '1995-03-01'
+	OR `b1` IN ( 1, 2, 3 )
+	OR `b2` IN ('1', '2', '3' )
+	OR `b3` IN ( )
+	OR `b4` IN ( 'one', 'two', 'three' )
+	OR `b5` IN (`col1` AS `one`, `col2` AS `two`, `col3` AS `three` )
+	OR `b6` IN ('one', 'two', 'three')
+	OR `b7` IN (NULL)
+	OR `b8` IN (RAND() `col1` > `col2` )
+	OR `b9` IN (  )
+	AND `c` = 'embedded \' string'
+	OR `d`=10
+	OR `e`=NULL
+	OR `true`= 1
+	OR `false`= 0
+	OR `str_null`=NULL
+	OR `str_not_null`='hello'
+LIMIT 10",
+		'pgsql' => 'SELECT *
+FROM "db"."table"
+WHERE ("test"."a" LIKE \'1995-03-01\'
+	OR "b1" IN ( 1, 2, 3 )
+	OR "b2" IN (\'1\', \'2\', \'3\' )
+	OR "b3" IN ( )
+	OR "b4" IN ( \'one\', \'two\', \'three\' )
+	OR "b5" IN ("col1" AS "one", "col2" AS "two", "col3" AS "three" )
+	OR "b6" IN (\'one\', \'two\', \'three\')
+	OR "b7" IN (NULL)
+	OR "b8" IN (RAND() "col1" > "col2" )
+	OR "b9" IN (  )
+	AND "c" = \'embedded \'\' string\'
+	OR "d"=10
+	OR "e"=NULL
+	OR "true"= TRUE
+	OR "false"= FALSE
+	OR "str_null"=NULL
+	OR "str_not_null"=\'hello\'
+LIMIT 10',
+		'odbc' => "SELECT *
+FROM [db].[table]
+WHERE ([test].[a] LIKE #03/01/1995#
+	OR [b1] IN ( 1, 2, 3 )
+	OR [b2] IN ('1', '2', '3' )
+	OR [b3] IN ( )
+	OR [b4] IN ( 'one', 'two', 'three' )
+	OR [b5] IN ([col1] AS [one], [col2] AS [two], [col3] AS [three] )
+	OR [b6] IN ('one', 'two', 'three')
+	OR [b7] IN (NULL)
+	OR [b8] IN (RAND() [col1] > [col2] )
+	OR [b9] IN (  )
+	AND [c] = 'embedded '' string'
+	OR [d]=10
+	OR [e]=NULL
+	OR [true]= 1
+	OR [false]= 0
+	OR [str_null]=NULL
+	OR [str_not_null]='hello'
+LIMIT 10",
+		"SELECT *
+FROM [db].[table]
+WHERE ([test].[a] LIKE '1995-03-01'
+	OR [b1] IN ( 1, 2, 3 )
+	OR [b2] IN ('1', '2', '3' )
+	OR [b3] IN ( )
+	OR [b4] IN ( 'one', 'two', 'three' )
+	OR [b5] IN ([col1] AS [one], [col2] AS [two], [col3] AS [three] )
+	OR [b6] IN ('one', 'two', 'three')
+	OR [b7] IN (NULL)
+	OR [b8] IN (RAND() [col1] > [col2] )
+	OR [b9] IN (  )
+	AND [c] = 'embedded '' string'
+	OR [d]=10
+	OR [e]=NULL
+	OR [true]= 1
+	OR [false]= 0
+	OR [str_null]=NULL
+	OR [str_not_null]='hello'
+LIMIT 10",
+	)),
+
+	$conn->translate("SELECT *
+FROM [db.table]
+WHERE ([test.a] LIKE %d", '1995-03-01', "
+	OR [b1] IN (", $array1, ")
+	OR [b2] IN (%s", $array1, ")
+	OR [b3] IN (%s", array(), ")
+	OR [b4] IN (", $array2, ")
+	OR [b5] IN (%n", $array3, ")
+	OR [b6] IN %l", $array3, "
+	OR [b7] IN %in", array(), "
+	OR [b8] IN (%sql", $array5, ")
+	OR [b9] IN (", array(), ")
+	AND [c] = 'embedded '' string'
+	OR [d]=%i", 10.3, "
+	OR [e]=%i", NULL, "
+	OR [true]=", TRUE, "
+	OR [false]=", FALSE, "
+	OR [str_null]=%sn", '', "
+	OR [str_not_null]=%sn", 'hello', "
+LIMIT 10")
+);
+
+
+Assert::same(
+	reformat('TEST  [cond] > 2 [cond2] = \'3\' cond3 < RAND() 123'),
+	$conn->translate('TEST %ex', array('[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()'), 123)
+);
+
+
+Assert::same(
+	reformat('TEST ([cond] > 2) OR ([cond2] > 3) OR ([cond3] = 10 + 1)'),
+	$conn->translate('TEST %or', array('`cond` > 2', array('[cond2] > %i', '3'), 'cond3%sql' => array('10 + 1')))
+);
+
+
+Assert::same(
+	reformat('TEST ([cond] = 2) OR ([cond3] = RAND())'),
+	$conn->translate('TEST %or', array('cond' => 2, 'cond3%sql' => 'RAND()'))
+);
+
+
+Assert::same(
+	reformat('TEST ([cond1] 3) OR ([cond2] RAND()) OR ([cond3] LIKE \'string\')'),
+	$conn->translate('TEST %or', array('cond1%ex' => 3, 'cond2%ex' => 'RAND()', 'cond3%ex' => array('LIKE %s', 'string')))
+);
+
+
+Assert::same(
+	reformat(array(
+		'odbc' => 'SELECT TOP 10 * FROM (SELECT * FROM [test] WHERE [id] LIKE \'%d%t\' ) t',
+		'SELECT * FROM [test] WHERE [id] LIKE \'%d%t\'  LIMIT 10',
+	)),
+	$conn->translate("SELECT * FROM [test] WHERE %n LIKE '%d%t' %lmt", 'id', 10)
+);
+
+
+$where = array(
+		'tablename.column' => 1,
+);
+Assert::same(
+	reformat('SELECT * FROM [tablename] WHERE ([tablename].[column] = 1)'),
+	$conn->translate('SELECT * FROM [tablename] WHERE %and', $where)
+);
+
+
+Assert::same(
+	reformat('SELECT FROM ... '),
+	$conn->translate('SELECT FROM ... %lmt', NULL)
+);
+
+Assert::same(
+	reformat('SELECT \'%i\''),
+	$conn->translate("SELECT '%i'")
+);
+
+Assert::same(
+	reformat('SELECT \'%i\''),
+	$conn->translate('SELECT "%i"')
+);
+
+
+Assert::same(
+	reformat('INSERT INTO [products] ([product_id], [title]) VALUES (1, SHA1(\'Test product\')) , (1, SHA1(\'Test product\'))'),
+	$conn->translate('INSERT INTO [products]', array(
+	'product_id' => 1,
+	'title' => array('SHA1(%s)', 'Test product'),
+), array(
+	'product_id' => 1,
+	'title' => array('SHA1(%s)', 'Test product'),
+))
+);
+
+Assert::same(
+	reformat('UPDATE [products] [product_id]=1, [title]=SHA1(\'Test product\')'),
+	$conn->translate('UPDATE [products]', array(
+	'product_id' => 1,
+	'title' => array('SHA1(%s)', 'Test product'),
+))
+);
+
+
+$e = Assert::exception(function() use ($conn) {
+	$array6 = array(
+		'id' => array(1, 2, 3, 4),
+		'text' => array('ahoj', 'jak', 'se', array('SUM(%i)', '5')),
+		'num%i' => array('1', ''),
+	);
+	$conn->translate('INSERT INTO test %m', $array6);
+}, 'DibiException', 'SQL translate error');
+Assert::same('INSERT INTO test **Multi-insert array "num%i" is different.**', $e->getSql());
+
+$array6 = array(
+	'id' => array(1, 2, 3, 4),
+	'text' => array('ahoj', 'jak', 'se', array('SUM(%i)', '5')),
+	'num%i' => array('1', '', 10.3, 1),
+);
+
+Assert::same(
+	reformat('INSERT INTO test ([id], [text], [num]) VALUES (1, \'ahoj\', 1), (2, \'jak\', 0), (3, \'se\', 10), (4, SUM(5), 1)'),
+	$conn->translate('INSERT INTO test %m', $array6)
+);
+
+
+$by = array (
+	array('funkce(nazev_pole) ASC'),
+	'jine_pole' => 'DESC'
+);
+
+Assert::same(
+	reformat('SELECT * FROM table ORDER BY funkce(nazev_pole) ASC, [jine_pole] DESC'),
+	$conn->translate("SELECT * FROM table ORDER BY %by", $by)
+);
+
+Assert::same(
+	reformat('INSERT INTO [test].*'),
+	$conn->translate('INSERT INTO [test.*]')
+);
+
+Assert::same(
+	reformat('INSERT INTO 0'),
+	$conn->translate('INSERT INTO %f', 'ahoj')
+);
+
+
+setLocale(LC_ALL, 'czech');
+
+Assert::same(
+	reformat("UPDATE [colors] SET [color]='blue', [price]=-12.4, [spec]=-9E-005, [spec2]=1000, [spec3]=10000, [spec4]=10000 WHERE [price]=123.5"),
+
+	$conn->translate("UPDATE [colors] SET", array(
+	'color' => 'blue',
+	'price' => -12.4,
+	'spec%f' => '-9E-005',
+	'spec2%f' => 1000.00,
+	'spec3%i' => 10000,
+	'spec4' => 10000,
+), "WHERE [price]=%f", 123.5)
+);

tests/dibi/Postgre.like.phpt

@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * @dataProvider ../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+if ($config['system'] !== 'pgsql') {
+	Tester\Environment::skip("Not supported system '$config[system]'.");
+}
+
+
+$tests = function($conn) {
+	Assert::false($conn->query("SELECT 'AAxBB' LIKE %~like~", 'A_B')->fetchSingle());
+	Assert::true( $conn->query("SELECT 'AA_BB' LIKE %~like~", 'A_B')->fetchSingle());
+
+	Assert::false($conn->query("SELECT 'AAxBB' LIKE %~like~", 'A%B')->fetchSingle());
+	Assert::true( $conn->query("SELECT 'AA%BB' LIKE %~like~", 'A%B')->fetchSingle());
+
+	Assert::same('AA\\BB', $conn->query("SELECT 'AA\\BB'")->fetchSingle());
+	Assert::false($conn->query("SELECT 'AAxBB' LIKE %~like~", 'A\\B')->fetchSingle());
+	Assert::true( $conn->query("SELECT 'AA\\BB' LIKE %~like~", 'A\\B')->fetchSingle());
+};
+
+$conn = new DibiConnection($config);
+$conn->query('SET escape_string_warning = off'); // do not log warnings
+
+$conn->query('SET standard_conforming_strings = on');
+$tests($conn);
+$conn->query('SET standard_conforming_strings = off');
+$tests($conn);

tests/dibi/bootstrap.php

@@ -14,5 +14,58 @@ Tester\Environment::setup();
 date_default_timezone_set('Europe/Prague');
 
 
-// load connections
-$config = require __DIR__ . '/config.php';
+// load connection
+try {
+	$config = Tester\Environment::loadData();
+} catch (Exception $e) {
+	$config = parse_ini_file(__DIR__ . '/../databases.ini', TRUE);
+	$config = $config['sqlite3'];
+}
+
+
+// lock
+define('TEMP_DIR', __DIR__ . '/../tmp');
+@mkdir(TEMP_DIR); // @ - directory may already exist
+Tester\Environment::lock($config['system'], TEMP_DIR);
+
+
+// ODBC
+if ($config['system'] === 'odbc') {
+	copy(__DIR__ . '/data/odbc.mdb', TEMP_DIR . '/odbc.mdb');
+	$config['dsn'] = str_replace('data/odbc.mdb', TEMP_DIR . '/odbc.mdb', $config['dsn']);
+}
+
+
+try {
+	new DibiConnection($config);
+} catch (DibiNotSupportedException $e) {
+	Tester\Environment::skip($e->getMessage());
+}
+
+
+function test(\Closure $function)
+{
+	$function();
+}
+
+
+/** Replaces [] with driver-specific quotes */
+function reformat($s)
+{
+	global $config;
+	if (is_array($s)) {
+		if (isset($s[$config['system']])) {
+			return $s[$config['system']];
+		}
+		$s = $s[0];
+	}
+	if ($config['system'] === 'mysql') {
+		return strtr($s, '[]', '``');
+	} elseif ($config['system'] === 'pgsql') {
+		return strtr($s, '[]', '""');
+	} elseif ($config['system'] === 'odbc' || $config['system'] === 'sqlite') {
+		return $s;
+	} else {
+		trigger_error("Unsupported driver $config[system]", E_USER_WARNING);
+	}
+}

tests/dibi/config.php

@@ -1,77 +0,0 @@
-<?php
-
-return array(
-	'mysql' => array(
-		'driver' => 'mysql',
-		'host' => 'localhost',
-		'username' => 'root',
-		'password' => 'xxx',
-		'charset' => 'utf8',
-	),
-
-	'mysqli' => array(
-		'driver' => 'mysqli',
-		'host' => 'localhost',
-		'username' => 'dibi',
-		'password' => 'dibi',
-		'charset' => 'utf8',
-	),
-
-	'sqlite' => array(
-		'driver' => 'sqlite',
-		'database' => dirname(__FILE__) . '/data/sample.sdb',
-	),
-
-	'sqlite3' => array(
-		'driver' => 'sqlite3',
-		'database' => dirname(__FILE__) . '/data/sample.sdb3',
-	),
-
-	'odbc' => array(
-		'driver' => 'odbc',
-		'username' => 'dibi',
-		'password' => 'dibi',
-		'dsn' => 'Driver={Microsoft Access Driver (*.mdb)};Dbq=' . dirname(__FILE__) . '/data/sample.mdb',
-	),
-
-	'postgresql' => array(
-		'driver' => 'postgre',
-		'host' => 'localhost',
-		'port' => '5432',
-		'username' => 'dibi',
-		'password' => 'dibi',
-		'persistent' => '1',
-	),
-
-	'sqlite-pdo' => array(
-		'driver' => 'pdo',
-		'dsn' => 'sqlite2::' . dirname(__FILE__) . '/data/sample.sdb',
-	),
-
-	'mysql-pdo' => array(
-		'driver' => 'pdo',
-		'dsn' => 'mysql:host=localhost',
-		'username' => 'dibi',
-		'password' => 'dibi',
-	),
-
-	'mssql' => array(
-		'driver' => 'mssql',
-		'host' => 'localhost',
-		'username' => 'dibi',
-		'password' => 'dibi',
-	),
-
-	'mssql2005' => array(
-		'driver' => 'mssql2005',
-		'host' => '(local)',
-		'username' => 'dibi',
-		'password' => 'dibi',
-	),
-
-	'oracle' => array(
-		'driver' => 'oracle',
-		'username' => 'dibi',
-		'password' => 'dibi',
-	),
-);

tests/dibi/data/mysql.sql

@@ -0,0 +1,52 @@
+/*!40102 SET storage_engine = InnoDB */;
+
+DROP DATABASE IF EXISTS dibi_test;
+CREATE DATABASE dibi_test;
+USE dibi_test;
+
+DROP TABLE IF EXISTS `products`;
+CREATE TABLE `products` (
+  `product_id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`product_id`),
+  KEY `title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO `products` (`product_id`, `title`) VALUES
+(1,	'Chair'),
+(3,	'Computer'),
+(2,	'Table');
+
+DROP TABLE IF EXISTS `customers`;
+CREATE TABLE `customers` (
+  `customer_id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`customer_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO `customers` (`customer_id`, `name`) VALUES
+(1, 'Dave Lister'),
+(2, 'Arnold Rimmer'),
+(3, 'The Cat'),
+(4, 'Holly'),
+(5, 'Kryten'),
+(6, 'Kristine Kochanski');
+
+DROP TABLE IF EXISTS `orders`;
+CREATE TABLE `orders` (
+  `order_id` int(11) NOT NULL AUTO_INCREMENT,
+  `customer_id` int(11) NOT NULL,
+  `product_id` int(11) NOT NULL,
+  `amount` float NOT NULL,
+  PRIMARY KEY (`order_id`),
+  KEY `customer_id` (`customer_id`),
+  KEY `product_id` (`product_id`),
+  CONSTRAINT `orders_ibfk_4` FOREIGN KEY (`product_id`) REFERENCES `products` (`product_id`) ON UPDATE CASCADE,
+  CONSTRAINT `orders_ibfk_3` FOREIGN KEY (`customer_id`) REFERENCES `customers` (`customer_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO `orders` (`order_id`, `customer_id`, `product_id`, `amount`) VALUES
+(1, 2, 1, 7),
+(2, 2, 3, 2),
+(3, 1, 2, 3),
+(4, 6, 3, 5);

tests/dibi/data/odbc.sql

@@ -0,0 +1,32 @@
+CREATE TABLE products (
+   product_id COUNTER,
+   title TEXT(50)
+);
+
+INSERT INTO products (product_id, title) VALUES (1,	'Chair');
+INSERT INTO products (product_id, title) VALUES (2,	'Table');
+INSERT INTO products (product_id, title) VALUES (3,	'Computer');
+
+CREATE TABLE [customers] (
+   [customer_id] COUNTER,
+   [name] TEXT(50)
+);
+
+INSERT INTO `customers` (`customer_id`, `name`) VALUES (1, 'Dave Lister');
+INSERT INTO `customers` (`customer_id`, `name`) VALUES (2, 'Arnold Rimmer');
+INSERT INTO `customers` (`customer_id`, `name`) VALUES (3, 'The Cat');
+INSERT INTO `customers` (`customer_id`, `name`) VALUES (4, 'Holly');
+INSERT INTO `customers` (`customer_id`, `name`) VALUES (5, 'Kryten');
+INSERT INTO `customers` (`customer_id`, `name`) VALUES (6, 'Kristine Kochanski');
+
+CREATE TABLE [orders] (
+   [order_id] INTEGER,
+   [customer_id] INTEGER,
+   [product_id] INTEGER,
+   [amount] FLOAT
+);
+
+INSERT INTO `orders` (`order_id`, `customer_id`, `product_id`, `amount`) VALUES (1, 2, 1, 7);
+INSERT INTO `orders` (`order_id`, `customer_id`, `product_id`, `amount`) VALUES (2, 2, 3, 2);
+INSERT INTO `orders` (`order_id`, `customer_id`, `product_id`, `amount`) VALUES (3, 1, 2, 3);
+INSERT INTO `orders` (`order_id`, `customer_id`, `product_id`, `amount`) VALUES (4, 6, 3, 5);

tests/dibi/data/pgsql.sql

@@ -0,0 +1,52 @@
+SET client_encoding = 'UTF8';
+DROP SCHEMA IF EXISTS public CASCADE;
+CREATE SCHEMA public;
+
+CREATE TABLE products (
+	product_id serial NOT NULL,
+	title varchar(100) DEFAULT NULL,
+	PRIMARY KEY (product_id)
+);
+
+INSERT INTO products (product_id, title) VALUES
+(1,	'Chair'),
+(2,	'Table'),
+(3,	'Computer');
+SELECT setval('products_product_id_seq', 3, TRUE);
+
+CREATE INDEX title ON products USING btree (title);
+
+CREATE TABLE customers (
+	customer_id serial NOT NULL,
+	name varchar(100) DEFAULT NULL,
+	PRIMARY KEY (customer_id)
+);
+
+INSERT INTO customers (customer_id, name) VALUES
+(1, 'Dave Lister'),
+(2, 'Arnold Rimmer'),
+(3, 'The Cat'),
+(4, 'Holly'),
+(5, 'Kryten'),
+(6, 'Kristine Kochanski');
+SELECT setval('customers_customer_id_seq', 6, TRUE);
+
+CREATE TABLE orders (
+	order_id serial NOT NULL,
+	customer_id integer NOT NULL,
+	product_id integer NOT NULL,
+	amount real NOT NULL
+);
+
+INSERT INTO orders (order_id, customer_id, product_id, amount) VALUES
+(1, 2, 1, 7),
+(2, 2, 3, 2),
+(3, 1, 2, 3),
+(4, 6, 3, 5);
+SELECT setval('orders_order_id_seq', 4, TRUE);
+
+ALTER TABLE ONLY orders
+    ADD CONSTRAINT orders_customer_id_fkey FOREIGN KEY (customer_id) REFERENCES customers(customer_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+ALTER TABLE ONLY orders
+    ADD CONSTRAINT orders_product_id_fkey FOREIGN KEY (product_id) REFERENCES products(product_id) ON UPDATE CASCADE ON DELETE RESTRICT;

tests/dibi/data/sample.mysql.sql

@@ -1,92 +0,0 @@
--- MySQL: 5.0.45
-
-SET FOREIGN_KEY_CHECKS=0;
-
-SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-
--- --------------------------------------------------------
-
-DROP TABLE IF EXISTS `customers`;
-CREATE TABLE IF NOT EXISTS `customers` (
-  `customer_id` int(11) NOT NULL auto_increment,
-  `name` varchar(100) default NULL,
-  PRIMARY KEY  (`customer_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=7 ;
-
-
-INSERT INTO `customers` (`customer_id`, `name`) VALUES
-(1, 'Dave Lister'),
-(2, 'Arnold Rimmer'),
-(3, 'The Cat'),
-(4, 'Holly'),
-(5, 'Kryten'),
-(6, 'Kristine Kochanski');
-
--- --------------------------------------------------------
-
-DROP TABLE IF EXISTS `enumtest`;
-CREATE TABLE IF NOT EXISTS `enumtest` (
-  `id` int(11) NOT NULL auto_increment,
-  `test` enum('a','b','c') NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
-
--- --------------------------------------------------------
-
-DROP TABLE IF EXISTS `orders`;
-CREATE TABLE IF NOT EXISTS `orders` (
-  `order_id` int(11) NOT NULL,
-  `customer_id` int(11) NOT NULL,
-  `product_id` int(11) NOT NULL,
-  `amount` float NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-INSERT INTO `orders` (`order_id`, `customer_id`, `product_id`, `amount`) VALUES
-(1, 2, 1, 7),
-(2, 2, 3, 2),
-(3, 1, 2, 3),
-(4, 6, 3, 5);
-
--- --------------------------------------------------------
-
-DROP TABLE IF EXISTS `products`;
-CREATE TABLE IF NOT EXISTS `products` (
-  `product_id` int(11) NOT NULL auto_increment,
-  `title` varchar(100) default NULL,
-  PRIMARY KEY  (`product_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
-
-INSERT INTO `products` (`product_id`, `title`) VALUES
-(1, 'Chair'),
-(2, 'Table'),
-(3, 'Computer');
-
--- --------------------------------------------------------
-
-DROP TABLE IF EXISTS `settest`;
-CREATE TABLE IF NOT EXISTS `settest` (
-  `id` int(11) NOT NULL auto_increment,
-  `test` set('a','b','c') NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
-DROP TABLE IF EXISTS `where`;
-CREATE TABLE IF NOT EXISTS `where` (
-  `select` int(11) NOT NULL,
-  `dot.dot` int(11) NOT NULL,
-  `is` int(11) NOT NULL,
-  `quot'n' space` int(11) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-INSERT INTO `where` (`select`, `dot.dot`, `is`, `quot'n' space`) VALUES
-(1, 2, 3, 4);
-
-SET FOREIGN_KEY_CHECKS=1;
-
-SET SQL_MODE="STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION";

tests/dibi/data/sqlite.sql

@@ -0,0 +1,34 @@
+CREATE TABLE [products] (
+	[product_id] INTEGER NOT NULL PRIMARY KEY,
+	[title] VARCHAR(100) NULL
+);
+
+CREATE INDEX "title" ON "products" ("title");
+
+INSERT INTO "products" ("product_id", "title") VALUES (1,	'Chair');
+INSERT INTO "products" ("product_id", "title") VALUES (2,	'Table');
+INSERT INTO "products" ("product_id", "title") VALUES (3,	'Computer');
+
+CREATE TABLE [customers] (
+	[customer_id] INTEGER PRIMARY KEY NOT NULL,
+	[name] VARCHAR(100) NULL
+);
+
+INSERT INTO "customers" ("customer_id", "name") VALUES (1,	'Dave Lister');
+INSERT INTO "customers" ("customer_id", "name") VALUES (2,	'Arnold Rimmer');
+INSERT INTO "customers" ("customer_id", "name") VALUES (3,	'The Cat');
+INSERT INTO "customers" ("customer_id", "name") VALUES (4,	'Holly');
+INSERT INTO "customers" ("customer_id", "name") VALUES (5,	'Kryten');
+INSERT INTO "customers" ("customer_id", "name") VALUES (6,	'Kristine Kochanski');
+
+CREATE TABLE [orders] (
+	[order_id] INTEGER NOT NULL PRIMARY KEY,
+	[customer_id] INTEGER NOT NULL,
+	[product_id] INTEGER NOT NULL,
+	[amount] FLOAT NOT NULL
+);
+
+INSERT INTO "orders" ("order_id", "customer_id", "product_id", "amount") VALUES (1,	2,	1,	'7.0');
+INSERT INTO "orders" ("order_id", "customer_id", "product_id", "amount") VALUES (2,	2,	3,	'2.0');
+INSERT INTO "orders" ("order_id", "customer_id", "product_id", "amount") VALUES (3,	1,	2,	'3.0');
+INSERT INTO "orders" ("order_id", "customer_id", "product_id", "amount") VALUES (4,	6,	3,	'5.0');

tests/dibi/meta.phpt

@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @dataProvider ../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+if ($config['system'] === 'odbc' || $config['driver'] === 'pdo') {
+	Tester\Environment::skip('Not supported.');
+}
+
+$conn = new DibiConnection($config);
+$conn->loadFile(__DIR__ . "/data/$config[system].sql");
+
+
+$meta = $conn->getDatabaseInfo();
+
+Assert::same(3, count($meta->getTables()));
+
+$names = $meta->getTableNames();
+sort($names);
+Assert::equal(array('customers', 'orders', 'products'), $names);
+
+Assert::false($meta->hasTable('xxxx'));
+
+$table = $meta->getTable('products');
+Assert::same('products', $table->name);
+Assert::false($table->isView());
+
+Assert::same(2, count($table->getColumns()));
+Assert::false($table->hasColumn('xxxx'));
+Assert::true($table->hasColumn('product_id'));
+Assert::true($table->hasColumn('Product_id'));
+Assert::same('product_id', $table->getColumn('Product_id')->name);
+
+$column = $table->getColumn('product_id');
+Assert::same('product_id', $column->name);
+Assert::same('products', $column->table->name);
+Assert::same('i', $column->type);
+Assert::type('string', $column->nativeType);
+Assert::false($column->nullable);
+Assert::true($column->autoIncrement);
+
+$column = $table->getColumn('title');
+Assert::same('title', $column->name);
+Assert::same('products', $column->table->name);
+Assert::same('s', $column->type);
+Assert::type('string', $column->nativeType);
+Assert::same(100, $column->size);
+Assert::true($column->nullable);
+Assert::false($column->autoIncrement);
+//Assert::null($column->default);
+
+
+$indexes = $table->getIndexes();
+$index = reset($indexes);
+
+if ($config['system'] !== 'sqlite') {
+	Assert::same(2, count($indexes));
+	Assert::true($index->primary);
+	Assert::true($index->unique);
+	Assert::same(1, count($index->getColumns()));
+	Assert::same('product_id', $index->columns[0]->name);
+
+	$index = next($indexes);
+}
+
+Assert::same('title', $index->name);
+Assert::false($index->primary);
+Assert::false($index->unique);
+Assert::same(1, count($index->getColumns()));
+Assert::same('title', $index->columns[0]->name);

tests/php-win.ini

@@ -1,3 +1,18 @@
 [PHP]
 extension_dir = "./ext"
+;extension=php_mssql.dll
+extension=php_mysql.dll
+extension=php_mysqli.dll
+;extension=php_oci8.dll
+;extension=php_oci8_11g.dll
+;extension=php_pdo_firebird.dll
+;extension=php_pdo_mssql.dll
+extension=php_pdo_mysql.dll
+;extension=php_pdo_oci.dll
+extension=php_pdo_odbc.dll
+extension=php_pdo_pgsql.dll
+extension=php_pdo_sqlite.dll
+extension=php_pgsql.dll
+extension=php_sqlite.dll
 extension=php_sqlite3.dll
+;extension=php_sqlsrv_ts.dll

version.txt

@@ -1 +1 @@
-Dibi 2.2.2 (released on 2014-06-30)
+Dibi 2.3.0 (released on 2015-01-23)