mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-27 20:10:18 +02:00
Code Issues Releases Wiki Activity

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 ...

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@2269 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2002-03-05 02:19:38 +00:00
parent be2532588c
commit 28b38f0547
5 changed files with 99 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
phpBB/db/postgres7.php
View File

@@ -109,7 +109,6 @@ class sql_db
}
}
//
// Query method
//
@@ -125,14 +124,14 @@ class sql_db
$query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2 OFFSET \\1", $query);
if( $transaction == BEGIN_TRANSACTION )
if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction )
{
$result = @pg_exec($this->db_connect_id, "BEGIN");
if( !$result )
$this->in_transaction = TRUE;
if( !@pg_exec($this->db_connect_id, "BEGIN") )
{
return false;
}
$this->in_transaction = TRUE;
}
$this->query_result = @pg_exec($this->db_connect_id, $query);
@@ -140,13 +139,13 @@ class sql_db
{
if( $transaction == END_TRANSACTION )
{
$result = @pg_exec($this->db_connect_id, "COMMIT");
if( !$result )
$this->in_transaction = FALSE;
if( !@pg_exec($this->db_connect_id, "COMMIT") )
{
@pg_exec($this->db_connect_id, "ROLLBACK");
return false;
}
$this->in_transaction = FALSE;
}
$this->last_query_text[$this->query_result] = $query;
@@ -170,18 +169,18 @@ class sql_db
}
else
{
if( $transaction == END_TRANSACTION )
if( $transaction == END_TRANSACTION && $this->in_transaction )
{
$result = @pg_exec($this->db_connect_id, "COMMIT");
if( !$result )
$this->in_transaction = FALSE;
if( !@pg_exec($this->db_connect_id, "COMMIT") )
{
@pg_exec($this->db_connect_id, "ROLLBACK");
return false;
}
$this->in_transaction = FALSE;
}
return false;
return true;
}
}