fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix master/slave DB handling during transaction

Browse source
This commit is contained in:
Kijin Sung 2016-02-10 11:24:10 +09:00
parent b4936c8f09
commit 0952432779
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
classes/db/DB.class.php
View file

@ -999,7 +999,7 @@ class DB
*/ */
function _getConnection($type = 'master', $indx = NULL) function _getConnection($type = 'master', $indx = NULL)
{ {
if($type == 'master') if($type == 'master' || $this->transactionNestedLevel)
{ {
if(!$this->master_db['is_connected']) if(!$this->master_db['is_connected'])
{ {
@ -1014,11 +1014,20 @@ class DB
$indx = $this->_getSlaveConnectionStringIndex($type); $indx = $this->_getSlaveConnectionStringIndex($type);
} }
if($this->slave_db[$indx]['host'] == $this->master_db['host'] && $this->slave_db[$indx]['port'] == $this->master_db['port'])
{
if(!$this->master_db['is_connected'])
{
$this->_connect($type);
}
$this->connection = 'Master ' . $this->master_db['host'];
return $this->master_db["resource"];
}
if(!$this->slave_db[$indx]['is_connected']) if(!$this->slave_db[$indx]['is_connected'])
{ {
$this->_connect($type, $indx); $this->_connect($type, $indx);
} }
$this->connection = 'Slave ' . $this->slave_db[$indx]['host']; $this->connection = 'Slave ' . $this->slave_db[$indx]['host'];
return $this->slave_db[$indx]["resource"]; return $this->slave_db[$indx]["resource"];
} }
@ -1271,7 +1280,7 @@ class DB
{ {
$connection = &$this->slave_db[$indx]; $connection = &$this->slave_db[$indx];
} }
$result = $this->__connect($connection); $result = $this->__connect($connection);
if($result === NULL || $result === FALSE) if($result === NULL || $result === FALSE)
{ {