as2252258/kiri-databases
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

modify plugin name

Browse Source
This commit is contained in:
向林
2022-02-24 11:00:00 +08:00
parent 55f665e10b
commit 69dbc1e7f3
1 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Connection.php
+11 -29
View File
@@ -110,9 +110,9 @@ class Connection extends Component
$connections = $this->connections(); $connections = $this->connections();
$pool = Config::get('databases.pool.max', 10); $pool = Config::get('databases.pool.max', 10);
$connections->initConnections('Mysql:' . $this->cds, true, $pool); $connections->initConnections('Mysql:' . $this->cds, $pool);
if (!empty($this->slaveConfig) && $this->cds != $this->slaveConfig['cds']) { if (!empty($this->slaveConfig) && $this->cds != $this->slaveConfig['cds']) {
$connections->initConnections('Mysql:' . $this->slaveConfig['cds'], false, $pool); $connections->initConnections('Mysql:' . $this->slaveConfig['cds'], $pool);
} }
} }
@@ -203,7 +203,7 @@ class Connection extends Component
if ($this->slaveConfig['cds'] == $this->cds) { if ($this->slaveConfig['cds'] == $this->cds) {
return $this->masterInstance(); return $this->masterInstance();
} }
return $this->connections()->get($this->slaveConfig, false); return $this->connections()->get($this->slaveConfig);
} }
@@ -284,24 +284,6 @@ class Connection extends Component
} }
/**
* @param PDO $PDO
* @return void
* @throws Kiri\Exception\ConfigException
* @throws Exception
*/
public function releaseSlaveConnect(PDO $PDO)
{
$connections = $this->connections();
if (empty($this->slaveConfig)) {
$this->slaveConfig = ['cds' => $this->cds, 'username' => $this->username, 'password' => $this->password];
}
$connections->recover($this->slaveConfig['cds'], $PDO, false);
}
/** /**
* *
* 回收链接 * 回收链接
@@ -314,13 +296,13 @@ class Connection extends Component
return; return;
} }
$connections = $this->connections(); $connections = $this->connections();
$connections->release($this->cds, true); $connections->release($this->cds);
if (empty($this->slaveConfig) || !isset($this->slaveConfig['cds'])) { if (empty($this->slaveConfig) || !isset($this->slaveConfig['cds'])) {
$this->slaveConfig['cds'] = $this->cds; $this->slaveConfig['cds'] = $this->cds;
} }
$connections->release($this->slaveConfig['cds'], false); $connections->release($this->slaveConfig['cds']);
} }
@@ -331,13 +313,13 @@ class Connection extends Component
{ {
$connections = $this->connections(); $connections = $this->connections();
$connections->release($this->cds, true); $connections->release($this->cds);
if (empty($this->slaveConfig) || !isset($this->slaveConfig['cds'])) { if (empty($this->slaveConfig) || !isset($this->slaveConfig['cds'])) {
$this->slaveConfig['cds'] = $this->cds; $this->slaveConfig['cds'] = $this->cds;
} }
$connections->release($this->slaveConfig['cds'], false); $connections->release($this->slaveConfig['cds']);
} }
/** /**
@@ -349,13 +331,13 @@ class Connection extends Component
{ {
$connections = $this->connections(); $connections = $this->connections();
$connections->connection_clear($this->cds, true); $connections->connection_clear($this->cds);
if (empty($this->slaveConfig) || !isset($this->slaveConfig['cds'])) { if (empty($this->slaveConfig) || !isset($this->slaveConfig['cds'])) {
$this->slaveConfig['cds'] = $this->cds; $this->slaveConfig['cds'] = $this->cds;
} }
$connections->connection_clear($this->slaveConfig['cds'], false); $connections->connection_clear($this->slaveConfig['cds']);
} }
@@ -365,13 +347,13 @@ class Connection extends Component
public function disconnect() public function disconnect()
{ {
$connections = $this->connections(); $connections = $this->connections();
$connections->disconnect($this->cds, true); $connections->disconnect($this->cds);
if (empty($this->slaveConfig) || !isset($this->slaveConfig['cds'])) { if (empty($this->slaveConfig) || !isset($this->slaveConfig['cds'])) {
$this->slaveConfig['cds'] = $this->cds; $this->slaveConfig['cds'] = $this->cds;
} }
$connections->disconnect($this->slaveConfig['cds'], false); $connections->disconnect($this->slaveConfig['cds']);
} }
} }