UpdateDatabase/MysqlLinks.php

[Pman.Core] / UpdateDatabase / MysqlLinks.php

diff --git a/UpdateDatabase/MysqlLinks.php b/UpdateDatabase/MysqlLinks.php
index 49e6417..ca49097 100644 (file)
--- a/UpdateDatabase/MysqlLinks.php
+++ b/UpdateDatabase/MysqlLinks.php
@@ -443,8 +443,6 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
                 continue;
             }
             
-            echo "CALL mysql_change_charset('{$tbl}') \n";
-            
             $ce = DB_DataObject::factory('core_enum');
             
             $ce->query("
@@ -457,12 +455,20 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
                 WHERE
                         CCSA.collation_name = T.table_collation
                     AND
-                        T.table_schema = '{$ce->database()}' COLLATE utf8_unicode_ci
+                        T.table_schema = '{$ce->database()}' -- COLLATE utf8_unicode_ci
                     AND
-                        T.table_name = {$tbl} 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");
             
             
         }