DataObjects/Core_domain.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 530479e..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;
@@ -407,11 +413,12 @@ class Pman_Core_UpdateDatabase extends Pman
                     }
                     $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 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.
@@ -424,7 +431,7 @@ class Pman_Core_UpdateDatabase extends Pman
                         
                     }
                     if ($continue) {
-                        echo "IGNORE - {$line}\n"; flush();
+                        echo " ---- {$line}\n"; flush();
                         continue;
                     }
                     // real errors...