Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / lib / schema.php

diff --git a/lib/schema.php b/lib/schema.php
index 94cde28f9d4692610a5b00cafd11c693ca61f1b5..f536f01645366a911ec95e78e24a16e37e60a88f 100644 (file)
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -350,7 +350,7 @@ class Schema
         $res = $this->conn->query("DROP TABLE $name");
 
         if ($_PEAR->isError($res)) {
-            throw new Exception($res->getMessage());
+            PEAR_ErrorToPEAR_Exception($res);
         }
 
         return true;
@@ -389,7 +389,7 @@ class Schema
                                    implode(",", $columnNames).")");
 
         if ($_PEAR->isError($res)) {
-            throw new Exception($res->getMessage());
+            PEAR_ErrorToPEAR_Exception($res);
         }
 
         return true;
@@ -411,7 +411,7 @@ class Schema
         $res = $this->conn->query("ALTER TABLE $table DROP INDEX $name");
 
         if ($_PEAR->isError($res)) {
-            throw new Exception($res->getMessage());
+            PEAR_ErrorToPEAR_Exception($res);
         }
 
         return true;
@@ -436,7 +436,7 @@ class Schema
         $res = $this->conn->query($sql);
 
         if ($_PEAR->isError($res)) {
-            throw new Exception($res->getMessage());
+            PEAR_ErrorToPEAR_Exception($res);
         }
 
         return true;
@@ -463,7 +463,7 @@ class Schema
         $res = $this->conn->query($sql);
 
         if ($_PEAR->isError($res)) {
-            throw new Exception($res->getMessage());
+            PEAR_ErrorToPEAR_Exception($res);
         }
 
         return true;
@@ -489,7 +489,7 @@ class Schema
         $res = $this->conn->query($sql);
 
         if ($_PEAR->isError($res)) {
-            throw new Exception($res->getMessage());
+            PEAR_ErrorToPEAR_Exception($res);
         }
 
         return true;
@@ -535,7 +535,8 @@ class Schema
             $res = $this->conn->query($sql);
 
             if ($_PEAR->isError($res)) {
-                throw new Exception($res->getMessage());
+                common_debug('PEAR exception on query: '.$sql);
+                PEAR_ErrorToPEAR_Exception($res);
             }
         }
         return $ok;
@@ -1045,7 +1046,7 @@ class Schema
 
         $res = $this->conn->query($sql);
         if ($_PEAR->isError($res)) {
-            throw new Exception($res->getMessage());
+            PEAR_ErrorToPEAR_Exception($res);
         }
 
         $out = array();