From 6e84fc7195f5605f5d68271a7b4d8270eefb3eec Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <dave.mcnicoll@cslsj.qc.ca>
Date: Thu, 26 Mar 2020 16:28:03 -0400
Subject: [PATCH] - Fixed a bug while retrieving a non-existing field (from a
 table which has a field not included within your entity)

---
 src/Common/EntityResolver.php |  2 +-
 src/Common/PdoObject.php      | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Common/EntityResolver.php b/src/Common/EntityResolver.php
index 2d27d77..f70b502 100644
--- a/src/Common/EntityResolver.php
+++ b/src/Common/EntityResolver.php
@@ -39,7 +39,7 @@ class EntityResolver {
     public function field($name, $fieldKey = self::KEY_ENTITY_NAME, $throwException = true) : ? array
     {
         try{
-            return $this->fieldList($fieldKey)[$name];
+            return $this->fieldList($fieldKey)[$name] ?? null;
         }
         catch(\Throwable $e) {
             if ( $throwException) {
diff --git a/src/Common/PdoObject.php b/src/Common/PdoObject.php
index fc6c33e..94a4208 100644
--- a/src/Common/PdoObject.php
+++ b/src/Common/PdoObject.php
@@ -8,8 +8,6 @@ use PDO,
 class PdoObject extends PDO {
 
     public function select(string $sql, array $parameters = []): PDOStatement {
-        # var_dump($sql, $parameters); die();
-        
         try {
             if (false !== ( $statement = $this->prepare($sql) )) {
                 $statement = $this->execute($statement, $parameters, false);
@@ -23,8 +21,6 @@ class PdoObject extends PDO {
     }
 
     public function runQuery(string $sql, array $parameters = []): ? PDOStatement {
-       # dump($sql, $parameters); return null;
-        
         try {
             if (false !== ( $statement = $this->prepare($sql) )) {
                 return $this->execute($statement, $parameters, true);
@@ -50,11 +46,13 @@ class PdoObject extends PDO {
                 }
 
                 return $statement;
-            } else {
-                throw new PDOException('Could not begin transaction or given statement is invalid.');
+            }
+            else {
+                throw new \PDOException($statement->errorCode() . " - " . json_encode($statement->errorInfo()));
             }
         } catch (\PDOException $e) {
             $this->rollback();
+            
             throw $e;
         }