rethrow the original exception and augment the message with schema@ho…

…stname details
dailymotion · Feb 24, 2012 · b6b3b26 · b6b3b26
1 parent d84f088
commit b6b3b26
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/MyDBD.php b/MyDBD.php
@@ -298,11 +298,16 @@ protected function link($autoconnect = true)
         return $this->link;
     }
 
+    protected function dbName ()
+    {
+        return sprintf("%s@%s", $this->connectionInfo['database'], $this->connectionInfo['hostname']);
+    }
+
     protected function handleErrors($query = null)
     {
         if ($this->link->errno)
         {
-            MyDBD_Error::throwError($this->link->errno, $this->link->error . ' /*@' . $this->link->host_info . '*/', $this->link->sqlstate, $query);
+            MyDBD_Error::throwError($this->link->errno, $this->link->error . ' /* ' . $this->dbName() . ' */', $this->link->sqlstate, $query);
         }
     }
 
@@ -421,7 +426,8 @@ public function prepare()
         }
         catch (SQLException $e)
         {
-            throw new Exception($e->getMessage() . ' /*@' . $this->link->host_info . '*/', $e->getCode(), $e);
+            $e->appendMessage('/* ' . $this->dbName() . ' */');
+            throw $e;
         }
 
         return $sth;
@@ -907,7 +913,8 @@ public function execute(MyDBD_PreparedStatement $statement, $params = null)
         }
         catch (SQLException $e)
         {
-            throw new Exception($e->getMessage() . ' /*@' . $this->link->host_info . '*/', $e->getCode(), $e);
+            $e->appendMessage('/* ' . $this->dbName() . ' */');
+            throw $e;
         }
         return $res;
     }

diff --git a/MyDBD/Error.php b/MyDBD/Error.php
@@ -79,7 +79,13 @@ public function __construct($message = null, $code = null, $sqlstate = null)
         $this->code = $code;
         $this->sqlstate = $sqlstate;
     }
+
+    public function appendMessage ($m)
+    {
+        $this->message .= " $m";
+    }
 }
+
 class SQLUnknownException extends SQLException {}
 class SQLSyntaxException extends SQLException {}
 class SQLConstraintException extends SQLException {}