diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-03-05 02:19:38 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-03-05 02:19:38 +0000 |
| commit | 28b38f054786014f436eefa019308eb8658cb711 (patch) | |
| tree | 4be0b2cbdc589b216f85aacc7950a4123aecf101 /phpBB/db/mssql-odbc.php | |
| parent | be2532588c3a0472d915bc378207883c350f1a0c (diff) | |
| download | forums-28b38f054786014f436eefa019308eb8658cb711.tar forums-28b38f054786014f436eefa019308eb8658cb711.tar.gz forums-28b38f054786014f436eefa019308eb8658cb711.tar.bz2 forums-28b38f054786014f436eefa019308eb8658cb711.tar.xz forums-28b38f054786014f436eefa019308eb8658cb711.zip | |
Fixed various transaction related issues and changed mssql-odbc name to ... mssql-odbc, hopefully this hasn't been (and won't be) responsible for any problems ...
git-svn-id: file:///svn/phpbb/trunk@2269 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/db/mssql-odbc.php')
| -rw-r--r-- | phpBB/db/mssql-odbc.php | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/phpBB/db/mssql-odbc.php b/phpBB/db/mssql-odbc.php index f71f95bafc..76424d111e 100644 --- a/phpBB/db/mssql-odbc.php +++ b/phpBB/db/mssql-odbc.php @@ -22,7 +22,7 @@ if(!defined("SQL_LAYER")) { -define("SQL_LAYER","mssql"); +define("SQL_LAYER","mssql-odbc"); class sql_db { @@ -93,7 +93,7 @@ class sql_db { $this->num_queries++; - if( $transaction == BEGIN_TRANSACTION ) + if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) { if( !odbc_autocommit($this->db_connect_id, false) ) { @@ -190,9 +190,15 @@ class sql_db if( $transaction == END_TRANSACTION && $this->in_transaction ) { - odbc_commit($this->db_connect_id); - odbc_autocommit($this->db_connect_id, true); $this->in_transaction = FALSE; + + if ( !odbc_commit($this->db_connect_id) ) + { + odbc_rollback($this->db_connect_id); + odbc_autocommit($this->db_connect_id, true); + return false; + } + odbc_autocommit($this->db_connect_id, true); } odbc_free_result($this->result); @@ -201,7 +207,20 @@ class sql_db } else { - return false; + if( $transaction == END_TRANSACTION && $this->in_transaction ) + { + $this->in_transaction = FALSE; + + if ( !@odbc_commit($this->db_connect_id) ) + { + odbc_rollback($this->db_connect_id); + odbc_autocommit($this->db_connect_id, true); + return false; + } + odbc_autocommit($this->db_connect_id, true); + } + + return true; } } |