diff --git a/System/Abstracts/Pool.php b/System/Abstracts/Pool.php index 2f5bfacf..34665bdb 100644 --- a/System/Abstracts/Pool.php +++ b/System/Abstracts/Pool.php @@ -170,11 +170,9 @@ abstract class Pool extends Component } $channel = $this->_items[$name]; if ($channel->isEmpty()) { - return $this->createClient($name, $callback); - $this->createByCallback($name, $callback); } - return $channel->pop(0.002); + $connection = $channel->pop(0.002); if (!$this->checkCanUse($name, $connection)) { return $this->createClient($name, $callback); } else { diff --git a/System/Pool/Connection.php b/System/Pool/Connection.php index 9c792c2d..07e226a9 100644 --- a/System/Pool/Connection.php +++ b/System/Pool/Connection.php @@ -159,10 +159,10 @@ class Connection extends Pool $link->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false); $link->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_EMPTY_STRING); - $charset = $config['charset'] ?? 'utf8mb4'; - if (!empty($charset)) { - $link->query('SET NAMES ' . $charset); - } +// $charset = $config['charset'] ?? 'utf8mb4'; +// if (!empty($charset)) { +// $link->query('SET NAMES ' . $charset); +// } // $this->printClients($config['cds'], '', ''); // $this->increment($name);