From e47d449f609ebb629efaad8dd8ff2650ce835e7e Mon Sep 17 00:00:00 2001
From: edward <edward@roojs.com>
Date: Thu, 10 Dec 2015 14:32:09 +0800
Subject: [PATCH] UpdateDatabase/MysqlLinks.php

---
 UpdateDatabase/MysqlLinks.php | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/UpdateDatabase/MysqlLinks.php b/UpdateDatabase/MysqlLinks.php
index 02441702..7520c9fc 100644
--- a/UpdateDatabase/MysqlLinks.php
+++ b/UpdateDatabase/MysqlLinks.php
@@ -437,7 +437,6 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
         
     function updateCharacterSet()
     {
-        print_R($this->database());exit;
         foreach (array_keys($this->schema) as $tbl){
             
             if(strpos($tbl, '__keys') !== false ){
@@ -446,22 +445,11 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
             
             echo "CALL mysql_change_charset('{$tbl}') \n";
             
-            $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 = mydb COLLATE utf8_unicode_ci
-                    AND
-                        T.table_name = mytb COLLATE utf8_unicode_ci
-            ");
             
+            $ce = DB_DataObject::factory('core_enum');
+            $ce->query("CALL mysql_change_charset('{$tbl}')");
+            $ce->getDatabaseConnection()->disconnect();
+//            $ce->free();
         }
     }
     
-- 
2.39.2