From 56e591d3f5101b2a0f93d0e9a879a16ac5515f9e Mon Sep 17 00:00:00 2001 From: Mark Newnham Date: Fri, 26 Mar 2021 19:50:38 -0600 Subject: Removed the custom _execute() method The issue regarding multiple connections see #201 appears to have been resolved --- drivers/adodb-firebird.inc.php | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/drivers/adodb-firebird.inc.php b/drivers/adodb-firebird.inc.php index cd9f284a..ed6141be 100644 --- a/drivers/adodb-firebird.inc.php +++ b/drivers/adodb-firebird.inc.php @@ -231,7 +231,15 @@ class ADODB_firebird extends ADOConnection { return $this->_transactionID; } - function CommitTrans($ok=true) + + /** + * Commits a transaction + * + * @param bool $ok set to false to rollback transaction, true to commit + * + * @return true/false. + */ + public function commitTrans($ok=true) { if (!$ok) { return $this->RollbackTrans(); @@ -257,22 +265,7 @@ class ADODB_firebird extends ADOConnection { return fbird_affected_rows( $this->_transactionID ? $this->_transactionID : $this->_connectionID ); } - // there are some compat problems with ADODB_COUNTRECS=false and $this->_logsql currently. - // it appears that ibase extension cannot support multiple concurrent queryid's - function _Execute($sql,$inputarr=false) { - global $ADODB_COUNTRECS; - - if ($this->_logsql) { - $savecrecs = $ADODB_COUNTRECS; - $ADODB_COUNTRECS = true; // force countrecs - $ret =& ADOConnection::_Execute($sql,$inputarr); - $ADODB_COUNTRECS = $savecrecs; - } else { - $ret = ADOConnection::_Execute($sql,$inputarr); - } - return $ret; - } - + function RollbackTrans() { if ($this->transOff) return true; -- cgit v1.3