Released version 2.2.0

Add aposthrophes back to dates

.gitattributes

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

.travis.yml

@@ -0,0 +1,21 @@
+language: php
+php:
+    - 5.3.3
+    - 5.4
+    - 5.5
+    - 5.6
+    - hhvm
+
+matrix:
+    allow_failures:
+        - php: hhvm
+
+script: vendor/bin/tester tests -s -c tests/php-unix.ini
+
+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
+    - composer install --no-interaction --dev --prefer-source

composer.json

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

dibi/bridges/Nette-2.1/DibiNette21Extension.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 

dibi/bridges/Nette-2.1/DibiNettePanel.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -106,7 +102,7 @@ class DibiNettePanel extends DibiObject implements IBarPanel
 		}
 		return '<span title="dibi"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEYSURBVBgZBcHPio5hGAfg6/2+R980k6wmJgsJ5U/ZOAqbSc2GnXOwUg7BESgLUeIQ1GSjLFnMwsKGGg1qxJRmPM97/1zXFAAAAEADdlfZzr26miup2svnelq7d2aYgt3rebl585wN6+K3I1/9fJe7O/uIePP2SypJkiRJ0vMhr55FLCA3zgIAOK9uQ4MS361ZOSX+OrTvkgINSjS/HIvhjxNNFGgQsbSmabohKDNoUGLohsls6BaiQIMSs2FYmnXdUsygQYmumy3Nhi6igwalDEOJEjPKP7CA2aFNK8Bkyy3fdNCg7r9/fW3jgpVJbDmy5+PB2IYp4MXFelQ7izPrhkPHB+P5/PjhD5gCgCenx+VR/dODEwD+A3T7nqbxwf1HAAAAAElFTkSuQmCC" />'
 			. count($this->events) . ' queries'
-			. ($totalTime ? ' / ' . sprintf('%0.1f', $totalTime * 1000) . 'ms' : '')
+			. ($totalTime ? sprintf(' / %0.1f ms', $totalTime * 1000) : '')
 			. '</span>';
 	}
 
@@ -158,7 +154,7 @@ class DibiNettePanel extends DibiObject implements IBarPanel
 			'<style> #nette-debug td.nette-DibiProfiler-sql { background: white !important }
 			#nette-debug .nette-DibiProfiler-source { color: #999 !important }
 			#nette-debug nette-DibiProfiler tr table { margin: 8px 0; max-height: 150px; overflow:auto } </style>
-			<h1>Queries: ' . count($this->events) . ($totalTime === NULL ? '' : ', time: ' . sprintf('%0.3f', $totalTime * 1000) . ' ms') . '</h1>
+			<h1>Queries: ' . count($this->events) . ($totalTime === NULL ? '' : sprintf(', time: %0.3f ms', $totalTime * 1000)) . '</h1>
 			<div class="nette-inner nette-DibiProfiler">
 			<table>
 				<tr><th>Time&nbsp;ms</th><th>SQL Statement</th><th>Rows</th><th>Connection</th></tr>' . $s . '

dibi/bridges/Nette-2.2/DibiNette22Extension.php

@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * This file is part of the "dibi" - smart database abstraction layer.
+ * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
+ */
+
+namespace Dibi\Bridges\Nette;
+
+use dibi,
+	Nette;
+
+
+/**
+ * Dibi extension for Nette Framework 2.2. Creates 'connection' & 'panel' services.
+ *
+ * @author     David Grudl
+ * @package    dibi\nette
+ */
+class DibiExtension22 extends Nette\DI\CompilerExtension
+{
+
+	public function loadConfiguration()
+	{
+		$container = $this->getContainerBuilder();
+		$config = $this->getConfig();
+
+		$useProfiler = isset($config['profiler'])
+			? $config['profiler']
+			: class_exists('Tracy\Debugger') && $container->parameters['debugMode'];
+
+		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('Dibi\Bridges\Tracy\Panel');
+			$connection->addSetup(array($panel, 'register'), array($connection));
+		}
+	}
+
+}

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

@@ -0,0 +1,12 @@
+# This will create service named 'dibi.connection'.
+# Requires Nette Framework 2.2
+
+extensions:
+	dibi: Dibi\Bridges\Nette\DibiExtension22
+
+dibi:
+	host: localhost
+	username: root
+	password: ***
+	database: foo
+	lazy: TRUE

dibi/bridges/Tracy/Panel.php

@@ -0,0 +1,145 @@
+<?php
+
+/**
+ * This file is part of the "dibi" - smart database abstraction layer.
+ * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
+ */
+
+namespace Dibi\Bridges\Tracy;
+
+use dibi,
+	Tracy;
+
+
+/**
+ * Dibi panel for Tracy.
+ *
+ * @author     David Grudl
+ */
+class Panel extends \DibiObject implements Tracy\IBarPanel
+{
+	/** @var int maximum SQL length */
+	static public $maxLength = 1000;
+
+	/** @var bool  explain queries? */
+	public $explain;
+
+	/** @var int */
+	public $filter;
+
+	/** @var array */
+	private $events = array();
+
+
+	public function __construct($explain = TRUE, $filter = NULL)
+	{
+		$this->filter = $filter ? (int) $filter : \DibiEvent::QUERY;
+		$this->explain = $explain;
+	}
+
+
+	public function register(\DibiConnection $connection)
+	{
+		Tracy\Debugger::getBar()->addPanel($this);
+		Tracy\Debugger::getBlueScreen()->addPanel(array(__CLASS__, 'renderException'));
+		$connection->onEvent[] = array($this, 'logEvent');
+	}
+
+
+	/**
+	 * After event notification.
+	 * @return void
+	 */
+	public function logEvent(\DibiEvent $event)
+	{
+		if (($event->type & $this->filter) === 0) {
+			return;
+		}
+		$this->events[] = $event;
+	}
+
+
+	/**
+	 * Returns blue-screen custom tab.
+	 * @return mixed
+	 */
+	public static function renderException($e)
+	{
+		if ($e instanceof \DibiException && $e->getSql()) {
+			return array(
+				'tab' => 'SQL',
+				'panel' => dibi::dump($e->getSql(), TRUE),
+			);
+		}
+	}
+
+
+	/**
+	 * Returns HTML code for custom tab. (Tracy\IBarPanel)
+	 * @return mixed
+	 */
+	public function getTab()
+	{
+		$totalTime = 0;
+		foreach ($this->events as $event) {
+			$totalTime += $event->time;
+		}
+		return '<span title="dibi"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEYSURBVBgZBcHPio5hGAfg6/2+R980k6wmJgsJ5U/ZOAqbSc2GnXOwUg7BESgLUeIQ1GSjLFnMwsKGGg1qxJRmPM97/1zXFAAAAEADdlfZzr26miup2svnelq7d2aYgt3rebl585wN6+K3I1/9fJe7O/uIePP2SypJkiRJ0vMhr55FLCA3zgIAOK9uQ4MS361ZOSX+OrTvkgINSjS/HIvhjxNNFGgQsbSmabohKDNoUGLohsls6BaiQIMSs2FYmnXdUsygQYmumy3Nhi6igwalDEOJEjPKP7CA2aFNK8Bkyy3fdNCg7r9/fW3jgpVJbDmy5+PB2IYp4MXFelQ7izPrhkPHB+P5/PjhD5gCgCenx+VR/dODEwD+A3T7nqbxwf1HAAAAAElFTkSuQmCC" />'
+			. count($this->events) . ' queries'
+			. ($totalTime ? sprintf(' / %0.1f ms', $totalTime * 1000) : '')
+			. '</span>';
+	}
+
+
+	/**
+	 * Returns HTML code for custom panel. (Tracy\IBarPanel)
+	 * @return mixed
+	 */
+	public function getPanel()
+	{
+		$totalTime = $s = NULL;
+		$h = 'htmlSpecialChars';
+		foreach ($this->events as $event) {
+			$totalTime += $event->time;
+			$explain = NULL; // EXPLAIN is called here to work SELECT FOUND_ROWS()
+			if ($this->explain && $event->type === \DibiEvent::SELECT) {
+				try {
+					$backup = array($event->connection->onEvent, dibi::$numOfQueries, dibi::$totalTime);
+					$event->connection->onEvent = NULL;
+					$cmd = is_string($this->explain) ? $this->explain : ($event->connection->getConfig('driver') === 'oracle' ? 'EXPLAIN PLAN' : 'EXPLAIN');
+					$explain = dibi::dump($event->connection->nativeQuery("$cmd $event->sql"), TRUE);
+				} catch (\DibiException $e) {}
+				list($event->connection->onEvent, dibi::$numOfQueries, dibi::$totalTime) = $backup;
+			}
+
+			$s .= '<tr><td>' . sprintf('%0.3f', $event->time * 1000);
+			if ($explain) {
+				static $counter;
+				$counter++;
+				$s .= "<br /><a href='#tracy-debug-DibiProfiler-row-$counter' class='tracy-toggle tracy-collapsed' rel='#tracy-debug-DibiProfiler-row-$counter'>explain</a>";
+			}
+
+			$s .= '</td><td class="tracy-DibiProfiler-sql">' . dibi::dump(strlen($event->sql) > self::$maxLength ? substr($event->sql, 0, self::$maxLength) . '...' : $event->sql, TRUE);
+			if ($explain) {
+				$s .= "<div id='tracy-debug-DibiProfiler-row-$counter' class='tracy-collapsed'>{$explain}</div>";
+			}
+			if ($event->source) {
+				$s .= Tracy\Helpers::editorLink($event->source[0], $event->source[1]);//->class('tracy-DibiProfiler-source');
+			}
+
+			$s .= "</td><td>{$event->count}</td><td>{$h($event->connection->getConfig('driver') . '/' . $event->connection->getConfig('name'))}</td></tr>";
+		}
+
+		return empty($this->events) ? '' :
+			'<style> #tracy-debug td.tracy-DibiProfiler-sql { background: white !important }
+			#tracy-debug .tracy-DibiProfiler-source { color: #999 !important }
+			#tracy-debug tracy-DibiProfiler tr table { margin: 8px 0; max-height: 150px; overflow:auto } </style>
+			<h1>Queries: ' . count($this->events) . ($totalTime === NULL ? '' : sprintf(', time: %0.3f ms', $totalTime * 1000)) . '</h1>
+			<div class="tracy-inner tracy-DibiProfiler">
+			<table>
+				<tr><th>Time&nbsp;ms</th><th>SQL Statement</th><th>Rows</th><th>Connection</th></tr>' . $s . '
+			</table>
+			</div>';
+	}
+
+}

dibi/dibi.php

@@ -4,9 +4,6 @@
  * dibi - smart database abstraction layer (http://dibiphp.com)
  *
  * Copyright (c) 2005, 2012 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -17,10 +14,9 @@ if (version_compare(PHP_VERSION, '5.2.0', '<')) {
 	throw new Exception('dibi needs PHP 5.2.0 or newer.');
 }
 
-@set_magic_quotes_runtime(FALSE); // intentionally @
-
 
 require_once dirname(__FILE__) . '/libs/interfaces.php';
+require_once dirname(__FILE__) . '/libs/Dibi.php';
 require_once dirname(__FILE__) . '/libs/DibiDateTime.php';
 require_once dirname(__FILE__) . '/libs/DibiObject.php';
 require_once dirname(__FILE__) . '/libs/DibiLiteral.php';
@@ -37,598 +33,7 @@ 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/DibiNettePanel.php';
-}
-
-
-/**
- * Interface for database drivers.
- *
- * This class is static container class for creating DB objects and
- * store connections info.
- *
- * @author     David Grudl
- * @package    dibi
- */
-class dibi
-{
-	/** column type */
-	const TEXT = 's', // as 'string'
-		BINARY = 'bin',
-		BOOL = 'b',
-		INTEGER = 'i',
-		FLOAT = 'f',
-		DATE = 'd',
-		DATETIME = 't',
-		TIME = 't';
-
-	const IDENTIFIER = 'n';
-
-	/** @deprecated */
-	const FIELD_TEXT = dibi::TEXT,
-		FIELD_BINARY = dibi::BINARY,
-		FIELD_BOOL = dibi::BOOL,
-		FIELD_INTEGER = dibi::INTEGER,
-		FIELD_FLOAT = dibi::FLOAT,
-		FIELD_DATE = dibi::DATE,
-		FIELD_DATETIME = dibi::DATETIME,
-		FIELD_TIME = dibi::TIME;
-
-	/** version */
-	const VERSION = '2.1.1',
-		REVISION = '$WCREV$ released on $WCDATE$';
-
-	/** sorting order */
-	const ASC = 'ASC',
-		DESC = 'DESC';
-
-	/** @var DibiConnection[]  Connection registry storage for DibiConnection objects */
-	private static $registry = array();
-
-	/** @var DibiConnection  Current connection */
-	private static $connection;
-
-	/** @var array  @see addHandler */
-	private static $handlers = array();
-
-	/** @var string  Last SQL command @see dibi::query() */
-	public static $sql;
-
-	/** @var int  Elapsed time for last query */
-	public static $elapsedTime;
-
-	/** @var int  Elapsed time for all queries */
-	public static $totalTime;
-
-	/** @var int  Number or queries */
-	public static $numOfQueries = 0;
-
-	/** @var string  Default dibi driver */
-	public static $defaultDriver = 'mysql';
-
-
-	/**
-	 * Static class - cannot be instantiated.
-	 */
-	final public function __construct()
-	{
-		throw new LogicException("Cannot instantiate static class " . get_class($this));
-	}
-
-
-	/********************* connections handling ****************d*g**/
-
-
-	/**
-	 * 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)
-	{
-		return self::$connection = self::$registry[$name] = new DibiConnection($config, $name);
-	}
-
-
-	/**
-	 * Disconnects from database (doesn't destroy DibiConnection object).
-	 * @return void
-	 */
-	public static function disconnect()
-	{
-		self::getConnection()->disconnect();
-	}
-
-
-	/**
-	 * Returns TRUE when connection was established.
-	 * @return bool
-	 */
-	public static function isConnected()
-	{
-		return (self::$connection !== NULL) && self::$connection->isConnected();
-	}
-
-
-	/**
-	 * Retrieve active connection.
-	 * @param  string   connection registy name
-	 * @return DibiConnection
-	 * @throws DibiException
-	 */
-	public static function getConnection($name = NULL)
-	{
-		if ($name === NULL) {
-			if (self::$connection === NULL) {
-				throw new DibiException('Dibi is not connected to database.');
-			}
-
-			return self::$connection;
-		}
-
-		if (!isset(self::$registry[$name])) {
-			throw new DibiException("There is no connection named '$name'.");
-		}
-
-		return self::$registry[$name];
-	}
-
-
-	/**
-	 * Sets connection.
-	 * @param  DibiConnection
-	 * @return DibiConnection
-	 */
-	public static function setConnection(DibiConnection $connection)
-	{
-		return self::$connection = $connection;
-	}
-
-
-	/**
-	 * Change active connection.
-	 * @param  string   connection registy name
-	 * @return void
-	 * @throws DibiException
-	 */
-	public static function activate($name)
-	{
-		self::$connection = self::getConnection($name);
-	}
-
-
-	/********************* monostate for active connection ****************d*g**/
-
-
-	/**
-	 * Generates and executes SQL query - Monostate for DibiConnection::query().
-	 * @param  array|mixed      one or more arguments
-	 * @return DibiResult|int   result set object (if any)
-	 * @throws DibiException
-	 */
-	public static function query($args)
-	{
-		$args = func_get_args();
-		return self::getConnection()->query($args);
-	}
-
-
-	/**
-	 * Executes the SQL query - Monostate for DibiConnection::nativeQuery().
-	 * @param  string           SQL statement.
-	 * @return DibiResult|int   result set object (if any)
-	 */
-	public static function nativeQuery($sql)
-	{
-		return self::getConnection()->nativeQuery($sql);
-	}
-
-
-	/**
-	 * Generates and prints SQL query - Monostate for DibiConnection::test().
-	 * @param  array|mixed  one or more arguments
-	 * @return bool
-	 */
-	public static function test($args)
-	{
-		$args = func_get_args();
-		return self::getConnection()->test($args);
-	}
-
-
-	/**
-	 * Generates and returns SQL query as DibiDataSource - Monostate for DibiConnection::test().
-	 * @param  array|mixed      one or more arguments
-	 * @return DibiDataSource
-	 */
-	public static function dataSource($args)
-	{
-		$args = func_get_args();
-		return self::getConnection()->dataSource($args);
-	}
-
-
-	/**
-	 * Executes SQL query and fetch result - Monostate for DibiConnection::query() & fetch().
-	 * @param  array|mixed    one or more arguments
-	 * @return DibiRow
-	 * @throws DibiException
-	 */
-	public static function fetch($args)
-	{
-		$args = func_get_args();
-		return self::getConnection()->query($args)->fetch();
-	}
-
-
-	/**
-	 * Executes SQL query and fetch results - Monostate for DibiConnection::query() & fetchAll().
-	 * @param  array|mixed    one or more arguments
-	 * @return array of DibiRow
-	 * @throws DibiException
-	 */
-	public static function fetchAll($args)
-	{
-		$args = func_get_args();
-		return self::getConnection()->query($args)->fetchAll();
-	}
-
-
-	/**
-	 * Executes SQL query and fetch first column - Monostate for DibiConnection::query() & fetchSingle().
-	 * @param  array|mixed    one or more arguments
-	 * @return string
-	 * @throws DibiException
-	 */
-	public static function fetchSingle($args)
-	{
-		$args = func_get_args();
-		return self::getConnection()->query($args)->fetchSingle();
-	}
-
-
-	/**
-	 * Executes SQL query and fetch pairs - Monostate for DibiConnection::query() & fetchPairs().
-	 * @param  array|mixed    one or more arguments
-	 * @return string
-	 * @throws DibiException
-	 */
-	public static function fetchPairs($args)
-	{
-		$args = func_get_args();
-		return self::getConnection()->query($args)->fetchPairs();
-	}
-
-
-	/**
-	 * Gets the number of affected rows.
-	 * Monostate for DibiConnection::getAffectedRows()
-	 * @return int  number of rows
-	 * @throws DibiException
-	 */
-	public static function getAffectedRows()
-	{
-		return self::getConnection()->getAffectedRows();
-	}
-
-
-	/**
-	 * Gets the number of affected rows. Alias for getAffectedRows().
-	 * @return int  number of rows
-	 * @throws DibiException
-	 */
-	public static function affectedRows()
-	{
-		return self::getConnection()->getAffectedRows();
-	}
-
-
-	/**
-	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * Monostate for DibiConnection::getInsertId()
-	 * @param  string     optional sequence name
-	 * @return int
-	 * @throws DibiException
-	 */
-	public static function getInsertId($sequence=NULL)
-	{
-		return self::getConnection()->getInsertId($sequence);
-	}
-
-
-	/**
-	 * Retrieves the ID generated for an AUTO_INCREMENT column. Alias for getInsertId().
-	 * @param  string     optional sequence name
-	 * @return int
-	 * @throws DibiException
-	 */
-	public static function insertId($sequence=NULL)
-	{
-		return self::getConnection()->getInsertId($sequence);
-	}
-
-
-	/**
-	 * Begins a transaction - Monostate for DibiConnection::begin().
-	 * @param  string  optional savepoint name
-	 * @return void
-	 * @throws DibiException
-	 */
-	public static function begin($savepoint = NULL)
-	{
-		self::getConnection()->begin($savepoint);
-	}
-
-
-	/**
-	 * Commits statements in a transaction - Monostate for DibiConnection::commit($savepoint = NULL).
-	 * @param  string  optional savepoint name
-	 * @return void
-	 * @throws DibiException
-	 */
-	public static function commit($savepoint = NULL)
-	{
-		self::getConnection()->commit($savepoint);
-	}
-
-
-	/**
-	 * Rollback changes in a transaction - Monostate for DibiConnection::rollback().
-	 * @param  string  optional savepoint name
-	 * @return void
-	 * @throws DibiException
-	 */
-	public static function rollback($savepoint = NULL)
-	{
-		self::getConnection()->rollback($savepoint);
-	}
-
-
-	/**
-	 * Gets a information about the current database - Monostate for DibiConnection::getDatabaseInfo().
-	 * @return DibiDatabaseInfo
-	 */
-	public static function getDatabaseInfo()
-	{
-		return self::getConnection()->getDatabaseInfo();
-	}
-
-
-	/**
-	 * Import SQL dump from file - extreme fast!
-	 * @param  string  filename
-	 * @return int  count of sql commands
-	 */
-	public static function loadFile($file)
-	{
-		return self::getConnection()->loadFile($file);
-	}
-
-
-	/**
-	 * Replacement for majority of dibi::methods() in future.
-	 */
-	public static function __callStatic($name, $args)
-	{
-		//if ($name = 'select', 'update', ...') {
-		// return self::command()->$name($args);
-		//}
-		return call_user_func_array(array(self::getConnection(), $name), $args);
-	}
-
-
-	/********************* fluent SQL builders ****************d*g**/
-
-
-	/**
-	 * @return DibiFluent
-	 */
-	public static function command()
-	{
-		return self::getConnection()->command();
-	}
-
-
-	/**
-	 * @param  string    column name
-	 * @return DibiFluent
-	 */
-	public static function select($args)
-	{
-		$args = func_get_args();
-		return call_user_func_array(array(self::getConnection(), 'select'), $args);
-	}
-
-
-	/**
-	 * @param  string   table
-	 * @param  array
-	 * @return DibiFluent
-	 */
-	public static function update($table, $args)
-	{
-		return self::getConnection()->update($table, $args);
-	}
-
-
-	/**
-	 * @param  string   table
-	 * @param  array
-	 * @return DibiFluent
-	 */
-	public static function insert($table, $args)
-	{
-		return self::getConnection()->insert($table, $args);
-	}
-
-
-	/**
-	 * @param  string   table
-	 * @return DibiFluent
-	 */
-	public static function delete($table)
-	{
-		return self::getConnection()->delete($table);
-	}
-
-
-	/********************* data types ****************d*g**/
-
-
-	/**
-	 * @deprecated
-	 */
-	public static function datetime($time = NULL)
-	{
-		trigger_error(__METHOD__ . '() is deprecated; create DateTime object instead.', E_USER_WARNING);
-		return new DibiDateTime($time);
-	}
-
-
-	/**
-	 * @deprecated
-	 */
-	public static function date($date = NULL)
-	{
-		trigger_error(__METHOD__ . '() is deprecated; create DateTime object instead.', E_USER_WARNING);
-		return new DibiDateTime($date);
-	}
-
-
-	/********************* substitutions ****************d*g**/
-
-
-	/**
-	 * Returns substitution hashmap - Monostate for DibiConnection::getSubstitutes().
-	 * @return DibiHashMap
-	 */
-	public static function getSubstitutes()
-	{
-		return self::getConnection()->getSubstitutes();
-	}
-
-
-	/** @deprecated */
-	public static function addSubst($expr, $subst)
-	{
-		trigger_error(__METHOD__ . '() is deprecated; use dibi::getSubstitutes()->expr = val; instead.', E_USER_WARNING);
-		self::getSubstitutes()->$expr = $subst;
-	}
-
-
-	/** @deprecated */
-	public static function removeSubst($expr)
-	{
-		trigger_error(__METHOD__ . '() is deprecated; use unset(dibi::getSubstitutes()->expr) instead.', E_USER_WARNING);
-		$substitutes = self::getSubstitutes();
-		if ($expr === TRUE) {
-			foreach ($substitutes as $expr => $foo) {
-				unset($substitutes->$expr);
-			}
-		} else {
-			unset($substitutes->$expr);
-		}
-	}
-
-
-	/** @deprecated */
-	public static function setSubstFallback($callback)
-	{
-		trigger_error(__METHOD__ . '() is deprecated; use dibi::getSubstitutes()->setCallback() instead.', E_USER_WARNING);
-		self::getSubstitutes()->setCallback($callback);
-	}
-
-
-	/********************* misc tools ****************d*g**/
-
-
-	/**
-	 * Prints out a syntax highlighted version of the SQL command or DibiResult.
-	 * @param  string|DibiResult
-	 * @param  bool  return output instead of printing it?
-	 * @return string
-	 */
-	public static function dump($sql = NULL, $return = FALSE)
-	{
-		ob_start();
-		if ($sql instanceof DibiResult) {
-			$sql->dump();
-
-		} else {
-			if ($sql === NULL) {
-				$sql = self::$sql;
-			}
-
-			static $keywords1 = 'SELECT|(?:ON\s+DUPLICATE\s+KEY)?UPDATE|INSERT(?:\s+INTO)?|REPLACE(?:\s+INTO)?|DELETE|CALL|UNION|FROM|WHERE|HAVING|GROUP\s+BY|ORDER\s+BY|LIMIT|OFFSET|SET|VALUES|LEFT\s+JOIN|INNER\s+JOIN|TRUNCATE';
-			static $keywords2 = 'ALL|DISTINCT|DISTINCTROW|IGNORE|AS|USING|ON|AND|OR|IN|IS|NOT|NULL|LIKE|RLIKE|REGEXP|TRUE|FALSE';
-
-			// insert new lines
-			$sql = " $sql ";
-			$sql = preg_replace("#(?<=[\\s,(])($keywords1)(?=[\\s,)])#i", "\n\$1", $sql);
-
-			// reduce spaces
-			$sql = preg_replace('#[ \t]{2,}#', " ", $sql);
-
-			$sql = wordwrap($sql, 100);
-			$sql = preg_replace("#([ \t]*\r?\n){2,}#", "\n", $sql);
-
-			// syntax highlight
-			$highlighter = "#(/\\*.+?\\*/)|(\\*\\*.+?\\*\\*)|(?<=[\\s,(])($keywords1)(?=[\\s,)])|(?<=[\\s,(=])($keywords2)(?=[\\s,)=])#is";
-			if (PHP_SAPI === 'cli') {
-				if (substr(getenv('TERM'), 0, 5) === 'xterm') {
-					$sql = preg_replace_callback($highlighter, array('dibi', 'cliHighlightCallback'), $sql);
-				}
-				echo trim($sql) . "\n\n";
-
-			} else {
-				$sql = htmlSpecialChars($sql);
-				$sql = preg_replace_callback($highlighter, array('dibi', 'highlightCallback'), $sql);
-				echo '<pre class="dump">', trim($sql), "</pre>\n\n";
-			}
-		}
-
-		if ($return) {
-			return ob_get_clean();
-		} else {
-			ob_end_flush();
-		}
-	}
-
-
-	private static function highlightCallback($matches)
-	{
-		if (!empty($matches[1])) { // comment
-			return '<em style="color:gray">' . $matches[1] . '</em>';
-
-		} elseif (!empty($matches[2])) { // error
-			return '<strong style="color:red">' . $matches[2] . '</strong>';
-
-		} elseif (!empty($matches[3])) { // most important keywords
-			return '<strong style="color:blue">' . $matches[3] . '</strong>';
-
-		} elseif (!empty($matches[4])) { // other keywords
-			return '<strong style="color:green">' . $matches[4] . '</strong>';
-		}
-	}
-
-
-	private static function cliHighlightCallback($matches)
-	{
-		if (!empty($matches[1])) { // comment
-			return "\033[1;30m" . $matches[1] . "\033[0m";
-
-		} elseif (!empty($matches[2])) { // error
-			return "\033[1;31m" . $matches[2] . "\033[0m";
-
-		} elseif (!empty($matches[3])) { // most important keywords
-			return "\033[1;34m" . $matches[3] . "\033[0m";
-
-		} elseif (!empty($matches[4])) { // other keywords
-			return "\033[1;32m" . $matches[4] . "\033[0m";
-		}
-	}
-
+	require_once dirname(__FILE__) . '/bridges/Nette-2.1/DibiNettePanel.php';
 }

dibi/drivers/DibiFirebirdDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -281,10 +277,11 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
 				return $value ? 1 : 0;
 
 			case dibi::DATE:
-				return $value instanceof DateTime ? $value->format("'Y-m-d'") : date("'Y-m-d'", $value);
-
 			case dibi::DATETIME:
-				return $value instanceof DateTime ? $value->format("'Y-m-d H:i:s'") : date("'Y-m-d H:i:s'", $value);
+				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'");
 
 			default:
 				throw new InvalidArgumentException('Unsupported type.');

dibi/drivers/DibiMsSql2005Driver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -237,10 +233,11 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
 				return $value ? 1 : 0;
 
 			case dibi::DATE:
-				return $value instanceof DateTime ? $value->format("'Y-m-d'") : date("'Y-m-d'", $value);
-
 			case dibi::DATETIME:
-				return $value instanceof DateTime ? $value->format("'Y-m-d H:i:s'") : date("'Y-m-d H:i:s'", $value);
+				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'");
 
 			default:
 				throw new InvalidArgumentException('Unsupported type.');

dibi/drivers/DibiMsSql2005Reflector.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 

dibi/drivers/DibiMsSqlDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 require_once dirname(__FILE__) . '/DibiMsSqlReflector.php';
@@ -222,10 +218,11 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 				return $value ? 1 : 0;
 
 			case dibi::DATE:
-				return $value instanceof DateTime ? $value->format("'Y-m-d'") : date("'Y-m-d'", $value);
-
 			case dibi::DATETIME:
-				return $value instanceof DateTime ? $value->format("'Y-m-d H:i:s'") : date("'Y-m-d H:i:s'", $value);
+				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'");
 
 			default:
 				throw new InvalidArgumentException('Unsupported type.');

dibi/drivers/DibiMsSqlReflector.php

@@ -5,9 +5,6 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
- *
  * @package    dibi\drivers
  */
 

dibi/drivers/DibiMySqlDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -316,10 +312,11 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
 				return $value ? 1 : 0;
 
 			case dibi::DATE:
-				return $value instanceof DateTime ? $value->format("'Y-m-d'") : date("'Y-m-d'", $value);
-
 			case dibi::DATETIME:
-				return $value instanceof DateTime ? $value->format("'Y-m-d H:i:s'") : date("'Y-m-d H:i:s'", $value);
+				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'");
 
 			default:
 				throw new InvalidArgumentException('Unsupported type.');

dibi/drivers/DibiMySqlReflector.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -115,10 +111,40 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector
 	 * Returns metadata for all foreign keys in a table.
 	 * @param  string
 	 * @return array
+	 * @throws DibiNotSupportedException
 	 */
 	public function getForeignKeys($table)
 	{
-		throw new DibiNotImplementedException;
+		$data = $this->driver->query("SELECT `ENGINE` FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = {$this->driver->escape($table, dibi::TEXT)}")->fetch(TRUE);
+		if ($data['ENGINE'] !== 'InnoDB') {
+			throw new DibiNotSupportedException("Foreign keys are not supported in {$data['ENGINE']} tables.");
+		}
+
+		$res = $this->driver->query("
+			SELECT rc.CONSTRAINT_NAME, rc.UPDATE_RULE, rc.DELETE_RULE, kcu.REFERENCED_TABLE_NAME,
+				GROUP_CONCAT(kcu.REFERENCED_COLUMN_NAME ORDER BY kcu.ORDINAL_POSITION) AS REFERENCED_COLUMNS,
+				GROUP_CONCAT(kcu.COLUMN_NAME ORDER BY kcu.ORDINAL_POSITION) AS COLUMNS
+			FROM information_schema.REFERENTIAL_CONSTRAINTS rc
+			INNER JOIN information_schema.KEY_COLUMN_USAGE kcu ON
+				kcu.CONSTRAINT_NAME = rc.CONSTRAINT_NAME
+				AND kcu.CONSTRAINT_SCHEMA = rc.CONSTRAINT_SCHEMA
+			WHERE rc.CONSTRAINT_SCHEMA = DATABASE()
+				AND rc.TABLE_NAME = {$this->driver->escape($table, dibi::TEXT)}
+			GROUP BY rc.CONSTRAINT_NAME
+		");
+
+		$foreignKeys = array();
+		while ($row = $res->fetch(TRUE)) {
+			$keyName = $row['CONSTRAINT_NAME'];
+
+			$foreignKeys[$keyName]['name'] = $keyName;
+			$foreignKeys[$keyName]['local'] = explode(",", $row['COLUMNS']);
+			$foreignKeys[$keyName]['table'] = $row['REFERENCED_TABLE_NAME'];
+			$foreignKeys[$keyName]['foreign'] = explode(",", $row['REFERENCED_COLUMNS']);
+			$foreignKeys[$keyName]['onDelete'] = $row['DELETE_RULE'];
+			$foreignKeys[$keyName]['onUpdate'] = $row['UPDATE_RULE'];
+		}
+		return array_values($foreignKeys);
 	}
 
 }

dibi/drivers/DibiMySqliDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -119,12 +115,7 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 		}
 
 		if (isset($config['charset'])) {
-			$ok = FALSE;
-			if (version_compare(PHP_VERSION , '5.1.5', '>=')) {
-				// affects the character set used by mysql_real_escape_string() (was added in MySQL 5.0.7 and PHP 5.0.5, fixed in PHP 5.1.5)
-				$ok = @mysqli_set_charset($this->connection, $config['charset']); // intentionally @
-			}
-			if (!$ok) {
+			if (!@mysqli_set_charset($this->connection, $config['charset'])) {
 				$this->query("SET NAMES '$config[charset]'");
 			}
 		}
@@ -304,10 +295,11 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 				return $value ? 1 : 0;
 
 			case dibi::DATE:
-				return $value instanceof DateTime ? $value->format("'Y-m-d'") : date("'Y-m-d'", $value);
-
 			case dibi::DATETIME:
-				return $value instanceof DateTime ? $value->format("'Y-m-d H:i:s'") : date("'Y-m-d H:i:s'", $value);
+				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'");
 
 			default:
 				throw new InvalidArgumentException('Unsupported type.');
@@ -461,7 +453,7 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 	public function getResultResource()
 	{
 		$this->autoFree = FALSE;
-		return @$this->resultSet->type === NULL ? NULL : $this->resultSet;
+		return $this->resultSet === NULL || $this->resultSet->type === NULL ? NULL : $this->resultSet;
 	}
 
 }

dibi/drivers/DibiOdbcDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -245,10 +241,11 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
 				return $value ? 1 : 0;
 
 			case dibi::DATE:
-				return $value instanceof DateTime ? $value->format("#m/d/Y#") : date("#m/d/Y#", $value);
-
 			case dibi::DATETIME:
-				return $value instanceof DateTime ? $value->format("#m/d/Y H:i:s#") : date("#m/d/Y H:i:s#", $value);
+				if (!$value instanceof DateTime && !$value instanceof DateTimeInterface) {
+					$value = new DibiDateTime($value);
+				}
+				return $value->format($type === dibi::DATETIME ? "#m/d/Y H:i:s#" : "#m/d/Y#");
 
 			default:
 				throw new InvalidArgumentException('Unsupported type.');

dibi/drivers/DibiOracleDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -239,10 +235,11 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 				return $value ? 1 : 0;
 
 			case dibi::DATE:
-				return $value instanceof DateTime ? $value->format($this->fmtDate) : date($this->fmtDate, $value);
-
 			case dibi::DATETIME:
-				return $value instanceof DateTime ? $value->format($this->fmtDateTime) : date($this->fmtDateTime, $value);
+				if (!$value instanceof DateTime && !$value instanceof DateTimeInterface) {
+					$value = new DibiDateTime($value);
+				}
+				return $value->format($type === dibi::DATETIME ? $this->fmtDateTime : $this->fmtDate);
 
 			default:
 				throw new InvalidArgumentException('Unsupported type.');

dibi/drivers/DibiPdoDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -282,10 +278,11 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
 				return $this->connection->quote($value, PDO::PARAM_BOOL);
 
 			case dibi::DATE:
-				return $value instanceof DateTime ? $value->format("'Y-m-d'") : date("'Y-m-d'", $value);
-
 			case dibi::DATETIME:
-				return $value instanceof DateTime ? $value->format("'Y-m-d H:i:s'") : date("'Y-m-d H:i:s'", $value);
+				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'");
 
 			default:
 				throw new InvalidArgumentException('Unsupported type.');

dibi/drivers/DibiPostgreDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -39,9 +35,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	/** @var int|FALSE  Affected rows */
 	private $affectedRows = FALSE;
 
-	/** @var bool  Escape method */
-	private $escMethod = FALSE;
-
 
 	/**
 	 * @throws DibiNotSupportedException
@@ -107,8 +100,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 		if (isset($config['schema'])) {
 			$this->query('SET search_path TO "' . $config['schema'] . '"');
 		}
-
-		$this->escMethod = version_compare(PHP_VERSION , '5.2.0', '>=');
 	}
 
 
@@ -270,24 +261,16 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	{
 		switch ($type) {
 			case dibi::TEXT:
-				if ($this->escMethod) {
-					if (!is_resource($this->connection)) {
-						throw new DibiException('Lost connection to server.');
-					}
-					return "'" . pg_escape_string($this->connection, $value) . "'";
-				} else {
-					return "'" . pg_escape_string($value) . "'";
+				if (!is_resource($this->connection)) {
+					throw new DibiException('Lost connection to server.');
 				}
+				return "'" . pg_escape_string($this->connection, $value) . "'";
 
 			case dibi::BINARY:
-				if ($this->escMethod) {
-					if (!is_resource($this->connection)) {
-						throw new DibiException('Lost connection to server.');
-					}
-					return "'" . pg_escape_bytea($this->connection, $value) . "'";
-				} else {
-					return "'" . pg_escape_bytea($value) . "'";
+				if (!is_resource($this->connection)) {
+					throw new DibiException('Lost connection to server.');
 				}
+				return "'" . pg_escape_bytea($this->connection, $value) . "'";
 
 			case dibi::IDENTIFIER:
 				// @see http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
@@ -297,10 +280,11 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 				return $value ? 'TRUE' : 'FALSE';
 
 			case dibi::DATE:
-				return $value instanceof DateTime ? $value->format("'Y-m-d'") : date("'Y-m-d'", $value);
-
 			case dibi::DATETIME:
-				return $value instanceof DateTime ? $value->format("'Y-m-d H:i:s'") : date("'Y-m-d H:i:s'", $value);
+				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'");
 
 			default:
 				throw new InvalidArgumentException('Unsupported type.');
@@ -316,12 +300,7 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	 */
 	public function escapeLike($value, $pos)
 	{
-		if ($this->escMethod) {
-			$value = pg_escape_string($this->connection, $value);
-		} else {
-			$value = pg_escape_string($value);
-	}
-
+		$value = pg_escape_string($this->connection, $value);
 		$value = strtr($value, array( '%' => '\\\\%', '_' => '\\\\_'));
 		return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
 	}
@@ -421,13 +400,12 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	 */
 	public function getResultColumns()
 	{
-		$hasTable = version_compare(PHP_VERSION , '5.2.0', '>=');
 		$count = pg_num_fields($this->resultSet);
 		$columns = array();
 		for ($i = 0; $i < $count; $i++) {
 			$row = array(
 				'name'      => pg_field_name($this->resultSet, $i),
-				'table'     => $hasTable ? pg_field_table($this->resultSet, $i) : NULL,
+				'table'     => pg_field_table($this->resultSet, $i),
 				'nativetype'=> pg_field_type($this->resultSet, $i),
 			);
 			$row['fullname'] = $row['table'] ? $row['table'] . '.' . $row['name'] : $row['name'];
@@ -462,7 +440,7 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 			throw new DibiDriverException('Reflection requires PostgreSQL 7.4 and newer.');
 		}
 
-		$res = $this->query("
+		$query = "
 			SELECT
 				table_name AS name,
 				CASE table_type
@@ -472,8 +450,20 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 			FROM
 				information_schema.tables
 			WHERE
-				table_schema = current_schema()
-		");
+				table_schema = current_schema()";
+
+		if ($version >= 9.3) {
+			$query .= "
+				UNION ALL
+				SELECT
+					matviewname, 1
+				FROM
+					pg_matviews
+				WHERE
+					schemaname = current_schema()";
+		}
+
+		$res = $this->query($query);
 		$tables = pg_fetch_all($res->resultSet);
 		return $tables ? $tables : array();
 	}
@@ -501,6 +491,31 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 			WHERE table_name = $_table AND table_schema = current_schema()
 			ORDER BY ordinal_position
 		");
+
+		if (!$res->getRowCount()) {
+			$res = $this->query("
+				SELECT
+					a.attname AS column_name,
+					pg_type.typname AS udt_name,
+					a.attlen AS numeric_precision,
+					a.atttypmod-4 AS character_maximum_length,
+					NOT a.attnotnull AS is_nullable,
+					a.attnum AS ordinal_position,
+					adef.adsrc AS column_default
+				FROM
+					pg_attribute a
+					JOIN pg_type ON a.atttypid = pg_type.oid
+					JOIN pg_class cls ON a.attrelid = cls.oid
+					LEFT JOIN pg_attrdef adef ON adef.adnum = a.attnum AND adef.adrelid = a.attrelid
+				WHERE
+					cls.relkind IN ('r', 'v', 'mv')
+					AND a.attrelid = $_table::regclass
+					AND a.attnum > 0
+					AND NOT a.attisdropped
+				ORDER BY ordinal_position
+			");
+		}
+
 		$columns = array();
 		while ($row = $res->fetch(TRUE)) {
 			$size = (int) max($row['character_maximum_length'], $row['numeric_precision']);
@@ -508,8 +523,8 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 				'name' => $row['column_name'],
 				'table' => $table,
 				'nativetype' => strtoupper($row['udt_name']),
-				'size' => $size ? $size : NULL,
-				'nullable' => $row['is_nullable'] === 'YES',
+				'size' => $size > 0 ? $size : NULL,
+				'nullable' => $row['is_nullable'] === 'YES' || $row['is_nullable'] === 't',
 				'default' => $row['column_default'],
 				'autoincrement' => (int) $row['ordinal_position'] === $primary && substr($row['column_default'], 0, 7) === 'nextval',
 				'vendor' => $row,

dibi/drivers/DibiSqlite3Driver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -238,10 +234,11 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
 				return $value ? 1 : 0;
 
 			case dibi::DATE:
-				return $value instanceof DateTime ? $value->format($this->fmtDate) : date($this->fmtDate, $value);
-
 			case dibi::DATETIME:
-				return $value instanceof DateTime ? $value->format($this->fmtDateTime) : date($this->fmtDateTime, $value);
+				if (!$value instanceof DateTime && !$value instanceof DateTimeInterface) {
+					$value = new DibiDateTime($value);
+				}
+				return $value->format($type === dibi::DATETIME ? $this->fmtDateTime : $this->fmtDate);
 
 			default:
 				throw new InvalidArgumentException('Unsupported type.');

dibi/drivers/DibiSqliteDriver.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -243,10 +239,11 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
 				return $value ? 1 : 0;
 
 			case dibi::DATE:
-				return $value instanceof DateTime ? $value->format($this->fmtDate) : date($this->fmtDate, $value);
-
 			case dibi::DATETIME:
-				return $value instanceof DateTime ? $value->format($this->fmtDateTime) : date($this->fmtDateTime, $value);
+				if (!$value instanceof DateTime && !$value instanceof DateTimeInterface) {
+					$value = new DibiDateTime($value);
+				}
+				return $value->format($type === dibi::DATETIME ? $this->fmtDateTime : $this->fmtDate);
 
 			default:
 				throw new InvalidArgumentException('Unsupported type.');

dibi/drivers/DibiSqliteReflector.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 

dibi/libs/Dibi.php

@@ -0,0 +1,543 @@
+<?php
+
+/**
+ * This file is part of the "dibi" - smart database abstraction layer.
+ * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
+ */
+
+
+/**
+ * This class is static container class for creating DB objects and
+ * store connections info.
+ *
+ * @author     David Grudl
+ * @package    dibi
+ */
+class dibi
+{
+	/** column type */
+	const TEXT = 's', // as 'string'
+		BINARY = 'bin',
+		BOOL = 'b',
+		INTEGER = 'i',
+		FLOAT = 'f',
+		DATE = 'd',
+		DATETIME = 't',
+		TIME = 't';
+
+	const IDENTIFIER = 'n',
+		AFFECTED_ROWS = 'a';
+
+	/** @deprecated */
+	const FIELD_TEXT = dibi::TEXT,
+		FIELD_BINARY = dibi::BINARY,
+		FIELD_BOOL = dibi::BOOL,
+		FIELD_INTEGER = dibi::INTEGER,
+		FIELD_FLOAT = dibi::FLOAT,
+		FIELD_DATE = dibi::DATE,
+		FIELD_DATETIME = dibi::DATETIME,
+		FIELD_TIME = dibi::TIME;
+
+	/** version */
+	const VERSION = '2.2.0',
+		REVISION = 'released on 2014-06-02';
+
+	/** sorting order */
+	const ASC = 'ASC',
+		DESC = 'DESC';
+
+	/** @var DibiConnection[]  Connection registry storage for DibiConnection objects */
+	private static $registry = array();
+
+	/** @var DibiConnection  Current connection */
+	private static $connection;
+
+	/** @var array  @see addHandler */
+	private static $handlers = array();
+
+	/** @var string  Last SQL command @see dibi::query() */
+	public static $sql;
+
+	/** @var int  Elapsed time for last query */
+	public static $elapsedTime;
+
+	/** @var int  Elapsed time for all queries */
+	public static $totalTime;
+
+	/** @var int  Number or queries */
+	public static $numOfQueries = 0;
+
+	/** @var string  Default dibi driver */
+	public static $defaultDriver = 'mysql';
+
+
+	/**
+	 * Static class - cannot be instantiated.
+	 */
+	final public function __construct()
+	{
+		throw new LogicException("Cannot instantiate static class " . get_class($this));
+	}
+
+
+	/********************* connections handling ****************d*g**/
+
+
+	/**
+	 * 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)
+	{
+		return self::$connection = self::$registry[$name] = new DibiConnection($config, $name);
+	}
+
+
+	/**
+	 * Disconnects from database (doesn't destroy DibiConnection object).
+	 * @return void
+	 */
+	public static function disconnect()
+	{
+		self::getConnection()->disconnect();
+	}
+
+
+	/**
+	 * Returns TRUE when connection was established.
+	 * @return bool
+	 */
+	public static function isConnected()
+	{
+		return (self::$connection !== NULL) && self::$connection->isConnected();
+	}
+
+
+	/**
+	 * Retrieve active connection.
+	 * @param  string   connection registy name
+	 * @return DibiConnection
+	 * @throws DibiException
+	 */
+	public static function getConnection($name = NULL)
+	{
+		if ($name === NULL) {
+			if (self::$connection === NULL) {
+				throw new DibiException('Dibi is not connected to database.');
+			}
+
+			return self::$connection;
+		}
+
+		if (!isset(self::$registry[$name])) {
+			throw new DibiException("There is no connection named '$name'.");
+		}
+
+		return self::$registry[$name];
+	}
+
+
+	/**
+	 * Sets connection.
+	 * @param  DibiConnection
+	 * @return DibiConnection
+	 */
+	public static function setConnection(DibiConnection $connection)
+	{
+		return self::$connection = $connection;
+	}
+
+
+	/**
+	 * Change active connection.
+	 * @param  string   connection registy name
+	 * @return void
+	 * @throws DibiException
+	 */
+	public static function activate($name)
+	{
+		self::$connection = self::getConnection($name);
+	}
+
+
+	/********************* monostate for active connection ****************d*g**/
+
+
+	/**
+	 * Generates and executes SQL query - Monostate for DibiConnection::query().
+	 * @param  array|mixed      one or more arguments
+	 * @return DibiResult|int   result set object (if any)
+	 * @throws DibiException
+	 */
+	public static function query($args)
+	{
+		$args = func_get_args();
+		return self::getConnection()->query($args);
+	}
+
+
+	/**
+	 * Executes the SQL query - Monostate for DibiConnection::nativeQuery().
+	 * @param  string           SQL statement.
+	 * @return DibiResult|int   result set object (if any)
+	 */
+	public static function nativeQuery($sql)
+	{
+		return self::getConnection()->nativeQuery($sql);
+	}
+
+
+	/**
+	 * Generates and prints SQL query - Monostate for DibiConnection::test().
+	 * @param  array|mixed  one or more arguments
+	 * @return bool
+	 */
+	public static function test($args)
+	{
+		$args = func_get_args();
+		return self::getConnection()->test($args);
+	}
+
+
+	/**
+	 * Generates and returns SQL query as DibiDataSource - Monostate for DibiConnection::test().
+	 * @param  array|mixed      one or more arguments
+	 * @return DibiDataSource
+	 */
+	public static function dataSource($args)
+	{
+		$args = func_get_args();
+		return self::getConnection()->dataSource($args);
+	}
+
+
+	/**
+	 * Executes SQL query and fetch result - Monostate for DibiConnection::query() & fetch().
+	 * @param  array|mixed    one or more arguments
+	 * @return DibiRow
+	 * @throws DibiException
+	 */
+	public static function fetch($args)
+	{
+		$args = func_get_args();
+		return self::getConnection()->query($args)->fetch();
+	}
+
+
+	/**
+	 * Executes SQL query and fetch results - Monostate for DibiConnection::query() & fetchAll().
+	 * @param  array|mixed    one or more arguments
+	 * @return DibiRow[]
+	 * @throws DibiException
+	 */
+	public static function fetchAll($args)
+	{
+		$args = func_get_args();
+		return self::getConnection()->query($args)->fetchAll();
+	}
+
+
+	/**
+	 * Executes SQL query and fetch first column - Monostate for DibiConnection::query() & fetchSingle().
+	 * @param  array|mixed    one or more arguments
+	 * @return string
+	 * @throws DibiException
+	 */
+	public static function fetchSingle($args)
+	{
+		$args = func_get_args();
+		return self::getConnection()->query($args)->fetchSingle();
+	}
+
+
+	/**
+	 * Executes SQL query and fetch pairs - Monostate for DibiConnection::query() & fetchPairs().
+	 * @param  array|mixed    one or more arguments
+	 * @return string
+	 * @throws DibiException
+	 */
+	public static function fetchPairs($args)
+	{
+		$args = func_get_args();
+		return self::getConnection()->query($args)->fetchPairs();
+	}
+
+
+	/**
+	 * Gets the number of affected rows.
+	 * Monostate for DibiConnection::getAffectedRows()
+	 * @return int  number of rows
+	 * @throws DibiException
+	 */
+	public static function getAffectedRows()
+	{
+		return self::getConnection()->getAffectedRows();
+	}
+
+
+	/**
+	 * Gets the number of affected rows. Alias for getAffectedRows().
+	 * @return int  number of rows
+	 * @throws DibiException
+	 */
+	public static function affectedRows()
+	{
+		return self::getConnection()->getAffectedRows();
+	}
+
+
+	/**
+	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
+	 * Monostate for DibiConnection::getInsertId()
+	 * @param  string     optional sequence name
+	 * @return int
+	 * @throws DibiException
+	 */
+	public static function getInsertId($sequence=NULL)
+	{
+		return self::getConnection()->getInsertId($sequence);
+	}
+
+
+	/**
+	 * Retrieves the ID generated for an AUTO_INCREMENT column. Alias for getInsertId().
+	 * @param  string     optional sequence name
+	 * @return int
+	 * @throws DibiException
+	 */
+	public static function insertId($sequence=NULL)
+	{
+		return self::getConnection()->getInsertId($sequence);
+	}
+
+
+	/**
+	 * Begins a transaction - Monostate for DibiConnection::begin().
+	 * @param  string  optional savepoint name
+	 * @return void
+	 * @throws DibiException
+	 */
+	public static function begin($savepoint = NULL)
+	{
+		self::getConnection()->begin($savepoint);
+	}
+
+
+	/**
+	 * Commits statements in a transaction - Monostate for DibiConnection::commit($savepoint = NULL).
+	 * @param  string  optional savepoint name
+	 * @return void
+	 * @throws DibiException
+	 */
+	public static function commit($savepoint = NULL)
+	{
+		self::getConnection()->commit($savepoint);
+	}
+
+
+	/**
+	 * Rollback changes in a transaction - Monostate for DibiConnection::rollback().
+	 * @param  string  optional savepoint name
+	 * @return void
+	 * @throws DibiException
+	 */
+	public static function rollback($savepoint = NULL)
+	{
+		self::getConnection()->rollback($savepoint);
+	}
+
+
+	/**
+	 * Gets a information about the current database - Monostate for DibiConnection::getDatabaseInfo().
+	 * @return DibiDatabaseInfo
+	 */
+	public static function getDatabaseInfo()
+	{
+		return self::getConnection()->getDatabaseInfo();
+	}
+
+
+	/**
+	 * Import SQL dump from file - extreme fast!
+	 * @param  string  filename
+	 * @return int  count of sql commands
+	 */
+	public static function loadFile($file)
+	{
+		return self::getConnection()->loadFile($file);
+	}
+
+
+	/**
+	 * Replacement for majority of dibi::methods() in future.
+	 */
+	public static function __callStatic($name, $args)
+	{
+		//if ($name = 'select', 'update', ...') {
+		// return self::command()->$name($args);
+		//}
+		return call_user_func_array(array(self::getConnection(), $name), $args);
+	}
+
+
+	/********************* fluent SQL builders ****************d*g**/
+
+
+	/**
+	 * @return DibiFluent
+	 */
+	public static function command()
+	{
+		return self::getConnection()->command();
+	}
+
+
+	/**
+	 * @param  string    column name
+	 * @return DibiFluent
+	 */
+	public static function select($args)
+	{
+		$args = func_get_args();
+		return call_user_func_array(array(self::getConnection(), 'select'), $args);
+	}
+
+
+	/**
+	 * @param  string   table
+	 * @param  array
+	 * @return DibiFluent
+	 */
+	public static function update($table, $args)
+	{
+		return self::getConnection()->update($table, $args);
+	}
+
+
+	/**
+	 * @param  string   table
+	 * @param  array
+	 * @return DibiFluent
+	 */
+	public static function insert($table, $args)
+	{
+		return self::getConnection()->insert($table, $args);
+	}
+
+
+	/**
+	 * @param  string   table
+	 * @return DibiFluent
+	 */
+	public static function delete($table)
+	{
+		return self::getConnection()->delete($table);
+	}
+
+
+	/********************* substitutions ****************d*g**/
+
+
+	/**
+	 * Returns substitution hashmap - Monostate for DibiConnection::getSubstitutes().
+	 * @return DibiHashMap
+	 */
+	public static function getSubstitutes()
+	{
+		return self::getConnection()->getSubstitutes();
+	}
+
+
+	/********************* misc tools ****************d*g**/
+
+
+	/**
+	 * Prints out a syntax highlighted version of the SQL command or DibiResult.
+	 * @param  string|DibiResult
+	 * @param  bool  return output instead of printing it?
+	 * @return string
+	 */
+	public static function dump($sql = NULL, $return = FALSE)
+	{
+		ob_start();
+		if ($sql instanceof DibiResult) {
+			$sql->dump();
+
+		} else {
+			if ($sql === NULL) {
+				$sql = self::$sql;
+			}
+
+			static $keywords1 = 'SELECT|(?:ON\s+DUPLICATE\s+KEY)?UPDATE|INSERT(?:\s+INTO)?|REPLACE(?:\s+INTO)?|DELETE|CALL|UNION|FROM|WHERE|HAVING|GROUP\s+BY|ORDER\s+BY|LIMIT|OFFSET|SET|VALUES|LEFT\s+JOIN|INNER\s+JOIN|TRUNCATE';
+			static $keywords2 = 'ALL|DISTINCT|DISTINCTROW|IGNORE|AS|USING|ON|AND|OR|IN|IS|NOT|NULL|LIKE|RLIKE|REGEXP|TRUE|FALSE';
+
+			// insert new lines
+			$sql = " $sql ";
+			$sql = preg_replace("#(?<=[\\s,(])($keywords1)(?=[\\s,)])#i", "\n\$1", $sql);
+
+			// reduce spaces
+			$sql = preg_replace('#[ \t]{2,}#', " ", $sql);
+
+			$sql = wordwrap($sql, 100);
+			$sql = preg_replace("#([ \t]*\r?\n){2,}#", "\n", $sql);
+
+			// syntax highlight
+			$highlighter = "#(/\\*.+?\\*/)|(\\*\\*.+?\\*\\*)|(?<=[\\s,(])($keywords1)(?=[\\s,)])|(?<=[\\s,(=])($keywords2)(?=[\\s,)=])#is";
+			if (PHP_SAPI === 'cli') {
+				if (substr(getenv('TERM'), 0, 5) === 'xterm') {
+					$sql = preg_replace_callback($highlighter, array('dibi', 'cliHighlightCallback'), $sql);
+				}
+				echo trim($sql) . "\n\n";
+
+			} else {
+				$sql = htmlSpecialChars($sql);
+				$sql = preg_replace_callback($highlighter, array('dibi', 'highlightCallback'), $sql);
+				echo '<pre class="dump">', trim($sql), "</pre>\n\n";
+			}
+		}
+
+		if ($return) {
+			return ob_get_clean();
+		} else {
+			ob_end_flush();
+		}
+	}
+
+
+	private static function highlightCallback($matches)
+	{
+		if (!empty($matches[1])) { // comment
+			return '<em style="color:gray">' . $matches[1] . '</em>';
+
+		} elseif (!empty($matches[2])) { // error
+			return '<strong style="color:red">' . $matches[2] . '</strong>';
+
+		} elseif (!empty($matches[3])) { // most important keywords
+			return '<strong style="color:blue">' . $matches[3] . '</strong>';
+
+		} elseif (!empty($matches[4])) { // other keywords
+			return '<strong style="color:green">' . $matches[4] . '</strong>';
+		}
+	}
+
+
+	private static function cliHighlightCallback($matches)
+	{
+		if (!empty($matches[1])) { // comment
+			return "\033[1;30m" . $matches[1] . "\033[0m";
+
+		} elseif (!empty($matches[2])) { // error
+			return "\033[1;31m" . $matches[2] . "\033[0m";
+
+		} elseif (!empty($matches[3])) { // most important keywords
+			return "\033[1;34m" . $matches[3] . "\033[0m";
+
+		} elseif (!empty($matches[4])) { // other keywords
+			return "\033[1;32m" . $matches[4] . "\033[0m";
+		}
+	}
+
+}

dibi/libs/DibiConnection.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -60,9 +56,6 @@ class DibiConnection extends DibiObject
 	 */
 	public function __construct($config, $name = NULL)
 	{
-		class_exists('dibi'); // ensure class dibi is loaded
-
-		// DSN string
 		if (is_string($config)) {
 			parse_str($config, $config);
 
@@ -89,7 +82,7 @@ class DibiConnection extends DibiObject
 
 		$class = preg_replace(array('#\W#', '#sql#'), array('_', 'Sql'), ucfirst(strtolower($config['driver'])));
 		$class = "Dibi{$class}Driver";
-		if (!class_exists($class, FALSE)) {
+		if (!class_exists($class)) {
 			include_once dirname(__FILE__) . "/../drivers/$class.php";
 
 			if (!class_exists($class, FALSE)) {
@@ -118,7 +111,7 @@ class DibiConnection extends DibiObject
 				$this->onEvent[] = array(new DibiFirePhpLogger($filter), 'logEvent');
 			}
 
-			if (class_exists('DibiNettePanel', FALSE)) {
+			if (class_exists('DibiNettePanel') && !interface_exists('Tracy\IBarPanel')) {
 				$panel = new DibiNettePanel(isset($profilerCfg['explain']) ? $profilerCfg['explain'] : TRUE, $filter);
 				$panel->register($this);
 			}
@@ -590,7 +583,7 @@ class DibiConnection extends DibiObject
 	/**
 	 * Executes SQL query and fetch results - shortcut for query() & fetchAll().
 	 * @param  array|mixed    one or more arguments
-	 * @return array of DibiRow
+	 * @return DibiRow[]
 	 * @throws DibiException
 	 */
 	public function fetchAll($args)
@@ -645,14 +638,21 @@ class DibiConnection extends DibiObject
 		}
 
 		$count = 0;
+		$delimiter = ';';
 		$sql = '';
 		while (!feof($handle)) {
-			$s = fgets($handle);
-			$sql .= $s;
-			if (substr(rtrim($s), -1) === ';') {
+			$s = rtrim(fgets($handle));
+			if (substr($s, 0, 10) === 'DELIMITER ') {
+				$delimiter = substr($s, 10);
+
+			} elseif (substr($s, -strlen($delimiter)) === $delimiter) {
+				$sql .= substr($s, 0, -strlen($delimiter));
 				$this->driver->query($sql);
 				$sql = '';
 				$count++;
+
+			} else {
+				$sql .= $s . "\n";
 			}
 		}
 		if (trim($sql) !== '') {

dibi/libs/DibiDataSource.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 

dibi/libs/DibiDatabaseInfo.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -49,7 +45,7 @@ class DibiDatabaseInfo extends DibiObject
 
 
 	/**
-	 * @return array of DibiTableInfo
+	 * @return DibiTableInfo[]
 	 */
 	public function getTables()
 	{
@@ -59,7 +55,7 @@ class DibiDatabaseInfo extends DibiObject
 
 
 	/**
-	 * @return array of string
+	 * @return string[]
 	 */
 	public function getTableNames()
 	{
@@ -181,7 +177,7 @@ class DibiTableInfo extends DibiObject
 
 
 	/**
-	 * @return array of DibiColumnInfo
+	 * @return DibiColumnInfo[]
 	 */
 	public function getColumns()
 	{
@@ -191,7 +187,7 @@ class DibiTableInfo extends DibiObject
 
 
 	/**
-	 * @return array of string
+	 * @return string[]
 	 */
 	public function getColumnNames()
 	{
@@ -233,7 +229,7 @@ class DibiTableInfo extends DibiObject
 
 
 	/**
-	 * @return array of DibiForeignKeyInfo
+	 * @return DibiForeignKeyInfo[]
 	 */
 	public function getForeignKeys()
 	{
@@ -243,7 +239,7 @@ class DibiTableInfo extends DibiObject
 
 
 	/**
-	 * @return array of DibiIndexInfo
+	 * @return DibiIndexInfo[]
 	 */
 	public function getIndexes()
 	{
@@ -336,7 +332,7 @@ class DibiResultInfo extends DibiObject
 
 
 	/**
-	 * @return array of DibiColumnInfo
+	 * @return DibiColumnInfo[]
 	 */
 	public function getColumns()
 	{
@@ -347,7 +343,7 @@ class DibiResultInfo extends DibiObject
 
 	/**
 	 * @param  bool
-	 * @return array of string
+	 * @return string[]
 	 */
 	public function getColumnNames($fullNames = FALSE)
 	{

dibi/libs/DibiDateTime.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -22,9 +18,9 @@ class DibiDateTime extends DateTime
 	public function __construct($time = 'now', DateTimeZone $timezone = NULL)
 	{
 		if (is_numeric($time)) {
-			$time = date('Y-m-d H:i:s', $time);
-		}
-		if ($timezone === NULL) {
+			parent::__construct('@' . $time);
+			$this->setTimeZone($timezone ? $timezone : new DateTimeZone(date_default_timezone_get()));
+		} elseif ($timezone === NULL) {
 			parent::__construct($time);
 		} else {
 			parent::__construct($time, $timezone);
@@ -46,29 +42,19 @@ class DibiDateTime extends DateTime
 	}
 
 
-	public function __sleep()
+	public function setTimestamp($timestamp)
 	{
-		$this->fix = array($this->format('Y-m-d H:i:s'), $this->getTimezone()->getName());
-		return array('fix');
-	}
-
-
-	public function __wakeup()
-	{
-		$this->__construct($this->fix[0], new DateTimeZone($this->fix[1]));
-		unset($this->fix);
+		$zone = PHP_VERSION_ID === 50206 ? new \DateTimeZone($this->getTimezone()->getName()) : $this->getTimezone();
+		$this->__construct('@' . $timestamp);
+		$this->setTimeZone($zone);
+		return $this;
 	}
 
 
 	public function getTimestamp()
 	{
-		return (int) $this->format('U');
-	}
-
-
-	public function setTimestamp($timestamp)
-	{
-		return $this->__construct(date('Y-m-d H:i:s', $timestamp), new DateTimeZone($this->getTimezone()->getName())); // getTimeZone() crashes in PHP 5.2.6
+		$ts = $this->format('U');
+		return is_float($tmp = $ts * 1) ? $ts : $tmp;
 	}
 
 
@@ -77,4 +63,27 @@ class DibiDateTime extends DateTime
 		return $this->format('Y-m-d H:i:s');
 	}
 
+
+	public function __sleep()
+	{
+		$zone = $this->getTimezone()->getName();
+		if ($zone[0] === '+') {
+			$this->fix = array($this->format('Y-m-d H:i:sP'));
+		} else {
+			$this->fix = array($this->format('Y-m-d H:i:s'), $zone);
+		}
+		return array('fix');
+	}
+
+
+	public function __wakeup()
+	{
+		if (isset($this->fix[1])) {
+			$this->__construct($this->fix[0], new DateTimeZone($this->fix[1]));
+		} else {
+			$this->__construct($this->fix[0]);
+		}
+		unset($this->fix);
+	}
+
 }

dibi/libs/DibiEvent.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 

dibi/libs/DibiException.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 

dibi/libs/DibiFileLogger.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -64,7 +60,7 @@ class DibiFileLogger extends DibiObject
 			fwrite($handle,
 				"OK: " . $event->sql
 				. ($event->count ? ";\n-- rows: " . $event->count : '')
-				. "\n-- takes: " . sprintf('%0.3f', $event->time * 1000) . ' ms'
+				. "\n-- takes: " . sprintf('%0.3f ms', $event->time * 1000)
 				. "\n-- source: " . implode(':', $event->source)
 				. "\n-- driver: " . $event->connection->getConfig('driver') . '/' . $event->connection->getConfig('name')
 				. "\n-- " . date('Y-m-d H:i:s')

dibi/libs/DibiFirePhpLogger.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 

dibi/libs/DibiFluent.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -207,15 +203,10 @@ class DibiFluent extends DibiObject implements IDataSource
 	 * @param  string clause name
 	 * @return self
 	 */
-	public function clause($clause, $remove = FALSE)
+	public function clause($clause)
 	{
 		$this->cursor = & $this->clauses[self::$normalizer->$clause];
-
-		if ($remove) { // deprecated, use removeClause
-			trigger_error(__METHOD__ . '(..., TRUE) is deprecated; use removeClause() instead.', E_USER_NOTICE);
-			$this->cursor = NULL;
-
-		} elseif ($this->cursor === NULL) {
+		if ($this->cursor === NULL) {
 			$this->cursor = array();
 		}
 
@@ -309,7 +300,14 @@ class DibiFluent extends DibiObject implements IDataSource
 	public function execute($return = NULL)
 	{
 		$res = $this->query($this->_export());
-		return $return === dibi::IDENTIFIER ? $this->connection->getInsertId() : $res;
+		switch ($return) {
+			case dibi::IDENTIFIER:
+				return $this->connection->getInsertId();
+			case dibi::AFFECTED_ROWS:
+				return $this->connection->getAffectedRows();
+			default:
+				return $res;
+		}
 	}
 
 

dibi/libs/DibiHashMap.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 

dibi/libs/DibiLiteral.php

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

dibi/libs/DibiObject.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 

dibi/libs/DibiResult.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -142,26 +138,12 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-	/**
-	 * Returns the number of rows in a result set. Alias for getRowCount().
-	 * @deprecated
-	 */
-	final public function rowCount()
-	{
-		trigger_error(__METHOD__ . '() is deprecated; use count($res) or $res->getRowCount() instead.', E_USER_WARNING);
-		return $this->getResultDriver()->getRowCount();
-	}
-
-
 	/**
 	 * Required by the IteratorAggregate interface.
 	 * @return DibiResultIterator
 	 */
 	final public function getIterator()
 	{
-		if (func_num_args()) {
-			trigger_error(__METHOD__ . ' arguments $offset & $limit have been dropped; use SQL clauses instead.', E_USER_WARNING);
-		}
 		return new DibiResultIterator($this);
 	}
 
@@ -245,7 +227,7 @@ class DibiResult extends DibiObject implements IDataSource
 	 * Fetches all records from table.
 	 * @param  int  offset
 	 * @param  int  limit
-	 * @return array of DibiRow
+	 * @return DibiRow[]
 	 */
 	final public function fetchAll($offset = NULL, $limit = NULL)
 	{
@@ -518,26 +500,15 @@ class DibiResult extends DibiObject implements IDataSource
 				$row[$key] = is_float($tmp = $value * 1) ? $value : $tmp;
 
 			} elseif ($type === dibi::FLOAT) {
-				$row[$key] = (string) ($tmp = (float) $value) === rtrim(rtrim($value, '0'), '.') ? $tmp : $value;
+				$row[$key] = ltrim((string) ($tmp = (float) $value), '0') === ltrim(rtrim(rtrim($value, '0'), '.'), '0') ? $tmp : $value;
 
 			} elseif ($type === dibi::BOOL) {
 				$row[$key] = ((bool) $value) && $value !== 'f' && $value !== 'F';
 
 			} elseif ($type === dibi::DATE || $type === dibi::DATETIME) {
-				if ((int) $value === 0 && substr((string) $value, 0, 3) !== '00:') { // '', NULL, FALSE, '0000-00-00', ...
-
-				} elseif (empty($this->formats[$type])) { // return DateTime object (default)
-					$row[$key] = new DibiDateTime(is_numeric($value) ? date('Y-m-d H:i:s', $value) : $value);
-
-				} elseif ($this->formats[$type] === 'U') { // return timestamp
-					$row[$key] = is_numeric($value) ? (int) $value : strtotime($value);
-
-				} elseif (is_numeric($value)) { // formatted date
-					$row[$key] = date($this->formats[$type], $value);
-
-				} else {
+				if ((int) $value !== 0 || substr((string) $value, 0, 3) === '00:') { // '', NULL, FALSE, '0000-00-00', ...
 					$value = new DibiDateTime($value);
-					$row[$key] = $value->format($this->formats[$type]);
+					$row[$key] = empty($this->formats[$type]) ? $value : $value->format($this->formats[$type]);
 				}
 
 			} elseif ($type === dibi::BINARY) {
@@ -618,14 +589,6 @@ class DibiResult extends DibiObject implements IDataSource
 	}
 
 
-	/** @deprecated */
-	public function getColumnNames($fullNames = FALSE)
-	{
-		trigger_error(__METHOD__ . '() is deprecated; use $res->getInfo()->getColumnNames() instead.', E_USER_WARNING);
-		return $this->getInfo()->getColumnNames($fullNames);
-	}
-
-
 	/********************* misc tools ****************d*g**/
 
 

dibi/libs/DibiResultIterator.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 

dibi/libs/DibiRow.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -43,54 +39,15 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
 	{
 		$time = $this[$key];
 		if (!$time instanceof DibiDateTime) {
-			if ((int) $time === 0) { // '', NULL, FALSE, '0000-00-00', ...
+			if ((int) $time === 0 && substr((string) $time, 0, 3) !== '00:') { // '', NULL, FALSE, '0000-00-00', ...
 				return NULL;
 			}
-			$time = new DibiDateTime(is_numeric($time) ? date('Y-m-d H:i:s', $time) : $time);
+			$time = new DibiDateTime($time);
 		}
 		return $format === NULL ? $time : $time->format($format);
 	}
 
 
-	/**
-	 * Converts value to UNIX timestamp.
-	 * @param  string key
-	 * @return int
-	 */
-	public function asTimestamp($key)
-	{
-		trigger_error(__METHOD__ . '() is deprecated.', E_USER_WARNING);
-		$time = $this[$key];
-		return (int) $time === 0 // '', NULL, FALSE, '0000-00-00', ...
-			? NULL
-			: (is_numeric($time) ? (int) $time : strtotime($time));
-	}
-
-
-	/**
-	 * Converts value to boolean.
-	 * @param  string key
-	 * @return mixed
-	 */
-	public function asBool($key)
-	{
-		trigger_error(__METHOD__ . '() is deprecated.', E_USER_WARNING);
-		return $this[$key];
-	}
-
-
-	/** @deprecated */
-	public function asDate($key, $format = NULL)
-	{
-		trigger_error(__METHOD__ . '() is deprecated.', E_USER_WARNING);
-		if ($format === NULL) {
-			return $this->asTimestamp($key);
-		} else {
-			return $this->asDateTime($key, $format === TRUE ? NULL : $format);
-		}
-	}
-
-
 	/********************* interfaces ArrayAccess, Countable & IteratorAggregate ****************d*g**/
 
 

dibi/libs/DibiTranslator.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 
@@ -55,6 +51,8 @@ final class DibiTranslator extends DibiObject
 	public function __construct(DibiConnection $connection)
 	{
 		$this->connection = $connection;
+		$this->driver = $connection->getDriver();
+		$this->identifiers = new DibiHashMap(array($this, 'delimite'));
 	}
 
 
@@ -66,9 +64,6 @@ final class DibiTranslator extends DibiObject
 	 */
 	public function translate(array $args)
 	{
-		$this->identifiers = new DibiHashMap(array($this, 'delimite'));
-		$this->driver = $this->connection->getDriver();
-
 		$args = array_values($args);
 		while (count($args) === 1 && is_array($args[0])) { // implicit array expansion
 			$args = array_values($args[0]);
@@ -331,7 +326,7 @@ final class DibiTranslator extends DibiObject
 
 		// with modifier procession
 		if ($modifier) {
-			if ($value !== NULL && !is_scalar($value) && !($value instanceof DateTime)) {  // array is already processed
+			if ($value !== NULL && !is_scalar($value) && !$value instanceof DateTime && !$value instanceof DateTimeInterface) {  // array is already processed
 				$this->hasError = TRUE;
 				return '**Unexpected type ' . gettype($value) . '**';
 			}
@@ -449,7 +444,7 @@ final class DibiTranslator extends DibiObject
 		} elseif ($value === NULL) {
 			return 'NULL';
 
-		} elseif ($value instanceof DateTime) {
+		} elseif ($value instanceof DateTime || $value instanceof DateTimeInterface) {
 			return $this->driver->escape($value, dibi::DATETIME);
 
 		} elseif ($value instanceof DibiLiteral) {

dibi/libs/interfaces.php

@@ -2,11 +2,7 @@
 
 /**
  * This file is part of the "dibi" - smart database abstraction layer.
- *
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
  */
 
 

examples/.gitignore

@@ -1,3 +1,4 @@
 _test.bat
 ref
 output
+log

examples/Nette/readme.txt

@@ -1,3 +0,0 @@
-This file is part of Nette Framework
-
-For more information please see http://nette.org

examples/Tracy/readme.txt

@@ -1,3 +1,6 @@
+Tracy - PHP debugger, see http://tracy.nette.org
+
+
 Licenses
 ========
 

examples/connecting-to-databases.php

@@ -4,16 +4,15 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 
 // connects to SQlite using dibi class
 echo '<p>Connecting to Sqlite: ';
 try {
 	dibi::connect(array(
-		'driver'   => 'sqlite',
-		'database' => 'data/sample.sdb',
+		'driver'   => 'sqlite3',
+		'database' => 'data/sample.s3db',
 	));
 	echo 'OK';
 
@@ -27,8 +26,8 @@ echo "</p>\n";
 echo '<p>Connecting to Sqlite: ';
 try {
 	$connection = new DibiConnection(array(
-		'driver'   => 'sqlite',
-		'database' => 'data/sample.sdb',
+		'driver'   => 'sqlite3',
+		'database' => 'data/sample.s3db',
 	));
 	echo 'OK';
 
@@ -79,7 +78,7 @@ try {
 		'driver'   => 'odbc',
 		'username' => 'root',
 		'password' => '***',
-		'dsn'      => 'Driver={Microsoft Access Driver (*.mdb)};Dbq='.dirname(__FILE__).'/data/sample.mdb',
+		'dsn'      => 'Driver={Microsoft Access Driver (*.mdb)};Dbq='.__DIR__.'/data/sample.mdb',
 	));
 	echo 'OK';
 

examples/data/style.css

@@ -41,24 +41,24 @@ table.dump th {
 }
 
 /* dump() */
-pre.nette-dump, pre.dump {
+pre.tracy-dump, pre.dump {
 	color: #444; background: white;
 	border: 1px solid silver;
 	padding: 1em;
 	margin: 1em 0;
 }
-pre.nette-dump .php-array, pre.nette-dump .php-object {
+pre.tracy-dump .php-array, pre.tracy-dump .php-object {
 	color: #C22;
 }
-pre.nette-dump .php-string {
+pre.tracy-dump .php-string {
 	color: #080;
 }
-pre.nette-dump .php-int, pre.nette-dump .php-float {
+pre.tracy-dump .php-int, pre.tracy-dump .php-float {
 	color: #37D;
 }
-pre.nette-dump .php-null, pre.nette-dump .php-bool {
+pre.tracy-dump .php-null, pre.tracy-dump .php-bool {
 	color: black;
 }
-pre.nette-dump .php-visibility {
+pre.tracy-dump .php-visibility {
 	font-size: 85%; color: #999;
 }

examples/database-reflection.php

@@ -4,13 +4,12 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 

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

@@ -4,13 +4,12 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 

examples/fetching-examples.php

@@ -4,14 +4,15 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/Tracy/tracy.phar';
+require __DIR__ . '/../dibi/dibi.php';
+
+Tracy\Debugger::enable();
 
-ndebug();
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 
@@ -30,38 +31,40 @@ product_id | title
 // fetch a single row
 echo "<h2>fetch()</h2>\n";
 $row = dibi::fetch('SELECT title FROM products');
-dump($row); // Chair
+Tracy\Dumper::dump($row); // Chair
 
 
 // fetch a single value
 echo "<h2>fetchSingle()</h2>\n";
 $value = dibi::fetchSingle('SELECT title FROM products');
-dump($value); // Chair
+Tracy\Dumper::dump($value); // Chair
 
 
 // fetch complete result set
 echo "<h2>fetchAll()</h2>\n";
 $all = dibi::fetchAll('SELECT * FROM products');
-dump($all);
+Tracy\Dumper::dump($all);
 
 
 // fetch complete result set like association array
 echo "<h2>fetchAssoc('title')</h2>\n";
 $res = dibi::query('SELECT * FROM products');
 $assoc = $res->fetchAssoc('title'); // key
-dump($assoc);
+Tracy\Dumper::dump($assoc);
 
 
 // fetch complete result set like pairs key => value
 echo "<h2>fetchPairs('product_id', 'title')</h2>\n";
+$res = dibi::query('SELECT * FROM products');
 $pairs = $res->fetchPairs('product_id', 'title');
-dump($pairs);
+Tracy\Dumper::dump($pairs);
 
 
 // fetch row by row
 echo "<h2>using foreach</h2>\n";
+$res = dibi::query('SELECT * FROM products');
 foreach ($res as $n => $row) {
-	dump($row);
+	Tracy\Dumper::dump($row);
 }
 
 
@@ -73,14 +76,16 @@ $res = dibi::query('
 	INNER JOIN customers USING (customer_id)
 ');
 
-echo "<h2>fetchAssoc('customers.name|products.title')</h2>\n";
-$assoc = $res->fetchAssoc('customers.name|products.title'); // key
-dump($assoc);
+echo "<h2>fetchAssoc('name|title')</h2>\n";
+$assoc = $res->fetchAssoc('name|title'); // key
+Tracy\Dumper::dump($assoc);
 
-echo "<h2>fetchAssoc('customers.name[]products.title')</h2>\n";
-$assoc = $res->fetchAssoc('customers.name[]products.title'); // key
-dump($assoc);
+echo "<h2>fetchAssoc('name[]title')</h2>\n";
+$res = dibi::query('SELECT * FROM products INNER JOIN orders USING (product_id) INNER JOIN customers USING (customer_id)');
+$assoc = $res->fetchAssoc('name[]title'); // key
+Tracy\Dumper::dump($assoc);
 
-echo "<h2>fetchAssoc('customers.name->products.title')</h2>\n";
-$assoc = $res->fetchAssoc('customers.name->products.title'); // key
-dump($assoc);
+echo "<h2>fetchAssoc('name->title')</h2>\n";
+$res = dibi::query('SELECT * FROM products INNER JOIN orders USING (product_id) INNER JOIN customers USING (customer_id)');
+$assoc = $res->fetchAssoc('name->title'); // key
+Tracy\Dumper::dump($assoc);

examples/importing-dump-from-file.php

@@ -4,13 +4,12 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 

examples/nette-debug-and-exceptions.php

@@ -1,44 +0,0 @@
-<!DOCTYPE html><link rel="stylesheet" href="data/style.css">
-
-<h1>Nette Debugger & SQL Exceptions | dibi</h1>
-
-<p>Dibi can display and log exceptions via Nette Debugger, part of Nette Framework.</p>
-
-<ul>
-	<li>Nette Framework: http://nette.org
-</ul>
-
-<?php
-
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
-
-
-// enable Nette Debugger
-ndebug();
-
-
-dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
-	'profiler' => array(
-		'run' => TRUE,
-	)
-));
-
-
-// throws error because SQL is bad
-dibi::query('SELECT * FROM customers WHERE customer_id < ?', 38);
-
-
-dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
-	'profiler' => array(
-		'run' => TRUE,
-	)
-));
-
-
-// throws error because SQL is bad
-dibi::query('SELECT FROM customers WHERE customer_id < ?', 38);

examples/nette-debug-and-variables.php

@@ -1,32 +0,0 @@
-<!DOCTYPE html><link rel="stylesheet" href="data/style.css">
-
-<style> html { background: url(data/arrow.png) no-repeat bottom right; height: 100%; } </style>
-
-<h1>Nette Debugger & Variables | dibi</h1>
-
-<p>Dibi can dump variables via Nette Debugger, part of Nette Framework.</p>
-
-<ul>
-	<li>Nette Framework: http://nette.org
-</ul>
-
-<?php
-
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
-
-
-// enable Nette Debugger
-NDebugger::enable();
-
-
-dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
-	'profiler' => array(
-		'run' => TRUE,
-	)
-));
-
-
-NDebugger::barDump( dibi::fetchAll('SELECT * FROM customers WHERE customer_id < ?', 38), '[customers]' );

examples/query-language-and-conditions.php

@@ -4,8 +4,7 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 
 dibi::connect(array(

examples/query-language-basic-examples.php

@@ -4,8 +4,7 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 date_default_timezone_set('Europe/Prague');
 

examples/result-set-data-types.php

@@ -1,19 +1,20 @@
 <!DOCTYPE html><link rel="stylesheet" href="data/style.css">
 
-<h1>Result Set Data Types  | dibi</h1>
+<h1>Result Set Data Types | dibi</h1>
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/Tracy/tracy.phar';
+require __DIR__ . '/../dibi/dibi.php';
+
+Tracy\Debugger::enable();
 
-ndebug();
 date_default_timezone_set('Europe/Prague');
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 
@@ -25,7 +26,7 @@ $res->setType('customer_id', Dibi::INTEGER)
 	->setFormat(dibi::DATETIME, 'Y-m-d H:i:s');
 
 
-dump( $res->fetch() );
+Tracy\Dumper::dump( $res->fetch() );
 // outputs:
 // DibiRow(3) {
 //    customer_id => 1
@@ -36,7 +37,7 @@ dump( $res->fetch() );
 // using auto-detection (works well with MySQL or other strictly typed databases)
 $res = dibi::query('SELECT * FROM [customers]');
 
-dump( $res->fetch() );
+Tracy\Dumper::dump( $res->fetch() );
 // outputs:
 // DibiRow(3) {
 //    customer_id => 1

examples/tracy-and-exceptions.php

@@ -0,0 +1,43 @@
+<!DOCTYPE html><link rel="stylesheet" href="data/style.css">
+
+<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>
+
+<?php
+
+require __DIR__ . '/Tracy/tracy.phar';
+require __DIR__ . '/../dibi/dibi.php';
+
+
+Tracy\Debugger::enable();
+
+
+dibi::connect(array(
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
+	'profiler' => array(
+		'run' => TRUE,
+	)
+));
+
+
+// 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,
+	)
+));
+
+
+// throws error because SQL is bad
+dibi::query('SELECT FROM customers WHERE customer_id < ?', 38);

examples/tracy-and-variables.php

@@ -0,0 +1,31 @@
+<!DOCTYPE html><link rel="stylesheet" href="data/style.css">
+
+<style> html { background: url(data/arrow.png) no-repeat bottom right; height: 100%; } </style>
+
+<h1>Tracy & Variables | dibi</h1>
+
+<p>Dibi can dump variables via Tracy, part of Nette Framework.</p>
+
+<ul>
+	<li>Tracy Debugger: http://tracy.nette.org
+</ul>
+
+<?php
+
+require __DIR__ . '/Tracy/tracy.phar';
+require __DIR__ . '/../dibi/dibi.php';
+
+
+Tracy\Debugger::enable();
+
+
+dibi::connect(array(
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
+	'profiler' => array(
+		'run' => TRUE,
+	)
+));
+
+
+Tracy\Debugger::barDump( dibi::fetchAll('SELECT * FROM customers WHERE customer_id < ?', 38), '[customers]' );

examples/using-datetime.php

@@ -4,16 +4,15 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 date_default_timezone_set('Europe/Prague');
 
 
 // CHANGE TO REAL PARAMETERS!
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 	'formatDate' => "'Y-m-d'",
 	'formatDateTime' => "'Y-m-d H-i-s'",
 ));

examples/using-extension-methods.php

@@ -4,27 +4,28 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/Tracy/tracy.phar';
+require __DIR__ . '/../dibi/dibi.php';
+
+Tracy\Debugger::enable();
 
-ndebug();
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 
 // using the "prototype" to add custom method to class DibiResult
-function DibiResult_prototype_fetchShuffle(DibiResult $obj)
+DibiResult::extensionMethod('fetchShuffle', function(DibiResult $obj)
 {
 	$all = $obj->fetchAll();
 	shuffle($all);
 	return $all;
-}
+});
 
 
 // fetch complete result set shuffled
 $res = dibi::query('SELECT * FROM [customers]');
 $all = $res->fetchShuffle();
-dump($all);
+Tracy\Dumper::dump($all);

examples/using-fluent-syntax.php

@@ -4,15 +4,14 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 date_default_timezone_set('Europe/Prague');
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 

examples/using-limit-and-offset.php

@@ -4,13 +4,12 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 

examples/using-logger.php

@@ -4,15 +4,14 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 date_default_timezone_set('Europe/Prague');
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 	// enable query logging to this file
 	'profiler' => array(
 		'run' => TRUE,

examples/using-profiler.php

@@ -6,13 +6,12 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 	'profiler' => array(
 		'run' => TRUE,
 	)

examples/using-substitutions.php

@@ -4,13 +4,12 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 

examples/using-transactions.php

@@ -4,13 +4,12 @@
 
 <?php
 
-require dirname(__FILE__) . '/Nette/Debugger.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+require __DIR__ . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
-	'driver'   => 'sqlite',
-	'database' => 'data/sample.sdb',
+	'driver'   => 'sqlite3',
+	'database' => 'data/sample.s3db',
 ));
 
 

license.md

@@ -16,7 +16,7 @@ remains intact.
 New BSD License
 ---------------
 
-Copyright (c) 2004, 2013 David Grudl (http://davidgrudl.com)
+Copyright (c) 2004, 2014 David Grudl (http://davidgrudl.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

readme.md

@@ -1,16 +1,19 @@
 [Dibi](http://dibiphp.com) - smart database layer for PHP
 =========================================================
 
-Database access functions in PHP are not standardised. This library
-hides the differences between them, a above all, it gives you a very handy interface.
+[![Downloads this Month](https://img.shields.io/packagist/dm/dibi/dibi.svg)](https://packagist.org/packages/dibi/dibi)
+[![Build Status](https://travis-ci.org/dg/dibi.svg?branch=master)](https://travis-ci.org/dg/dibi)
 
-The best way how to install Dibi is to use a [Composer](http://getcomposer.org/download):
+Database access functions in PHP are not standardised. This library
+hides the differences between them, and above all, it gives you a very handy interface.
+
+The best way to install Dibi is to use a [Composer](http://getcomposer.org/download):
 
     php composer.phar require dibi/dibi
 
-Or you can download a latest package from http://dibiphp.com. In this
+Or you can download the latest package from http://dibiphp.com. In this
 package is also `Dibi.minified`, shrinked single-file version of whole Dibi,
-useful when you don't want to modify library, but just use it.
+useful when you don't want to modify the library, but just use it.
 
 Dibi requires PHP 5.2.0 or later. It has been tested with PHP 5.5 too.
 
@@ -124,3 +127,4 @@ echo dibi::$sql; // last SQL query
 echo dibi::$elapsedTime;
 echo dibi::$numOfQueries;
 echo dibi::$totalTime;
+```

tests/.gitignore

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

tests/bootstrap.php

@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Test initialization and helpers.
- *
- * @author     David Grudl
- * @package    Nette\Test
- */
-
-require dirname(__FILE__) . '/../vendor/nette/tester/Tester/bootstrap.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
-
-date_default_timezone_set('Europe/Prague');
-class_alias('Tester\Assert', 'Assert');
-
-// load connections
-define('DIR', dirname(__FILE__));
-$config = parse_ini_file(dirname(__FILE__) . '/config.ini', TRUE);

tests/config.ini

@@ -1,67 +0,0 @@
-[mysql]
-driver = mysql
-host = localhost
-username = dibi
-password = dibi
-database = dibi_test
-charset = utf8
-
-[mysqli]
-driver = mysqli
-host = localhost
-username = dibi
-password = dibi
-database = dibi_test
-charset = utf8
-
-[sqlite]
-driver = sqlite
-database = DIR "/data/sample.sdb"
-
-[sqlite3]
-driver = sqlite3
-database = DIR "/data/sample.sdb3"
-
-[odbc]
-driver = odbc
-username = dibi
-password = dibi
-dsn = "Driver={Microsoft Access Driver (*.mdb)};Dbq=" DIR "/data/sample.mdb"
-
-[postgresql]
-driver = postgre
-host = localhost
-port = 5432
-username = dibi
-password = dibi
-database = dibi_test
-persistent = TRUE
-
-[sqlite-pdo]
-driver = pdo
-dsn = "sqlite2::" DIR "/data/sample.sdb"
-
-[mysql-pdo]
-driver = pdo
-dsn = "mysql:dbname=dibi_test;host=localhost"
-username = dibi
-password = dibi
-
-[mssql]
-driver = mssql
-host = localhost
-username = dibi
-password = dibi
-
-[mssql2005]
-driver = mssql2005
-host = "(local)"
-username = dibi
-password = dibi
-database = dibi_test
-
-[oracle]
-driver = oracle
-username = dibi
-password = dibi
-database = dibi_test

tests/dibi/DibiFluent.cloning.phpt

@@ -6,9 +6,9 @@
  * @author     David Grudl
  */
 
+use Tester\Assert;
 
-require dirname(__FILE__) . '/bootstrap.php';
-
+require __DIR__ . '/bootstrap.php';
 
 
 dibi::connect($config['sqlite3']);

tests/dibi/DibiTranslator.DateTimeInterface.phpt

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Test: DateTimeInterface of DibiTranslator
+ *
+ * @author     Patrik Votoček
+ * @phpversion 5.5
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+$connection = new DibiConnection(array(
+	'driver' => 'sqlite3',
+	'database' => ':memory:',
+));
+$translator = new DibiTranslator($connection);
+
+$datetime = new DateTime('1978-01-23 00:00:00');
+
+Assert::equal($datetime->format('U'), $translator->formatValue(new DateTime($datetime->format('c')), NULL));
+Assert::equal($datetime->format('U'), $translator->formatValue(new DateTimeImmutable($datetime->format('c')), NULL));

tests/dibi/bootstrap.php

@@ -0,0 +1,18 @@
+<?php
+
+// The Nette Tester command-line runner can be
+// invoked through the command: ../../vendor/bin/tester .
+
+if (@!include __DIR__ . '/../../vendor/autoload.php') {
+	echo 'Install Nette Tester using `composer update --dev`';
+	exit(1);
+}
+
+
+// configure environment
+Tester\Environment::setup();
+date_default_timezone_set('Europe/Prague');
+
+
+// load connections
+$config = require __DIR__ . '/config.php';

tests/dibi/config.php

@@ -0,0 +1,77 @@
+<?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/php-unix.ini

@@ -0,0 +1,2 @@
+[PHP]
+;extension_dir = "./ext"

tests/php-win.ini

@@ -0,0 +1,3 @@
+[PHP]
+extension_dir = "./ext"
+extension=php_sqlite3.dll

version.txt

@@ -1 +1 @@
-Dibi 2.1.1 (revision $WCREV$ released on $WCDATE$)
+Dibi 2.2.0 (released on 2014-06-02)