DataObjects/Core_domain.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index e8932e2..9176712 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -135,6 +135,12 @@ class Pman_Core_UpdateDatabase extends Pman
    
         $ff = HTML_FlexyFramework::get();
         
+        if(!empty($ff->Core_Notify)){
+            require_once 'Pman/Core/NotifySmtpCheck.php';
+            $x = new Pman_Core_NotifySmtpCheck();
+            $x->check();
+        }
+        
         $this->disabled = explode(',', $ff->disable);
         
         //$this->fixSequencesPgsql();exit;
@@ -402,19 +408,36 @@ class Pman_Core_UpdateDatabase extends Pman
                 { 
                     // send the current file part to the browser 
                     $line = trim(fgets($fp, 1024));
+                    if (empty($line)) {
+                        continue;
+                    }
                     $matches = array();
                     if (!preg_match('/^ERROR\s+([0-9]+)/', $line, $matches)) {
-                        echo "OK - {$line}\n"; flush();
+                        echo " ---- {$line}\n"; flush();
                         continue;
                     }
+                    $continue =0;
                     switch($matches[1]) {
-                        case 1050:  /// table exists - create table triggers this on existing tables.
+                        case 1017: // cause by renaming table -- old one does not exist..
+                        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 1091: // drop index -- name does not exist.. might hide errors..
                         
+                        case 1146: // drop a index on an unknown table.. - happens rarely...
+                        case 1054: // Unknown column -- triggered by CHANGE COLUMN - but may hide other errrors..
+                            $continue = 1;
+                            break;
+                        
+                    }
+                    if ($continue) {
+                        echo " ---- {$line}\n"; flush();
+                        continue;
                     }
                     // real errors...
                     // 1051: // Unknown table -- normally drop = add iff exists..
-                    
-                    print_r(array($line,$matches));exit;
+                    echo "File: $fn\n$line\n";
+                    exit;
                     
                     
                 }