From 97d8f8fac5f406b71223126c45ab50fb6a4718a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Fri, 10 Feb 2023 10:56:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Connection.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Connection.php b/Connection.php index 728c4fd..e2f1246 100644 --- a/Connection.php +++ b/Connection.php @@ -266,13 +266,12 @@ class Connection extends Component public function release(PDO $pdo, bool $isMaster) { $connections = $this->connection; - $cds = ($this->slaveConfig['cds'] ?? $this->cds) . ($isMaster ? 'master' : 'slave'); - if ($isMaster) { - if (!$pdo->inTransaction()) { - $connections->addItem($cds, $pdo); - } + if (!$isMaster) { + $connections->addItem(($this->slaveConfig['cds'] ?? $this->cds) . 'slave', $pdo); } else { - $connections->addItem($cds, $pdo); + if (!$pdo->inTransaction()) { + $connections->addItem($this->cds . 'master', $pdo); + } } }