From 95b032891d6617525636cc7b680117dbb14afba7 Mon Sep 17 00:00:00 2001
From: "christophe.boulain" <>
Date: Wed, 19 Jan 2011 14:56:01 +0000
Subject: Merge last changes on "Data" from trunk

---
 framework/Data/SqlMap/Configuration/TParameterMap.php           | 8 ++++++--
 framework/Data/SqlMap/Configuration/TResultMap.php              | 3 ++-
 framework/Data/SqlMap/Configuration/TResultProperty.php         | 3 ++-
 framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'framework/Data/SqlMap/Configuration')

diff --git a/framework/Data/SqlMap/Configuration/TParameterMap.php b/framework/Data/SqlMap/Configuration/TParameterMap.php
index 4b5ee144..60b05662 100644
--- a/framework/Data/SqlMap/Configuration/TParameterMap.php
+++ b/framework/Data/SqlMap/Configuration/TParameterMap.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2010 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Data.SqlMap.Configuration
@@ -43,6 +43,7 @@ class TParameterMap extends TComponent
 	 */
 	public function __construct()
 	{
+		parent::__construct();
 		$this->_properties = new TList;
 		$this->_propertyMap = new TMap;
 	}
@@ -184,7 +185,10 @@ class TParameterMap extends TComponent
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_get_property_for_parameter',
-					$this->getID(), $property->getProperty(), get_class($object));
+				$this->getID(),
+				$property->getProperty(),
+				(is_object($object) ? get_class($object) : gettype($object))
+			);
 		}
 	}
 
diff --git a/framework/Data/SqlMap/Configuration/TResultMap.php b/framework/Data/SqlMap/Configuration/TResultMap.php
index e85dc1aa..b20a81f6 100644
--- a/framework/Data/SqlMap/Configuration/TResultMap.php
+++ b/framework/Data/SqlMap/Configuration/TResultMap.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2010 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Data.SqlMap.Configuration
@@ -51,6 +51,7 @@ class TResultMap extends TComponent
 	 */
 	public function __construct()
 	{
+		parent::__construct();
 		$this->_columns=new TMap;
 	}
 
diff --git a/framework/Data/SqlMap/Configuration/TResultProperty.php b/framework/Data/SqlMap/Configuration/TResultProperty.php
index 7316ef0b..24401812 100644
--- a/framework/Data/SqlMap/Configuration/TResultProperty.php
+++ b/framework/Data/SqlMap/Configuration/TResultProperty.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2010 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Data.SqlMap.Configuration
@@ -57,6 +57,7 @@ class TResultProperty extends TComponent
 	 */
 	public function __construct($resultMap=null)
 	{
+		parent::__construct();
 		if($resultMap instanceof TResultMap)
 			$this->_hostResultMapID = $resultMap->getID();
 	}
diff --git a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
index c49a4219..2448659a 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2010 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Data.SqlMap.Configuration
-- 
cgit v1.2.3