From b0c66c9c6adba317c44654d4b279165c56055926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Fri, 14 Jan 2022 16:50:01 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=94=B9=E5=90=8D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fdf58326 --- kiri-engine/Pool/Connection.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kiri-engine/Pool/Connection.php b/kiri-engine/Pool/Connection.php index 65040cd5..40e0d790 100644 --- a/kiri-engine/Pool/Connection.php +++ b/kiri-engine/Pool/Connection.php @@ -97,7 +97,7 @@ class Connection extends Component $minx = Config::get('databases.pool.min', 1); /** @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)) { $connections->beginTransaction(); } @@ -147,14 +147,16 @@ class Connection extends Component /** * @param $coroutineName * @param $isMaster + * @param array $config + * @throws Kiri\Exception\ConfigException * @throws Exception */ - public function release($coroutineName, $isMaster) + public function release($coroutineName, $isMaster, array $config) { $coroutineName = $this->name('Mysql:' . $coroutineName, $isMaster); /** @var PDO $client */ if (!($client = Context::getContext($coroutineName)) instanceof PDO) { - return; + $client = call_user_func($this->create($coroutineName, $config)); } if ($client->inTransaction()) { return;