Merge last changes on "Data" from trunk

9 files changed, 23 insertions, 12 deletions

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

diff --git a/framework/Data/SqlMap/Statements/TMappedStatement.php b/framework/Data/SqlMap/Statements/TMappedStatement.php
index c4bb53dd..7aab3510 100644
--- a/framework/Data/SqlMap/Statements/TMappedStatement.php
+++ b/framework/Data/SqlMap/Statements/TMappedStatement.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.Statements

@@ -116,6 +116,7 @@ class TMappedStatement extends TComponent implements IMappedStatement
 	 */

 	public function __construct(TSqlMapManager $sqlMap, TSqlMapStatement $statement)

 	{

+		parent::__construct();

 		$this->_manager = $sqlMap;

 		$this->_statement = $statement;

 		$this->_command = new TPreparedCommand();

diff --git a/framework/Data/SqlMap/Statements/TPreparedStatement.php b/framework/Data/SqlMap/Statements/TPreparedStatement.php
index 7d862378..c9faf4ee 100644
--- a/framework/Data/SqlMap/Statements/TPreparedStatement.php
+++ b/framework/Data/SqlMap/Statements/TPreparedStatement.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.Statements

@@ -26,6 +26,7 @@ class TPreparedStatement extends TComponent
 

 	public function __construct()

 	{

+		parent::__construct();

 		$this->_parameterNames=new TList;

 		$this->_parameterValues=new TMap;

 	}

diff --git a/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php b/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php
index 5d85ded9..5335c41c 100644
--- a/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php
+++ b/framework/Data/SqlMap/Statements/TSimpleDynamicSql.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.Statements

@@ -24,6 +24,7 @@ class TSimpleDynamicSql extends TStaticSql
 

 	public function __construct($mappings)

 	{

+		parent::__construct();

 		$this->_mappings = $mappings;

 	}

 

diff --git a/framework/Data/SqlMap/TSqlMapGateway.php b/framework/Data/SqlMap/TSqlMapGateway.php
index 97b31b50..3a19d155 100644
--- a/framework/Data/SqlMap/TSqlMapGateway.php
+++ b/framework/Data/SqlMap/TSqlMapGateway.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

@@ -36,6 +36,7 @@ class TSqlMapGateway extends TComponent
 

 	public function __construct($manager)

 	{

+		parent::__construct();

 		$this->_manager=$manager;

 	}

 

@@ -122,7 +123,7 @@ class TSqlMapGateway extends TComponent
 	 * @param string The name of the sql statement to execute.

 	 * @param mixed The object used to set the parameters in the SQL.

 	 * @param integer The maximum number of objects to store in each page.

-	 * @param integer The number of the page to initially load into the list.
+	 * @param integer The number of the page to initially load into the list.

 	 * @return TPagedList A PaginatedList of beans containing the rows.

 	 */

 	public function queryForPagedList($statementName, $parameter=null, $pageSize=10, $page=0)

@@ -143,7 +144,7 @@ class TSqlMapGateway extends TComponent
 	 * @param callback Row delegate handler, a valid callback required.

 	 * @param mixed The object used to set the parameters in the SQL.

 	 * @param integer The maximum number of objects to store in each page.

-	 * @param integer The number of the page to initially load into the list.
+	 * @param integer The number of the page to initially load into the list.

 	 * @return TPagedList A PaginatedList of beans containing the rows.

 	 */

 	public function queryForPagedListWithRowDelegate($statementName,$delegate, $parameter=null, $pageSize=10, $page=0)

diff --git a/framework/Data/SqlMap/TSqlMapManager.php b/framework/Data/SqlMap/TSqlMapManager.php
index 432c1c5e..0af90a3d 100644
--- a/framework/Data/SqlMap/TSqlMapManager.php
+++ b/framework/Data/SqlMap/TSqlMapManager.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

@@ -60,6 +60,7 @@ class TSqlMapManager extends TComponent
 	 */

 	public function __construct($connection=null)

 	{

+		parent::__construct();

 		$this->_connection=$connection;

 

 		$this->_mappedStatements=new TMap;