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

变更

Browse Source
This commit is contained in:
向林
2023-04-05 10:53:28 +08:00
parent 3ecc781002
commit 6a673152c1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Command.php
+8 -8
View File
@@ -120,9 +120,9 @@ class Command extends Component
*/ */
private function _execute(): bool|int private function _execute(): bool|int
{ {
return $this->result(static function (PDO $pdo) { return $this->result(static function (PDO $pdo, string $sql, array $params) {
$prepare = $pdo->prepare($this->sql); $prepare = $pdo->prepare($sql);
if ($prepare === false || $prepare->execute($this->params) === false) { if ($prepare === false || $prepare->execute($params) === false) {
throw new Exception(($prepare ?? $pdo)->errorInfo()[1]); throw new Exception(($prepare ?? $pdo)->errorInfo()[1]);
} }
@@ -140,9 +140,9 @@ class Command extends Component
*/ */
private function _query(string $type): bool|array|int|null private function _query(string $type): bool|array|int|null
{ {
return $this->result(static function (PDO $pdo) use ($type) { return $this->result(static function (PDO $pdo, string $sql, array $params) use ($type) {
$prepare = $pdo->query($this->sql); $prepare = $pdo->query($sql);
if ($prepare === false || $prepare->execute($this->params) === false) { if ($prepare === false || $prepare->execute($params) === false) {
throw new Exception(($prepare ?? $pdo)->errorInfo()[1]); throw new Exception(($prepare ?? $pdo)->errorInfo()[1]);
} }
$result = match ($type) { $result = match ($type) {
@@ -166,7 +166,7 @@ class Command extends Component
{ {
$pdo = $this->db->getPdo(); $pdo = $this->db->getPdo();
try { try {
return $callback($pdo); return $callback($pdo, $this->sql, $this->params);
} catch (\Throwable $throwable) { } catch (\Throwable $throwable) {
if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) { if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
return $this->result($callback); return $this->result($callback);
@@ -185,7 +185,7 @@ class Command extends Component
private function error(\Throwable $throwable): bool private function error(\Throwable $throwable): bool
{ {
$message = $this->sql . '(' . json_encode($this->params, JSON_UNESCAPED_UNICODE) . ');'; $message = $this->sql . '(' . json_encode($this->params, JSON_UNESCAPED_UNICODE) . ');';
return $this->logger->addError($message . PHP_EOL . $throwable->getMessage(), 'mysql'); return $this->logger->addError($message . $throwable->getMessage(), 'mysql');
} }