UpdateDatabase/MysqlLinks.php

[Pman.Core] / UpdateDatabase / MysqlLinks.php

diff --git a/UpdateDatabase/MysqlLinks.php b/UpdateDatabase/MysqlLinks.php
index 865f182..bcfcc71 100644 (file)
--- a/UpdateDatabase/MysqlLinks.php
+++ b/UpdateDatabase/MysqlLinks.php
@@ -38,6 +38,9 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
           
         $this->loadIniFiles();
         $this->updateTableComments();
+        
+        $this->updateCharacterSet();
+        
         $ff = HTML_FlexyFramework::get();
         if (!empty($ff->Pman['enable_trigger_tests'])) {
             
@@ -195,9 +198,11 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
                 $err = substr("Failed Delete {$target_table} refs {$source_table}:{$source_col}", 0, 64);
                 $trigger .="
                     SET mid = 0;
-                    SELECT count(*) into mid FROM {$source_table} WHERE {$source_col} = OLD.{$target_col} LIMIT 1;
-                    IF mid > 0 THEN   
-                       UPDATE `$err` SET x = 1;
+                    IF OLD.{$target_col} > 0 THEN 
+                        SELECT count(*) into mid FROM {$source_table} WHERE {$source_col} = OLD.{$target_col} LIMIT 1;
+                        IF mid > 0 THEN   
+                           UPDATE `$err` SET x = 1;
+                        END IF;
                     END IF;
                 ";
             }
@@ -430,6 +435,22 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
         return $ret;
     }
         
+    function updateCharacterSet()
+    {
+        foreach (array_keys($this->schema) as $tbl){
+            
+            if(strpos($tbl, '__keys') !== false ){
+                continue;
+            }
+            
+            echo "CALL mysql_change_charset('{$tbl}') \n";
+            
+            
+            $ce = DB_DataObject::factory('core_enum');
+            $ce->query("CALL mysql_change_charset('{$tbl}')");
+            $ce->free();
+        }
+    }
     
 }