This commit is contained in:
2024-04-16 17:24:22 +08:00
parent 92f0c1a973
commit ea34371652
2 changed files with 57 additions and 28 deletions
+28
View File
@@ -0,0 +1,28 @@
<?php
namespace Database\Base;
class PDO extends \PDO
{
/**
* @param string $database
* @param string $host
* @param string $username
* @param string $password
* @param array $options
*/
public function __construct(
readonly public string $database,
readonly public string $host,
readonly public string $username,
readonly public string $password,
readonly public array $options,
)
{
parent::__construct('mysql:dbname=' . $this->database . ';host=' . $this->host, $this->username, $this->password, $this->options);
}
}
+29 -28
View File
@@ -21,7 +21,6 @@ use Kiri\Abstracts\Component;
use Kiri\Di\Context; use Kiri\Di\Context;
use Kiri\Pool\Pool; use Kiri\Pool\Pool;
use Kiri\Events\EventProvider; use Kiri\Events\EventProvider;
use PDO;
use Kiri\Error\StdoutLogger; use Kiri\Error\StdoutLogger;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use Kiri\Server\Events\OnWorkerStart; use Kiri\Server\Events\OnWorkerStart;
@@ -29,6 +28,7 @@ use Kiri\Server\Events\OnTaskerStart;
use Kiri\Server\Events\OnAfterRequest; use Kiri\Server\Events\OnAfterRequest;
use Kiri\Di\Inject\Container; use Kiri\Di\Inject\Container;
use Swoole\Timer; use Swoole\Timer;
use Database\Base\PDO;
/** /**
* Class Connection * Class Connection
@@ -37,25 +37,26 @@ use Swoole\Timer;
class Connection extends Component class Connection extends Component
{ {
public string $id = 'db'; public string $id = 'db';
public string $cds = ''; public string $cds = '';
public string $password = ''; public string $password = '';
public string $username = ''; public string $username = '';
public string $charset = 'utf-8'; public string $charset = 'utf-8';
public string $tablePrefix = ''; public string $tablePrefix = '';
public string $database = ''; public string $database = '';
public int $timeout = 30; public int $timeout = 30;
public int $waite_time = 3; public int $waite_time = 3;
public int $tick_time = 60; public int $tick_time = 60;
public int $idle_count = 3; public int $idle_count = 3;
public int $idle_time = 60; public int $idle_time = 60;
public array $pool = ['max' => 10, 'min' => 1]; public array $pool = ['max' => 10, 'min' => 1];
private int $storey = 0; private int $storey = 0;
protected int $timerId = -1; protected int $timerId = -1;
public bool $enableCache = false; public bool $enableCache = false;
public string $cacheDriver = 'redis'; public string $cacheDriver = 'redis';
public array $attributes = []; public array $attributes = [];
protected \Closure $_println; public array $slave = [];
protected ?\Closure $_println = null;
/** /**
@@ -335,14 +336,14 @@ class Connection extends Component
*/ */
public function newConnect(): PDO public function newConnect(): PDO
{ {
$pdo = new PDO('mysql:dbname=' . $this->database . ';host=' . $this->cds, $this->username, $this->password, [ $pdo = new PDO($this->database, $this->cds, $this->username, $this->password, [
PDO::ATTR_CASE => PDO::CASE_NATURAL, \PDO::ATTR_CASE => \PDO::CASE_NATURAL,
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION,
PDO::ATTR_ORACLE_NULLS => PDO::NULL_NATURAL, \PDO::ATTR_ORACLE_NULLS => \PDO::NULL_NATURAL,
PDO::ATTR_STRINGIFY_FETCHES => false, \PDO::ATTR_STRINGIFY_FETCHES => false,
PDO::ATTR_EMULATE_PREPARES => true, \PDO::ATTR_EMULATE_PREPARES => true,
PDO::ATTR_TIMEOUT => $this->timeout, \PDO::ATTR_TIMEOUT => $this->timeout,
PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . $this->charset \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . $this->charset
]); ]);
foreach ($this->attributes as $key => $attribute) { foreach ($this->attributes as $key => $attribute) {
$pdo->setAttribute($key, $attribute); $pdo->setAttribute($key, $attribute);