This commit is contained in:
2023-08-16 10:26:48 +08:00
parent bec9cd1a3f
commit ed749d7a34
+10 -5
View File
@@ -80,10 +80,11 @@ class Command extends Component
try { try {
return $this->prepare()->fetchAll(PDO::FETCH_ASSOC); return $this->prepare()->fetchAll(PDO::FETCH_ASSOC);
} catch (Throwable $throwable) { } catch (Throwable $throwable) {
$result = $this->error($throwable);
if (str_contains($throwable->getMessage(),'MySQL server has gone away')) { if (str_contains($throwable->getMessage(),'MySQL server has gone away')) {
return $this->all(); return $this->all();
} }
return $this->error($throwable); return $result;
} finally { } finally {
$this->connection->release($client ?? null); $this->connection->release($client ?? null);
} }
@@ -98,10 +99,11 @@ class Command extends Component
try { try {
return $this->prepare()->fetch(PDO::FETCH_ASSOC); return $this->prepare()->fetch(PDO::FETCH_ASSOC);
} catch (Throwable $throwable) { } catch (Throwable $throwable) {
$result = $this->error($throwable);
if (str_contains($throwable->getMessage(),'MySQL server has gone away')) { if (str_contains($throwable->getMessage(),'MySQL server has gone away')) {
return $this->one(); return $this->one();
} }
return $this->error($throwable); return $result;
} finally { } finally {
$this->connection->release($client ?? null); $this->connection->release($client ?? null);
} }
@@ -116,10 +118,11 @@ class Command extends Component
try { try {
return $this->prepare()->fetchColumn(PDO::FETCH_ASSOC); return $this->prepare()->fetchColumn(PDO::FETCH_ASSOC);
} catch (Throwable $throwable) { } catch (Throwable $throwable) {
$result = $this->error($throwable);
if (str_contains($throwable->getMessage(),'MySQL server has gone away')) { if (str_contains($throwable->getMessage(),'MySQL server has gone away')) {
return $this->fetchColumn(); return $this->fetchColumn();
} }
return $this->error($throwable); return $result;
} finally { } finally {
$this->connection->release($client ?? null); $this->connection->release($client ?? null);
} }
@@ -134,10 +137,11 @@ class Command extends Component
try { try {
return $this->prepare()->rowCount(); return $this->prepare()->rowCount();
} catch (Throwable $throwable) { } catch (Throwable $throwable) {
$result = $this->error($throwable);
if (str_contains($throwable->getMessage(),'MySQL server has gone away')) { if (str_contains($throwable->getMessage(),'MySQL server has gone away')) {
return $this->rowCount(); return $this->rowCount();
} }
return $this->error($throwable); return $result;
} finally { } finally {
$this->connection->release($client ?? null); $this->connection->release($client ?? null);
} }
@@ -189,10 +193,11 @@ class Command extends Component
return $result == 0 ? true : (int)$result; return $result == 0 ? true : (int)$result;
} catch (Throwable $throwable) { } catch (Throwable $throwable) {
$result = $this->error($throwable);
if (str_contains($throwable->getMessage(),'MySQL server has gone away')) { if (str_contains($throwable->getMessage(),'MySQL server has gone away')) {
return $this->_execute(); return $this->_execute();
} }
return $this->error($throwable); return $result;
} finally { } finally {
$this->connection->release($client ?? null); $this->connection->release($client ?? null);
} }