UpdateDatabase/MysqlLinks.php

[Pman.Core] / UpdateDatabase / MysqlLinks.php

diff --git a/UpdateDatabase/MysqlLinks.php b/UpdateDatabase/MysqlLinks.php
index e8ab14d..c25851e 100644 (file)
--- a/UpdateDatabase/MysqlLinks.php
+++ b/UpdateDatabase/MysqlLinks.php
@@ -437,9 +437,34 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
         
     function updateCharacterSet()
     {
-        foreach ($this->schema as $tbl => $map){
-            echo "CALL mysql_change_charset('{$tbl}') \n";
-            DB_DataObject::factory('core_enum')->query("CALL mysql_change_charset('{$tbl}')");
+        foreach (array_keys($this->schema) as $tbl){
+            
+            if(strpos($tbl, '__keys') !== false ){
+                continue;
+            }
+            
+            $ce = DB_DataObject::factory('core_enum');
+            
+            $ce->query("
+                SELECT
+                        CCSA.character_set_name csname,
+                        CCSA.collation_name collatename
+                FROM
+                        information_schema.`TABLES` T,
+                        information_schema.`COLLATION_CHARACTER_SET_APPLICABILITY` CCSA
+                WHERE
+                        CCSA.collation_name = T.table_collation
+                    AND
+                        T.table_schema = '{$ce->database()}' COLLATE utf8_unicode_ci
+                    AND
+                        T.table_name = '{$tbl}' COLLATE utf8_unicode_ci
+            ");
+                     
+            
+            
+            
+            
+            
         }
     }