1 files changed, 5 insertions, 3 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc
index 60d4b415f..f1185c77a 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -595,13 +595,15 @@ abstract class DatabaseConnection extends PDO {
     catch (PDOException $e) {
       _db_check_install_needed();
       if ($options['throw_exception']) {
+        // Add additional debug information.
         if ($query instanceof DatabaseStatementInterface) {
-          $query_string = $stmt->getQueryString();
+          $e->query_string = $stmt->getQueryString();
         }
         else {
-          $query_string = $query;
+          $e->query_string = $query;
         }
-        throw new PDOException($query_string . " - \n" . print_r($args, 1) . $e->getMessage());
+        $e->args = $args;
+        throw $e;
       }
       return NULL;
     }