mysql/mysql_change_charset.sql

[Pman.Core] / mysql / mysql_change_charset.sql

diff --git a/mysql/mysql_change_charset.sql b/mysql/mysql_change_charset.sql
index 4c1c09d..ca33995 100644 (file)
--- a/mysql/mysql_change_charset.sql
+++ b/mysql/mysql_change_charset.sql
@@ -14,9 +14,9 @@ CREATE PROCEDURE mysql_change_charset(mytb TEXT)
     
     SELECT
         IF(
-            csname='utf8',
-            CONCAT('SELECT ''',dbtb1,' is Already utf8'' as \"No Need to Convert\"'),
-            CONCAT('ALTER TABLE ',dbtb1,' CONVERT TO CHARACTER SET  \'utf8\' ')
+            csname='utf8' AND collatename='utf8_unicode_ci',
+            CONCAT('SELECT ''',mytb,' is Already utf8'' as \"No Need to Convert\"'),
+            CONCAT('ALTER TABLE ',mytb,' CONVERT TO CHARACTER SET  utf8 COLLATE utf8_unicode_ci')
             
         )
     INTO
@@ -24,16 +24,17 @@ CREATE PROCEDURE mysql_change_charset(mytb TEXT)
         
     FROM (
         SELECT
-            CCSA.character_set_name csname
+            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
+                T.table_schema = mydb COLLATE utf8_unicode_ci
                 AND
-                T.table_name = mytb
+                T.table_name = mytb COLLATE utf8_unicode_ci
 
     
     ) AA;