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/Common/Oracle/TOracleMetaData.php  | 2 +-
 framework/Data/Common/Oracle/TOracleTableInfo.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'framework/Data/Common/Oracle')

diff --git a/framework/Data/Common/Oracle/TOracleMetaData.php b/framework/Data/Common/Oracle/TOracleMetaData.php
index 5fdf1d5c..ac119454 100644
--- a/framework/Data/Common/Oracle/TOracleMetaData.php
+++ b/framework/Data/Common/Oracle/TOracleMetaData.php
@@ -163,7 +163,7 @@ EOD;
 		$command = $this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':schema',$schemaName);
 		//$command->bindValue(':table', $tableName);
-		return intval($command->queryScalar()) === 'VIEW';
+		return intval($command->queryScalar() === 'VIEW');
 	}
 
 	/**
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;
-- 
cgit v1.2.3