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

变更

Browse Source
This commit is contained in:
向林
2022-09-20 18:53:49 +08:00
parent d520b5fbc4
commit d909aa4c4e
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kiri-engine/Pool/Connection.php
+16 -9
View File
@@ -5,7 +5,7 @@ namespace Kiri\Pool;
use Closure; use Closure;
use Database\Db; use Database\Db;
use Database\Mysql\PDO; use PDO;
use Exception; use Exception;
use Kiri; use Kiri;
use Kiri\Abstracts\Component; use Kiri\Abstracts\Component;
@@ -13,7 +13,6 @@ use Kiri\Abstracts\Config;
use Kiri\Context; use Kiri\Context;
use Swoole\Error; use Swoole\Error;
use Throwable; use Throwable;
use Kiri\Abstracts\CoordinatorManager;
/** /**
* Class Connection * Class Connection
@@ -95,7 +94,7 @@ class Connection extends Component
* @return PDO|null * @return PDO|null
* @throws Kiri\Exception\ConfigException * @throws Kiri\Exception\ConfigException
*/ */
public function get(mixed $config, bool $isMaster = false): ?PDO public function get(mixed $config, bool $isMaster = false): ?\PDO
{ {
$minx = Config::get('databases.pool.min', 1); $minx = Config::get('databases.pool.min', 1);
@@ -110,14 +109,22 @@ class Connection extends Component
public function generate(array $config): Closure public function generate(array $config): Closure
{ {
return static function () use ($config) { return static function () use ($config) {
$connect = new PDO($config); $link = new \PDO('mysql:dbname=' . $config['dbname'] . ';host=' . $config['cds'], $config['username'], $config['password'], [
if (!Db::inTransactionsActive()) { \PDO::ATTR_EMULATE_PREPARES => false,
return $connect; \PDO::ATTR_CASE => \PDO::CASE_NATURAL,
\PDO::ATTR_TIMEOUT => $config['connect_timeout'],
\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . ($config['charset'] ?? 'utf8mb4')
]);
$link->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
$link->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, false);
$link->setAttribute(\PDO::ATTR_ORACLE_NULLS, \PDO::NULL_EMPTY_STRING);
foreach ($config['attributes'] as $key => $attribute) {
$link->setAttribute($key, $attribute);
} }
if (!$connect->inTransaction()) { if (Db::inTransactionsActive()) {
$connect->beginTransaction(); $link->beginTransaction();
} }
return $connect; return $link;
}; };
} }