From 20f46a1104240afbac704576bc6113d697b3ae7e Mon Sep 17 00:00:00 2001
From: javalizard <>
Date: Sun, 18 Apr 2010 04:31:22 +0000
Subject: Ensured parent::__construct calls within Data

---
 framework/Data/Common/Oracle/TOracleTableInfo.php |  3 ++-
 framework/Data/Common/TDbCommandBuilder.php       |  3 ++-
 framework/Data/Common/TDbMetaData.php             |  3 ++-
 framework/Data/Common/TDbTableColumn.php          |  3 ++-
 framework/Data/Common/TDbTableInfo.php            | 21 +++++++++++----------
 5 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'framework/Data/Common')

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;
 	}
-- 
cgit v1.2.3