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

变更

Browse Source
This commit is contained in:
向林
2023-04-03 13:45:59 +08:00
parent 7eb80d607b
commit 4e109ffdf8
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Connection.php
+12 -14
View File
@@ -52,7 +52,7 @@ class Connection extends Component
public int $read_timeout = 10; public int $read_timeout = 10;
public array $pool; public array $pool = ['max' => 10, 'min' => 1];
private PoolConnection $connection; private PoolConnection $connection;
@@ -118,9 +118,16 @@ class Connection extends Component
*/ */
public function connectPoolInstance() public function connectPoolInstance()
{ {
$pool = $this->slaveConfig['pool'] ?? ['max' => 10, 'min' => 1]; $this->connection->initConnections([
'cds' => $this->cds,
$this->connection->initConnections($this->cds, $pool['max']); 'username' => $this->username,
'password' => $this->password,
'attributes' => $this->attributes,
'connect_timeout' => $this->connect_timeout,
'read_timeout' => $this->read_timeout,
'dbname' => $this->database,
'pool' => $this->pool
], $this->pool['max']);
} }
@@ -148,16 +155,7 @@ class Connection extends Component
*/ */
public function getMasterClient(): Mysql\PDO public function getMasterClient(): Mysql\PDO
{ {
return $this->connection->get([ return $this->connection->get($this->cds);
'cds' => $this->cds,
'username' => $this->username,
'password' => $this->password,
'attributes' => $this->attributes,
'connect_timeout' => $this->connect_timeout,
'read_timeout' => $this->read_timeout,
'dbname' => $this->database,
'pool' => $this->pool
]);
} }
/** /**
Mysql/PDO.php
+5
View File
@@ -2,6 +2,7 @@
namespace Database\Mysql; namespace Database\Mysql;
use Database\Db;
use Exception; use Exception;
use Kiri; use Kiri;
use Kiri\Events\EventProvider; use Kiri\Events\EventProvider;
@@ -362,6 +363,7 @@ class PDO implements StopHeartbeatCheck
$link = new \PDO('mysql:dbname=' . $this->dbname . ';host=' . $this->cds, $this->username, $this->password, [ $link = new \PDO('mysql:dbname=' . $this->dbname . ';host=' . $this->cds, $this->username, $this->password, [
\PDO::ATTR_EMULATE_PREPARES => false, \PDO::ATTR_EMULATE_PREPARES => false,
\PDO::ATTR_CASE => \PDO::CASE_NATURAL, \PDO::ATTR_CASE => \PDO::CASE_NATURAL,
\PDO::ATTR_PERSISTENT => true,
\PDO::ATTR_TIMEOUT => $this->connect_timeout, \PDO::ATTR_TIMEOUT => $this->connect_timeout,
\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . $this->charset \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . $this->charset
]); ]);
@@ -371,6 +373,9 @@ class PDO implements StopHeartbeatCheck
foreach ($this->attributes as $key => $attribute) { foreach ($this->attributes as $key => $attribute) {
$link->setAttribute($key, $attribute); $link->setAttribute($key, $attribute);
} }
if (Db::inTransactionsActive()) {
$link->beginTransaction();
}
return $link; return $link;
} }