Ensured parent::__construct calls within Data

22 files changed, 58 insertions, 35 deletions

diff --git a/framework/Data/ActiveRecord/TActiveRecord.php b/framework/Data/ActiveRecord/TActiveRecord.php
index af171bbd..34de431b 100644
--- a/framework/Data/ActiveRecord/TActiveRecord.php
+++ b/framework/Data/ActiveRecord/TActiveRecord.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.ActiveRecord
@@ -225,6 +225,7 @@ abstract class TActiveRecord extends TComponent
 	 */
 	public function __construct($data=array(), $connection=null)
 	{
+		parent::__construct();
 		if($connection!==null)
 			$this->setDbConnection($connection);
 		$this->setupColumnMapping();
diff --git a/framework/Data/ActiveRecord/TActiveRecordGateway.php b/framework/Data/ActiveRecord/TActiveRecordGateway.php
index a61ae0ff..534bd253 100644
--- a/framework/Data/ActiveRecord/TActiveRecordGateway.php
+++ b/framework/Data/ActiveRecord/TActiveRecordGateway.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.ActiveRecord
@@ -42,6 +42,7 @@ class TActiveRecordGateway extends TComponent
 	 */
 	public function __construct(TActiveRecordManager $manager)
 	{
+		parent::__construct();
 		$this->_manager=$manager;
 	}
 
diff --git a/framework/Data/Common/Oracle/TOracleTableInfo.php b/framework/Data/Common/Oracle/TOracleTableInfo.php
index c7d373b2..0a6238e0 100644
--- a/framework/Data/Common/Oracle/TOracleTableInfo.php
+++ b/framework/Data/Common/Oracle/TOracleTableInfo.php
@@ -5,7 +5,7 @@
  *
  * @author Marcos Nobre <marconobre[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.Common
@@ -36,6 +36,7 @@ class TOracleTableInfo extends TComponent
 	 */
 	public function __construct($tableInfo=array(),$primary=array(),$foreign=array())
 	{
+		parent::__construct();
 		$this->_info=$tableInfo;
 		$this->_primaryKeys=$primary;
 		$this->_foreignKeys=$foreign;
diff --git a/framework/Data/Common/TDbCommandBuilder.php b/framework/Data/Common/TDbCommandBuilder.php
index 0dc13e7e..8619c435 100644
--- a/framework/Data/Common/TDbCommandBuilder.php
+++ b/framework/Data/Common/TDbCommandBuilder.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.Common

@@ -30,6 +30,7 @@ class TDbCommandBuilder extends TComponent
 	 */

 	public function __construct($connection=null, $tableInfo=null)

 	{

+		parent::__construct();

 		$this->setDbConnection($connection);

 		$this->setTableInfo($tableInfo);

 	}

diff --git a/framework/Data/Common/TDbMetaData.php b/framework/Data/Common/TDbMetaData.php
index bcdf0e46..1a194056 100644
--- a/framework/Data/Common/TDbMetaData.php
+++ b/framework/Data/Common/TDbMetaData.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.Common

@@ -31,6 +31,7 @@ abstract class TDbMetaData extends TComponent
 	 */

 	public function __construct($conn)

 	{

+		parent::__construct();

 		$this->_connection=$conn;

 	}

 

diff --git a/framework/Data/Common/TDbTableColumn.php b/framework/Data/Common/TDbTableColumn.php
index 3bb9454b..84fa6c55 100644
--- a/framework/Data/Common/TDbTableColumn.php
+++ b/framework/Data/Common/TDbTableColumn.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.Common

@@ -30,6 +30,7 @@ class TDbTableColumn extends TComponent
 	 */

 	public function __construct($columnInfo)

 	{

+		parent::__construct();

 		$this->_info=$columnInfo;

 	}

 

diff --git a/framework/Data/Common/TDbTableInfo.php b/framework/Data/Common/TDbTableInfo.php
index 455dbc33..6f37791a 100644
--- a/framework/Data/Common/TDbTableInfo.php
+++ b/framework/Data/Common/TDbTableInfo.php
@@ -1,10 +1,10 @@
-<?php
+<?php

 /**

  * TDbTableInfo class file.

  *

  * @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.Common

@@ -27,11 +27,11 @@ class TDbTableInfo extends TComponent
 

 	private $_columns;

 

-	private $_lowercase;
-
-	/**
-	 * @var null|array
-	 * @since 3.1.7
+	private $_lowercase;

+

+	/**

+	 * @var null|array

+	 * @since 3.1.7

 	 */

 	private $_names = null;

 

@@ -41,6 +41,7 @@ class TDbTableInfo extends TComponent
 	 */

 	public function __construct($tableInfo=array(),$primary=array(),$foreign=array())

 	{

+		parent::__construct();

 		$this->_info=$tableInfo;

 		$this->_primaryKeys=$primary;

 		$this->_foreignKeys=$foreign;

@@ -124,12 +125,12 @@ class TDbTableInfo extends TComponent
 	 * @return array table column names (identifier quoted)

 	 */

 	public function getColumnNames()

-	{
-		if($this->_names===null)
+	{

+		if($this->_names===null)

 		{

 			$this->_names=array();

 			foreach($this->getColumns() as $column)

-				$this->_names[] = $column->getColumnName();
+				$this->_names[] = $column->getColumnName();

 		}

 		return $this->_names;

 	}

diff --git a/framework/Data/DataGateway/TDataGatewayCommand.php b/framework/Data/DataGateway/TDataGatewayCommand.php
index e290f457..034ea36e 100644
--- a/framework/Data/DataGateway/TDataGatewayCommand.php
+++ b/framework/Data/DataGateway/TDataGatewayCommand.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.DataGateway

@@ -43,6 +43,7 @@ class TDataGatewayCommand extends TComponent
 	 */

 	public function __construct($builder)

 	{

+		parent::__construct();

 		$this->_builder = $builder;

 	}

 

@@ -469,6 +470,7 @@ class TDataGatewayEventParameter extends TEventParameter
 

 	public function __construct($command,$criteria)

 	{

+		parent::__construct();

 		$this->_command=$command;

 		$this->_criteria=$criteria;

 	}

diff --git a/framework/Data/DataGateway/TSqlCriteria.php b/framework/Data/DataGateway/TSqlCriteria.php
index 14e37b35..1b85c7d3 100644
--- a/framework/Data/DataGateway/TSqlCriteria.php
+++ b/framework/Data/DataGateway/TSqlCriteria.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: TDbSqlCriteria.php 1835 2007-04-03 01:38:15Z wei $

  * @package System.Data.DataGateway

@@ -49,6 +49,7 @@ class TSqlCriteria extends TComponent
 	 */

 	public function __construct($condition=null, $parameters=array())

 	{

+		parent::__construct();

 		if(!is_array($parameters) && func_num_args() > 1)

 			$parameters = array_slice(func_get_args(),1);

 		$this->_parameters=new TAttributeCollection;

diff --git a/framework/Data/SqlMap/Configuration/TParameterMap.php b/framework/Data/SqlMap/Configuration/TParameterMap.php
index 4b5ee144..60cf9f32 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;

 	}

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..5aa7e24d 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

@@ -152,6 +152,7 @@ class TSqlMapXmlConfiguration extends TSqlMapXmlConfigBuilder
 	 */

 	public function __construct($manager)

 	{

+		parent::__construct();

 		$this->_manager=$manager;

 	}

 

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;

diff --git a/framework/Data/TDbCommand.php b/framework/Data/TDbCommand.php
index d09c53f4..749d3ec3 100644
--- a/framework/Data/TDbCommand.php
+++ b/framework/Data/TDbCommand.php
@@ -4,7 +4,7 @@
  *

  * @author Qiang Xue <qiang.xue@gmail.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

@@ -49,6 +49,7 @@ class TDbCommand extends TComponent
 	 */

 	public function __construct(TDbConnection $connection,$text)

 	{

+		parent::__construct();

 		$this->_connection=$connection;

 		$this->setText($text);

 	}

diff --git a/framework/Data/TDbConnection.php b/framework/Data/TDbConnection.php
index 4726083c..3709f4d4 100644
--- a/framework/Data/TDbConnection.php
+++ b/framework/Data/TDbConnection.php
@@ -4,7 +4,7 @@
  *

  * @author Qiang Xue <qiang.xue@gmail.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

@@ -119,6 +119,7 @@ class TDbConnection extends TComponent
 	 */

 	public function __construct($dsn='',$username='',$password='', $charset='')

 	{

+		parent::__construct();

 		$this->_dsn=$dsn;

 		$this->_username=$username;

 		$this->_password=$password;

@@ -179,9 +180,9 @@ class TDbConnection extends TComponent
 			try

 			{

 				$this->_pdo=new PDO($this->getConnectionString(),$this->getUsername(),

-									$this->getPassword(),$this->_attributes);
+									$this->getPassword(),$this->_attributes);

 				// This attribute is only useful for PDO::MySql driver.

-				// Ignore the warning if a driver doesn't understand this.
+				// Ignore the warning if a driver doesn't understand this.

 				@$this->_pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);

 				$this->_pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

 				$this->_active=true;

diff --git a/framework/Data/TDbDataReader.php b/framework/Data/TDbDataReader.php
index 7b54414e..4a323024 100644
--- a/framework/Data/TDbDataReader.php
+++ b/framework/Data/TDbDataReader.php
@@ -4,7 +4,7 @@
  *

  * @author Qiang Xue <qiang.xue@gmail.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

@@ -47,6 +47,7 @@ class TDbDataReader extends TComponent implements Iterator
 	 */

 	public function __construct(TDbCommand $command)

 	{

+		parent::__construct();

 		$this->_statement=$command->getPdoStatement();

 		$this->_statement->setFetchMode(PDO::FETCH_ASSOC);

 	}

diff --git a/framework/Data/TDbTransaction.php b/framework/Data/TDbTransaction.php
index 60b14a55..7c646833 100644
--- a/framework/Data/TDbTransaction.php
+++ b/framework/Data/TDbTransaction.php
@@ -4,7 +4,7 @@
  *

  * @author Qiang Xue <qiang.xue@gmail.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

@@ -51,6 +51,7 @@ class TDbTransaction extends TComponent
 	 */

 	public function __construct(TDbConnection $connection)

 	{

+		parent::__construct();

 		$this->_connection=$connection;

 		$this->setActive(true);

 	}