From 88b1a45e42de10dba6f0080d3d1b2a00c00fec60 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Wed, 19 May 2010 20:25:17 +0200
Subject: [PATCH] DibiResult is configured via items 'detectTypes' and
 'formatDateTime' in 'result' subarray; removed RESULT_DETECT_TYPES &
 RESULT_DATE_TIME

---
 dibi/dibi.php                |  6 ------
 dibi/libs/DibiConnection.php | 10 ++++++++--
 dibi/libs/DibiResult.php     | 10 +++++++---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/dibi/dibi.php b/dibi/dibi.php
index 81586848..ad7804ce 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -167,13 +167,7 @@ class dibi
 	const REVISION = '$WCREV$ released on $WCDATE$';
 	/**#@-*/
 
-	/**#@+
-	 * Configuration options
-	 */
-	const RESULT_DETECT_TYPES = 'resultDetectTypes';
-	const RESULT_DATE_TIME = 'resultDateTime';
 	const ASC = 'ASC', DESC = 'DESC';
-	/**#@-*/
 
 	/** @var DibiConnection[]  Connection registry storage for DibiConnection objects */
 	private static $registry = array();
diff --git a/dibi/libs/DibiConnection.php b/dibi/libs/DibiConnection.php
index da81382f..e8954bc4 100644
--- a/dibi/libs/DibiConnection.php
+++ b/dibi/libs/DibiConnection.php
@@ -55,7 +55,11 @@ class DibiConnection extends DibiObject
 			parse_str($config, $config);
 
 		} elseif ($config instanceof Traversable) {
-			$config = iterator_to_array($config);
+			$tmp = array();
+			foreach ($config as $key => $val) {
+				$tmp[$key] = $val instanceof Traversable ? iterator_to_array($val) : $val;
+			}
+			$config = $tmp;
 
 		} elseif (!is_array($config)) {
 			throw new InvalidArgumentException('Configuration must be array, string or object.');
@@ -64,6 +68,8 @@ class DibiConnection extends DibiObject
 		self::alias($config, 'username', 'user');
 		self::alias($config, 'password', 'pass');
 		self::alias($config, 'host', 'hostname');
+		self::alias($config, 'result|detectTypes', 'resultDetectTypes'); // back compatibility
+		self::alias($config, 'result|formatDateTime', 'resultDateTime');
 
 		if (!isset($config['driver'])) {
 			$config['driver'] = dibi::$defaultDriver;
@@ -324,7 +330,7 @@ class DibiConnection extends DibiObject
 
 		dibi::$sql = $sql;
 		if ($res = $this->driver->query($sql)) { // intentionally =
-			$res = new DibiResult($res, $this->config);
+			$res = new DibiResult($res, $this->config['result']);
 		} else {
 			$res = $this->driver->getAffectedRows();
 		}
diff --git a/dibi/libs/DibiResult.php b/dibi/libs/DibiResult.php
index e3e2a1e6..63419b1b 100644
--- a/dibi/libs/DibiResult.php
+++ b/dibi/libs/DibiResult.php
@@ -28,6 +28,10 @@
  * unset($result);
  * </code>
  *
+ * Result options:
+ *   - 'detectTypes' - whether call automatically detectTypes()
+ *   - 'formatDateTime' - how to format datetime
+ *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @package    dibi
  *
@@ -68,12 +72,12 @@ class DibiResult extends DibiObject implements IDataSource
 	{
 		$this->driver = $driver;
 
-		if (!empty($config[dibi::RESULT_DETECT_TYPES])) {
+		if (!empty($config['detectTypes'])) {
 			$this->detectTypes();
 		}
 
-		if (!empty($config[dibi::RESULT_DATE_TIME])) {
-			$this->dateFormat = is_string($config[dibi::RESULT_DATE_TIME]) ? $config[dibi::RESULT_DATE_TIME] : '';
+		if (!empty($config['formatDateTime'])) {
+			$this->dateFormat = is_string($config['formatDateTime']) ? $config['formatDateTime'] : '';
 		}
 	}