mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 13:28:55 +00:00
ok, but this time...
git-svn-id: file:///svn/phpbb/trunk@6230 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
a07193a22a
commit
a7225f2952
1 changed files with 13 additions and 4 deletions
|
@ -46,9 +46,6 @@ class dbal_firebird extends dbal
|
|||
|
||||
$this->db_connect_id = ($this->persistency) ? @ibase_pconnect($this->server . ':' . $this->dbname, $this->user, $sqlpassword, false, false, 3) : @ibase_connect($this->server . ':' . $this->dbname, $this->user, $sqlpassword, false, false, 3);
|
||||
|
||||
/**
|
||||
* @todo evaluate the implications of opening a service connection
|
||||
*/
|
||||
$this->service_handle = (function_exists('ibase_service_attach')) ? @ibase_service_attach($this->server, $this->user, $sqlpassword) : false;
|
||||
|
||||
return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
|
||||
|
@ -76,7 +73,7 @@ class dbal_firebird extends dbal
|
|||
switch ($status)
|
||||
{
|
||||
case 'begin':
|
||||
return @ibase_trans();
|
||||
return true;
|
||||
break;
|
||||
|
||||
case 'commit':
|
||||
|
@ -117,6 +114,18 @@ class dbal_firebird extends dbal
|
|||
$this->sql_error($query);
|
||||
}
|
||||
|
||||
if (!$this->transaction)
|
||||
{
|
||||
if (function_exists('ibase_commit_ret'))
|
||||
{
|
||||
@ibase_commit_ret();
|
||||
}
|
||||
else
|
||||
{
|
||||
@ibase_commit();
|
||||
}
|
||||
}
|
||||
|
||||
if ($cache_ttl && method_exists($cache, 'sql_save'))
|
||||
{
|
||||
$this->open_queries[(int) $this->query_result] = $this->query_result;
|
||||
|
|
Loading…
Add table
Reference in a new issue