Merge pull request #2 from dealnews/next

Bug fixes
dealnews · May 16, 2024 · c45ee2e · c45ee2e
2 parents e549043 + b45ac73
commit c45ee2e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/src/AbstractMapper.php b/src/AbstractMapper.php
@@ -499,7 +499,7 @@ protected function saveRelationalObjects(object $object, string $property, array
 
         foreach ($objects as $key => $obj) {
             $prop = $mapping['foreign_property'] ?? $mapping['foreign_column'] ?? null;
-            if (property_exists($object, $prop)) {
+            if (property_exists($obj, $prop)) {
                 // @phan-suppress-next-line PhanTypeArraySuspicious, PhanTypeInvalidDimOffset
                 $obj->{$prop} = $this->getValue($object, $this::PRIMARY_KEY, $this::MAPPING[$this::PRIMARY_KEY]);
             }

diff --git a/src/PDO.php b/src/PDO.php
@@ -180,11 +180,7 @@ public function connect($reconnect = false, ?string $pdo_class = \PDO::class) {
                 } catch (\PDOException $e) {
                     // add logging for failures
                     if ($x >= $this::RETRY_LIMIT) {
-                        throw new \PDOException(
-                            "Attempted to connect $x times and failed: " . $e->getMessage(),
-                            $e->getCode(),
-                            $e
-                        );
+                        throw $e;
                     }
                 }
             }
@@ -239,11 +235,7 @@ public function __call($method, $args = []) {
                 );
             } catch (\PDOException $e) {
                 if ($x >= $this::RETRY_LIMIT || !$this->checkErrorCode($e->getCode())) {
-                    throw new \PDOException(
-                        "Attempted to connect $x times and failed: " . $e->getMessage(),
-                        (int)$e->getCode(),
-                        $e
-                    );
+                    throw $e;
                 }
             }
         }
@@ -285,11 +277,7 @@ public function query(string $statement) {
                 }
             } catch (\PDOException $e) {
                 if ($x >= $this::RETRY_LIMIT || !$this->checkErrorCode($e->getCode())) {
-                    throw new \PDOException(
-                        "Attempted to connect $x times and failed: " . $e->getMessage(),
-                        $e->getCode(),
-                        $e
-                    );
+                    throw $e;
                 }
             }
         }

diff --git a/src/PDOStatement.php b/src/PDOStatement.php
@@ -84,9 +84,11 @@ public function execute(?array $input_parameters = []) {
             // if we get here, we didn't get true in $result
             if ($x >= PDO::RETRY_LIMIT || !$this->pdo->checkErrorCode($this->stmt->errorCode())) {
                 if (isset($result) && is_object($result)) {
+                    throw $result;
+                } else {
                     throw new \PDOException(
-                        "Attempted run query $x times and failed: " . $result->getMessage(),
-                        $result->getCode(),
+                        "Attempted run query $x times and failed",
+                        999,
                         $result
                     );
                 }