sql/images.sql

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index b90fdc3..7b2f633 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -407,17 +407,26 @@ class Pman_Core_UpdateDatabase extends Pman
                         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 1091: // drop index -- name does not exist.. might hide errors..
                             
-                            echo "IGNORE - {$line}\n"; flush();
-                            continue;
+                        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;
+                    echo "File: $fn\n$line\n";
+                    exit;
                     
                     
                 }