- improved connection exception handling for postgres

spiral-modules · Nov 20, 2019 · edc3ed3 · edc3ed3
1 parent 585d09b
commit edc3ed3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 CHANGELOG for 0.9.0 RC
 ======================
 
+2.6.3 (20.11.2019)
+-----
+- improved connection exception handling for Postgres
+
 2.6.2 (14.11.2019)
 -----
 - added native support for UUID type

diff --git a/src/Driver/Driver.php b/src/Driver/Driver.php
@@ -506,7 +506,7 @@ protected function formatDatetime(\DateTimeInterface $value): string
      *
      * @throws StatementException
      */
-    private function statement(string $query, array $parameters = [], bool $retry = null): StatementInterface
+    private function statement(string $query, array $parameters = [], bool $retry = true): StatementInterface
     {
         if (is_null($retry)) {
             $retry = $this->options['reconnect'];

diff --git a/src/Driver/Postgres/PostgresDriver.php b/src/Driver/Postgres/PostgresDriver.php
@@ -153,6 +153,7 @@ protected function mapException(\PDOException $exception, string $query): Statem
         if (
             strpos($exception->getMessage(), '0800') !== false
             || strpos($exception->getMessage(), '080P') !== false
+            || strpos($exception->getMessage(), 'connection') !== false
         ) {
             return new StatementException\ConnectionException($exception, $query);
         }
@@ -161,7 +162,6 @@ protected function mapException(\PDOException $exception, string $query): Statem
             return new StatementException\ConstrainException($exception, $query);
         }
 
-
         return new StatementException($exception, $query);
     }
 }