UpdateDatabase/MysqlLinks.php

[Pman.Core] / UpdateDatabase / MysqlLinks.php

diff --git a/UpdateDatabase/MysqlLinks.php b/UpdateDatabase/MysqlLinks.php
index 0244170..b206a99 100644 (file)
--- a/UpdateDatabase/MysqlLinks.php
+++ b/UpdateDatabase/MysqlLinks.php
@@ -188,8 +188,8 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
                 BEFORE DELETE ON `{$target_table}`
             FOR EACH ROW
             BEGIN
-               DECLARE mid INT(11);
-             
+                DECLARE mid INT(11);
+                if (@DISABLE_TRIGGER IS NULL AND @DISABLE_TRIGGER_{$target_table} IS NULL ) THEN  
                
             ";
             foreach($sources as $source=>$target) {
@@ -215,6 +215,7 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
             }
             
             $trigger .= "
+                END IF;
             END 
            
             ";
@@ -437,16 +438,14 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
         
     function updateCharacterSet()
     {
-        print_R($this->database());exit;
         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("
                 SELECT
                         CCSA.character_set_name csname,
@@ -457,10 +456,21 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
                 WHERE
                         CCSA.collation_name = T.table_collation
                     AND
-                        T.table_schema = mydb COLLATE utf8_unicode_ci
+                        T.table_schema = '{$ce->database()}' -- COLLATE utf8_unicode_ci
                     AND
-                        T.table_name = mytb COLLATE utf8_unicode_ci
+                        T.table_name = '{$tbl}' -- COLLATE utf8_unicode_ci
             ");
+                     
+            $ce->fetch();
+            
+            if($ce->csname == 'utf8' && $ce->collatename == 'utf8_unicode_ci'){
+                echo "$tbl is Already utf8 \n";
+                continue;
+            }
+            
+            $ce = DB_DataObject::factory('core_enum');
+            $ce->query("ALTER TABLE {$tbl} CONVERT TO CHARACTER SET  utf8 COLLATE utf8_unicode_ci");
+            echo "FIXED utf8 on {$tbl}\n";
             
         }
     }