summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe.Boulain <>2009-05-13 06:59:31 +0000
committerChristophe.Boulain <>2009-05-13 06:59:31 +0000
commit7c6ca9a1d405826acc53ca9b1d61a748fb477180 (patch)
treec06b0f5560c5407302da71a24f949cdd4e923965
parent5d8f02c263283f1bf825f980ecf4ce8cab4013a3 (diff)
Fixed Issue#154
-rw-r--r--HISTORY3
-rw-r--r--framework/Data/Common/Oracle/TOracleMetaData.php43
2 files changed, 8 insertions, 38 deletions
diff --git a/HISTORY b/HISTORY
index 30c85fe3..3807a634 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3,6 +3,7 @@ BUG: Issue#55 - TPropertyAccess.get and has don't recognize magic getter __get (
BUG: Issue#68 - TSqlMapConfig::createSqlMapGateway(): assign current connection to cached TSqlMapManager to avoid loosing active transaction (Yves)
BUG: Issue#87 - TinyMCE : empty string disapears after encoding JS, that's a problem! (Christophe)
BUG: Issue#88 - SQLMap $Param$ re-evaluation bug (Yves)
+BUG: Issue#95 - TMysqlMetaData::getShowCreateTable() throws TPhpErrorException "[Notice] Undefined index: Create Table" if table is a view (Yves)
BUG: Issue#96 - THttpResponse::redirect don't send status code (Christophe)
BUG: Issue#99 - TActiveRecord::save(): confusion with order of keys in table/index (Christophe)
BUG: Issue#108 - clientscripts.php: prepending set_time_limit(0) call with an "@" to suppress PHP warning in safe mode (Yves)
@@ -16,7 +17,7 @@ BUG: Issue#130 - TDbLogRoute::processLogs wrong values binding (Christophe)
BUG: Issue#136 - TActiveDatePicker don't callback when ShowCalendar is false (Christophe)
BUG: Issue#148 - Bad Oracle Support (E.Letard)
BUG: Issue#150 - Multiple TDropContainers in same namingcontainer give error (Christophe)
-BUG: Issue#95 - TMysqlMetaData::getShowCreateTable() throws TPhpErrorException "[Notice] Undefined index: Create Table" if table is a view
+Bug: Issue#154 - Bug in TOracleMetaData.php causing SqlMap not work with Oracle database (Christophe)
BUG: URL wildcard patterns didn't work with subfolders
BUG: TDbLogRoute::createDbTable: add AUTO_INCREMENT attribute to log_id column if driver is mysql (Yves)
BUG: Ensure rendering of clientID in TActivePanel (Christophe)
diff --git a/framework/Data/Common/Oracle/TOracleMetaData.php b/framework/Data/Common/Oracle/TOracleMetaData.php
index bb8e9b7b..5fdf1d5c 100644
--- a/framework/Data/Common/Oracle/TOracleMetaData.php
+++ b/framework/Data/Common/Oracle/TOracleMetaData.php
@@ -10,7 +10,10 @@
* @package System.Data.Common.Oracle
*/
-
+/**
+ * Load the base TDbMetaData class.
+ */
+Prado::using('System.Data.Common.TDbMetaData');
Prado::using('System.Data.Common.Oracle.TOracleTableInfo');
Prado::using('System.Data.Common.Oracle.TOracleTableColumn');
@@ -22,28 +25,11 @@ Prado::using('System.Data.Common.Oracle.TOracleTableColumn');
* @package System.Data.Common.Oracle
* @since 3.1
*/
-class TOracleMetaData extends TComponent
+class TOracleMetaData extends TDbMetaData
{
- private $_tableInfoCache=array();
- private $_connection;
private $_defaultSchema = 'system';
- /**
- * @param TDbConnection database connection.
- */
- public function __construct($conn)
- {
- $this->_connection=$conn;
- }
-
- /**
- * @return TDbConnection database connection.
- */
- public function getDbConnection()
- {
- return $this->_connection;
- }
-
+
/**
* @return string TDbTableInfo class name.
*/
@@ -69,23 +55,6 @@ class TOracleMetaData extends TComponent
}
/**
- * Obtains table meta data information for the current connection and given table name.
- * @param string table or view name
- * @return TDbTableInfo table information.
- */
- public function getTableInfo($tableName=null)
- {
- $key = $tableName===null?$this->getDbConnection()->getConnectionString():$tableName;
- if(!isset($this->_tableInfoCache[$key]))
- {
- $class = $this->getTableInfoClass();
- $tableInfo = $tableName===null ? new $class : $this->createTableInfo($tableName);
- $this->_tableInfoCache[$key] = $tableInfo;
- }
- return $this->_tableInfoCache[$key];
- }
-
- /**
* @param string table name with optional schema name prefix, uses default schema name prefix is not provided.
* @return array tuple as ($schemaName,$tableName)
*/