cvs: pear /MDB2 MDB2.php

lsmith Thu Nov 25 09:27:04 2004 EDT Modified files: /pear/MDB2 MDB2.php Log: removed destructor .. we will leave closing of open transactions to the given RDBMS (ext) http://cvs.php.net/diff.php/pear/MDB2/MDB2.php?r1=1.68&r2=1.69&ty=u Index: pear/MDB2/MDB2.php diff -u pear/MDB2/MDB2.php:1.68 pear/MDB2/MDB2.php:1.69 --- pear/MDB2/MDB2.php:1.68 Thu Nov 25 06:11:33 2004 +++ pear/MDB2/MDB2.php Thu Nov 25 09:27:04 2004 @@ -43,7 +43,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: MDB2.php,v 1.68 2004/11/25 11:11:33 quipo Exp $ +// $Id: MDB2.php,v 1.69 2004/11/25 14:27:04 lsmith Exp $ // /** @@ -941,13 +941,6 @@ var $debug_output = ''; /** - * determine if queries should auto commit or not - * @var boolean - * @access public - */ - var $auto_commit = true; - - /** * determine if there is an open transaction * @var boolean * @access private @@ -1024,13 +1017,6 @@ */ var $blobs = array(); - /** - * determines of the PHP4 destructor emulation has been enabled yet - * @var array - * @access private - */ - var $destructor_registered; - // }}} // {{{ constructor @@ -1043,10 +1029,6 @@ $db_index = key($GLOBALS['_MDB2_databases']) + 1; $GLOBALS['_MDB2_databases'][$db_index] = &$this; $this->db_index = $db_index; - - if (substr(PHP_VERSION, 0, 1) >= 5) { - $this->destructor_registered = true; - } } // }}} @@ -1536,12 +1518,6 @@ */ function disconnect() { - if ($this->in_transaction - && !MDB2::isError($this->rollback()) - //&& !MDB2::isError($this->commmit()) - ) { - $this->in_transaction = false; - } unset($GLOBALS['_MDB2_databases'][$this->db_index]); return $this->_close(); } @@ -2372,28 +2348,6 @@ $result->free(); return $all; } - - // }}} - // {{{ Destructor - - /** - * this function closes open transactions to be executed at shutdown - * - * @access private - */ - function __destruct() - { - /* - if ($this->in_transaction) { - $this->rollback(); - } - */ - $this->_close(); - } - function _MDB2_Driver_Common() - { - $this->__destruct(); - } } class MDB2_Result