diff options
| author | robocoder <anthon.pang@gmail.com> | 2009-11-25 07:50:42 +0300 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2009-11-25 07:50:42 +0300 |
| commit | b3e81145346875719956918533bc4b13f49add49 (patch) | |
| tree | 06fb3c1f7144c992c949eebcb5deb316d314e19c /libs/Zend/Db/Adapter/Oracle.php | |
| parent | a81a4553cc241c56d23b723770f3a12cd5fa13fa (diff) | |
sync up with ZendFramework 1.9.6 which fixes ZF-8046
git-svn-id: http://dev.piwik.org/svn/trunk@1607 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'libs/Zend/Db/Adapter/Oracle.php')
| -rw-r--r-- | libs/Zend/Db/Adapter/Oracle.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/Zend/Db/Adapter/Oracle.php b/libs/Zend/Db/Adapter/Oracle.php index 233335825d..ec25091463 100644 --- a/libs/Zend/Db/Adapter/Oracle.php +++ b/libs/Zend/Db/Adapter/Oracle.php @@ -17,7 +17,7 @@ * @subpackage Adapter * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oracle.php 18415 2009-09-25 17:46:24Z mikaelkael $ + * @version $Id: Oracle.php 19048 2009-11-19 18:15:05Z mikaelkael $ */ /** @@ -122,7 +122,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract $this->_setExecuteMode(OCI_COMMIT_ON_SUCCESS); $connectionFuncName = ($this->_config['persistent'] == true) ? 'oci_pconnect' : 'oci_connect'; - + $this->_connection = @$connectionFuncName( $this->_config['username'], $this->_config['password'], @@ -360,7 +360,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract 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 (CC.CONSTRAINT_NAME = C.CONSTRAINT_NAME AND CC.TABLE_NAME = C.TABLE_NAME AND CC.OWNER = C.OWNER 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; |