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

Revert "改名"

Browse Source 
This reverts commit fdf58326
This commit is contained in:
向林
2022-01-14 16:50:01 +08:00
parent 2ffdf83645
commit b0c66c9c6a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kiri-engine/Pool/Connection.php
+5 -3
View File
@@ -97,7 +97,7 @@ class Connection extends Component
$minx = Config::get('databases.pool.min', 1); $minx = Config::get('databases.pool.min', 1);
/** @var PDO $connections */ /** @var PDO $connections */
$connections = $this->getPool()->get($coroutineName, $this->create($coroutineName, $config), $minx); $connections = $this->getPool()->get($coroutineName, null, $minx);
if (Context::hasContext('begin_' . $coroutineName)) { if (Context::hasContext('begin_' . $coroutineName)) {
$connections->beginTransaction(); $connections->beginTransaction();
} }
@@ -147,14 +147,16 @@ class Connection extends Component
/** /**
* @param $coroutineName * @param $coroutineName
* @param $isMaster * @param $isMaster
* @param array $config
* @throws Kiri\Exception\ConfigException
* @throws Exception * @throws Exception
*/ */
public function release($coroutineName, $isMaster) public function release($coroutineName, $isMaster, array $config)
{ {
$coroutineName = $this->name('Mysql:' . $coroutineName, $isMaster); $coroutineName = $this->name('Mysql:' . $coroutineName, $isMaster);
/** @var PDO $client */ /** @var PDO $client */
if (!($client = Context::getContext($coroutineName)) instanceof PDO) { if (!($client = Context::getContext($coroutineName)) instanceof PDO) {
return; $client = call_user_func($this->create($coroutineName, $config));
} }
if ($client->inTransaction()) { if ($client->inTransaction()) {
return; return;