From dcda2e1f7272c61c7c000285df9ace208e622e97 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 27 Aug 2009 08:58:03 -0700
Subject: show SQL errors in the output

---
 install.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'install.php')

diff --git a/install.php b/install.php
index 24e85fe84..42d848911 100644
--- a/install.php
+++ b/install.php
@@ -220,6 +220,8 @@ function handlePost()
         return;
     }
 
+    // FIXME: use PEAR::DB or PDO instead of our own switch
+
     switch($dbtype) {
         case 'mysql':
             $db = mysql_db_installer($host, $database, $username, $password);
@@ -396,18 +398,25 @@ function runDbScript($filename, $conn, $type = 'mysql')
         if (!mb_strlen($stmt)) {
             continue;
         }
+        // FIXME: use PEAR::DB or PDO instead of our own switch
         switch ($type) {
         case 'mysql':
             $res = mysql_query($stmt, $conn);
+            if ($res === false) {
+                $error = mysql_error();
+            }
             break;
         case 'pgsql':
             $res = pg_query($conn, $stmt);
+            if ($res === false) {
+                $error = pg_last_error();
+            }
             break;
         default:
             updateStatus("runDbScript() error: unknown database type ". $type ." provided.");
         }
         if ($res === false) {
-            updateStatus("FAILED SQL: $stmt");
+            updateStatus("ERROR ($error) for SQL '$stmt'");
             return $res;
         }
     }
-- 
cgit v1.2.3-54-g00ecf