变更
This commit is contained in:
+12
-30
@@ -68,10 +68,10 @@ class Command extends Component
|
|||||||
{
|
{
|
||||||
$pdo = $this->db->getPdo();
|
$pdo = $this->db->getPdo();
|
||||||
try {
|
try {
|
||||||
$prepare = $pdo->query($this->sql);
|
if (($prepare = $pdo->query($this->sql)) === false) {
|
||||||
if ($prepare === false || $prepare->execute($this->params) === false) {
|
throw new Exception($pdo->errorInfo()[1]);
|
||||||
throw new Exception(($prepare ?? $pdo)->errorInfo()[1]);
|
|
||||||
}
|
}
|
||||||
|
$prepare->execute($this->params);
|
||||||
return $prepare->fetchAll(PDO::FETCH_ASSOC);
|
return $prepare->fetchAll(PDO::FETCH_ASSOC);
|
||||||
} 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')) {
|
||||||
@@ -91,10 +91,10 @@ class Command extends Component
|
|||||||
{
|
{
|
||||||
$pdo = $this->db->getPdo();
|
$pdo = $this->db->getPdo();
|
||||||
try {
|
try {
|
||||||
$prepare = $pdo->query($this->sql);
|
if (($prepare = $pdo->query($this->sql)) === false) {
|
||||||
if ($prepare === false || $prepare->execute($this->params) === false) {
|
throw new Exception($pdo->errorInfo()[1]);
|
||||||
throw new Exception(($prepare ?? $pdo)->errorInfo()[1]);
|
|
||||||
}
|
}
|
||||||
|
$prepare->execute($this->params);
|
||||||
return $prepare->fetch(PDO::FETCH_ASSOC);
|
return $prepare->fetch(PDO::FETCH_ASSOC);
|
||||||
} 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')) {
|
||||||
@@ -114,10 +114,10 @@ class Command extends Component
|
|||||||
{
|
{
|
||||||
$pdo = $this->db->getPdo();
|
$pdo = $this->db->getPdo();
|
||||||
try {
|
try {
|
||||||
$prepare = $pdo->query($this->sql);
|
if (($prepare = $pdo->query($this->sql)) === false) {
|
||||||
if ($prepare === false || $prepare->execute($this->params) === false) {
|
throw new Exception($pdo->errorInfo()[1]);
|
||||||
throw new Exception(($prepare ?? $pdo)->errorInfo()[1]);
|
|
||||||
}
|
}
|
||||||
|
$prepare->execute($this->params);
|
||||||
return $prepare->fetchColumn(PDO::FETCH_ASSOC);
|
return $prepare->fetchColumn(PDO::FETCH_ASSOC);
|
||||||
} 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')) {
|
||||||
@@ -137,10 +137,10 @@ class Command extends Component
|
|||||||
{
|
{
|
||||||
$pdo = $this->db->getPdo();
|
$pdo = $this->db->getPdo();
|
||||||
try {
|
try {
|
||||||
$prepare = $pdo->query($this->sql);
|
if (($prepare = $pdo->query($this->sql)) === false) {
|
||||||
if ($prepare === false || $prepare->execute($this->params) === false) {
|
throw new Exception($pdo->errorInfo()[1]);
|
||||||
throw new Exception(($prepare ?? $pdo)->errorInfo()[1]);
|
|
||||||
}
|
}
|
||||||
|
$prepare->execute($this->params);
|
||||||
return $prepare->rowCount();
|
return $prepare->rowCount();
|
||||||
} 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')) {
|
||||||
@@ -153,13 +153,6 @@ class Command extends Component
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private function printErrorMessage(\Throwable $throwable): mixed
|
|
||||||
{
|
|
||||||
$this->logger->addError($this->sql . '. error: ' . $throwable->getMessage(), 'mysql');
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return int|bool
|
* @return int|bool
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
@@ -207,17 +200,6 @@ class Command extends Component
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array<Mysql\PDO, PDOStatement>|bool
|
|
||||||
* @throws Exception
|
|
||||||
*/
|
|
||||||
private function search(): bool|array
|
|
||||||
{
|
|
||||||
$pdo = $this->db->getSlaveClient();
|
|
||||||
return [$pdo, null];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return int|bool
|
* @return int|bool
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
|
|||||||
Reference in New Issue
Block a user