NotifySmtpCheck.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 51c0cab..fea95ac 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -392,7 +392,7 @@ class Pman_Core_UpdateDatabase extends Pman
                     continue;
                 }
                 
-                $cmd = "$mysql_cmd -f < " . escapeshellarg($fn) ;
+                $cmd = "$mysql_cmd -f < " . escapeshellarg($fn) ." 2>&1" ;
                 
                 echo basename($dir).'/'. basename($fn) .    '::' .  $cmd. ($this->cli ? "\n" : "<BR>\n");
                 
@@ -401,13 +401,33 @@ class Pman_Core_UpdateDatabase extends Pman
                 while(!feof($fp)) 
                 { 
                     // send the current file part to the browser 
-                    $line = fread($fp, 1024);
-                    echo $line;
-                    echo "--";
+                    $line = trim(fgets($fp, 1024));
+                    $matches = array();
+                    if (!preg_match('/^ERROR\s+([0-9]+)/', $line, $matches)) {
+                        echo "OK - {$line}\n"; flush();
+                        continue;
+                    }
+                    $continue =0;
+                    switch($matches[1]) {
+                        case 1050: // create tables triggers this..
+                        case 1060: //    Duplicate column name
+                        case 1061: // Duplicate key name - triggered by add index.. but could hide error. - unlikely though.
+                            
+                        case 1054: // Unknown column -- triggered by CHANGE COLUMN - but may hide other errrors..
+                            $continue = 1;
+                            break;
+                        
+                    }
+                    if ($continue) {
+                        echo "IGNORE - {$line}\n"; flush();
+                        continue;
+                    }
+                    // real errors...
+                    // 1051: // Unknown table -- normally drop = add iff exists..
+                    
+                    print_r(array($line,$matches));exit;
                     
                     
-                    // flush the content to the browser 
-                    flush(); 
                 }