import v1.1.0_beta1 | 2009-08-21
This commit is contained in:
@ -17,7 +17,7 @@
|
||||
* @subpackage Adapter
|
||||
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Oci.php 11942 2008-10-13 20:21:18Z mikaelkael $
|
||||
* @version $Id: Oci.php 14107 2009-02-18 21:58:36Z norm2782 $
|
||||
*/
|
||||
|
||||
|
||||
@ -46,6 +46,13 @@ class Zend_Db_Adapter_Pdo_Oci extends Zend_Db_Adapter_Pdo_Abstract
|
||||
*/
|
||||
protected $_pdoType = 'oci';
|
||||
|
||||
/**
|
||||
* Default class name for a DB statement.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $_defaultStmtClass = 'Zend_Db_Statement_Pdo_Oci';
|
||||
|
||||
/**
|
||||
* Keys are UPPERCASE SQL datatypes or the constants
|
||||
* Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
|
||||
@ -76,20 +83,22 @@ class Zend_Db_Adapter_Pdo_Oci extends Zend_Db_Adapter_Pdo_Abstract
|
||||
// baseline of DSN parts
|
||||
$dsn = $this->_config;
|
||||
|
||||
$tns = 'dbname=(DESCRIPTION=';
|
||||
if (isset($dsn['host'])) {
|
||||
$tns .= '(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=' . $dsn['host'] . ')';
|
||||
$tns = 'dbname=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)' .
|
||||
'(HOST=' . $dsn['host'] . ')';
|
||||
|
||||
if (isset($dsn['port'])) {
|
||||
$tns .= '(PORT=' . $dsn['port'] . ')';
|
||||
} else {
|
||||
$tns .= '(PORT=1521)';
|
||||
}
|
||||
$tns .= '))';
|
||||
}
|
||||
$tns .= '(CONNECT_DATA=(SID=' . $dsn['dbname'] . ')))';
|
||||
|
||||
if (isset($dsn['charset']))
|
||||
{
|
||||
$tns .= '))(CONNECT_DATA=(SID=' . $dsn['dbname'] . ')))';
|
||||
} else {
|
||||
$tns = 'dbname=' . $dsn['dbname'];
|
||||
}
|
||||
|
||||
if (isset($dsn['charset'])) {
|
||||
$tns .= ';charset=' . $dsn['charset'];
|
||||
}
|
||||
|
||||
@ -170,21 +179,46 @@ class Zend_Db_Adapter_Pdo_Oci extends Zend_Db_Adapter_Pdo_Abstract
|
||||
*/
|
||||
public function describeTable($tableName, $schemaName = null)
|
||||
{
|
||||
$sql = "SELECT TC.TABLE_NAME, TB.OWNER, TC.COLUMN_NAME, TC.DATA_TYPE,
|
||||
TC.DATA_DEFAULT, TC.NULLABLE, TC.COLUMN_ID, TC.DATA_LENGTH,
|
||||
TC.DATA_SCALE, TC.DATA_PRECISION, C.CONSTRAINT_TYPE, CC.POSITION
|
||||
FROM ALL_TAB_COLUMNS TC
|
||||
LEFT JOIN (ALL_CONS_COLUMNS CC JOIN ALL_CONSTRAINTS C
|
||||
ON (CC.CONSTRAINT_NAME = C.CONSTRAINT_NAME AND CC.TABLE_NAME = C.TABLE_NAME AND C.CONSTRAINT_TYPE = 'P'))
|
||||
ON TC.TABLE_NAME = CC.TABLE_NAME AND TC.COLUMN_NAME = CC.COLUMN_NAME
|
||||
JOIN ALL_TABLES TB ON (TB.TABLE_NAME = TC.TABLE_NAME AND TB.OWNER = TC.OWNER)
|
||||
WHERE TC.TABLE_NAME = :TBNAME";
|
||||
$bind[':TBNAME'] = $tableName;
|
||||
if ($schemaName) {
|
||||
$sql .= ' AND TB.OWNER = :SCNAME';
|
||||
$bind[':SCNAME'] = $schemaName;
|
||||
$version = $this->getServerVersion();
|
||||
if (($version === null) || version_compare($version, '9.0.0', '>=')) {
|
||||
$sql = "SELECT TC.TABLE_NAME, TC.OWNER, TC.COLUMN_NAME, TC.DATA_TYPE,
|
||||
TC.DATA_DEFAULT, TC.NULLABLE, TC.COLUMN_ID, TC.DATA_LENGTH,
|
||||
TC.DATA_SCALE, TC.DATA_PRECISION, C.CONSTRAINT_TYPE, CC.POSITION
|
||||
FROM ALL_TAB_COLUMNS TC
|
||||
LEFT JOIN (ALL_CONS_COLUMNS CC JOIN ALL_CONSTRAINTS C
|
||||
ON (CC.CONSTRAINT_NAME = C.CONSTRAINT_NAME AND CC.TABLE_NAME = C.TABLE_NAME AND C.CONSTRAINT_TYPE = 'P'))
|
||||
ON TC.TABLE_NAME = CC.TABLE_NAME AND TC.COLUMN_NAME = CC.COLUMN_NAME
|
||||
WHERE UPPER(TC.TABLE_NAME) = UPPER(:TBNAME)";
|
||||
$bind[':TBNAME'] = $tableName;
|
||||
if ($schemaName) {
|
||||
$sql .= ' AND UPPER(TC.OWNER) = UPPER(:SCNAME)';
|
||||
$bind[':SCNAME'] = $schemaName;
|
||||
}
|
||||
$sql .= ' ORDER BY TC.COLUMN_ID';
|
||||
} else {
|
||||
$subSql="SELECT AC.OWNER, AC.TABLE_NAME, ACC.COLUMN_NAME, AC.CONSTRAINT_TYPE, ACC.POSITION
|
||||
from ALL_CONSTRAINTS AC, ALL_CONS_COLUMNS ACC
|
||||
WHERE ACC.CONSTRAINT_NAME = AC.CONSTRAINT_NAME
|
||||
AND ACC.TABLE_NAME = AC.TABLE_NAME
|
||||
AND ACC.OWNER = AC.OWNER
|
||||
AND AC.CONSTRAINT_TYPE = 'P'
|
||||
AND UPPER(AC.TABLE_NAME) = UPPER(:TBNAME)";
|
||||
$bind[':TBNAME'] = $tableName;
|
||||
if ($schemaName) {
|
||||
$subSql .= ' AND UPPER(ACC.OWNER) = UPPER(:SCNAME)';
|
||||
$bind[':SCNAME'] = $schemaName;
|
||||
}
|
||||
$sql="SELECT TC.TABLE_NAME, TC.OWNER, TC.COLUMN_NAME, TC.DATA_TYPE,
|
||||
TC.DATA_DEFAULT, TC.NULLABLE, TC.COLUMN_ID, TC.DATA_LENGTH,
|
||||
TC.DATA_SCALE, TC.DATA_PRECISION, CC.CONSTRAINT_TYPE, CC.POSITION
|
||||
FROM ALL_TAB_COLUMNS TC, ($subSql) CC
|
||||
WHERE UPPER(TC.TABLE_NAME) = UPPER(:TBNAME)
|
||||
AND TC.OWNER = CC.OWNER(+) AND TC.TABLE_NAME = CC.TABLE_NAME(+) AND TC.COLUMN_NAME = CC.COLUMN_NAME(+)";
|
||||
if ($schemaName) {
|
||||
$sql .= ' AND UPPER(TC.OWNER) = UPPER(:SCNAME)';
|
||||
}
|
||||
$sql .= ' ORDER BY TC.COLUMN_ID';
|
||||
}
|
||||
$sql .= ' ORDER BY TC.COLUMN_ID';
|
||||
|
||||
$stmt = $this->query($sql, $bind);
|
||||
|
||||
@ -332,12 +366,12 @@ class Zend_Db_Adapter_Pdo_Oci extends Zend_Db_Adapter_Pdo_Abstract
|
||||
*/
|
||||
$limit_sql = "SELECT z2.*
|
||||
FROM (
|
||||
SELECT ROWNUM AS zend_db_rownum, z1.*
|
||||
SELECT z1.*, ROWNUM AS \"zend_db_rownum\"
|
||||
FROM (
|
||||
" . $sql . "
|
||||
) z1
|
||||
) z2
|
||||
WHERE z2.zend_db_rownum BETWEEN " . ($offset+1) . " AND " . ($offset+$count);
|
||||
WHERE z2.\"zend_db_rownum\" BETWEEN " . ($offset+1) . " AND " . ($offset+$count);
|
||||
return $limit_sql;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user