diff options
Diffstat (limited to 'drivers/adodb-oci8.inc.php')
| -rw-r--r-- | drivers/adodb-oci8.inc.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/adodb-oci8.inc.php b/drivers/adodb-oci8.inc.php index 75593569..b9595d20 100644 --- a/drivers/adodb-oci8.inc.php +++ b/drivers/adodb-oci8.inc.php @@ -1,7 +1,7 @@ <?php /* - @version v5.20.10 08-Mar-2018 + @version v5.21.0-dev ??-???-2016 @copyright (c) 2000-2013 John Lim. All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community @@ -106,9 +106,6 @@ END; function __construct() { $this->_hasOciFetchStatement = ADODB_PHPVER >= 0x4200; - if (defined('ADODB_EXTENSION')) { - $this->rsPrefix .= 'ext_'; - } } /* function MetaColumns($table, $normalize=true) added by smondino@users.sourceforge.net*/ @@ -1745,7 +1742,8 @@ class ADORecordset_oci8 extends ADORecordSet { oci_free_cursor($this->_refcursor); $this->_refcursor = false; } - @oci_free_statement($this->_queryID); + if (is_resource($this->_queryID)) + @oci_free_statement($this->_queryID); $this->_queryID = false; } @@ -1802,16 +1800,12 @@ class ADORecordset_oci8 extends ADORecordSet { return 'I'; default: - return 'N'; + return ADODB_DEFAULT_METATYPE; } } } class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 { - function __construct($queryID,$mode=false) - { - parent::__construct($queryID, $mode); - } function MoveNext() { |