[Rt-commit] rt branch, 4.0/mysql-charsets, updated. rt-4.0.8-250-g41fdde2

[? sunnavy]

The branch, 4.0/mysql-charsets has been updated
       via  41fdde28846d574e25a55225d8ed2e733f61b1f4 (commit)
      from  b4aa9ab8149422acceb8dd1d1c5dbf55ab94eb73 (commit)

Summary of changes:
 etc/schema.mysql                    | 4 ++--
 etc/upgrade/4.0.11/schema.mysql     | 4 ++++
 etc/upgrade/upgrade-mysql-schema.pl | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 etc/upgrade/4.0.11/schema.mysql

- Log -----------------------------------------------------------------
commit 41fdde28846d574e25a55225d8ed2e733f61b1f4
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Mar 12 00:47:00 2013 +0800

    update mysql schema for email fields to utf8
    
    utf8 data is valid nowadays.

diff --git a/etc/schema.mysql b/etc/schema.mysql
index 9ed0337..05a4259 100755
--- a/etc/schema.mysql
+++ b/etc/schema.mysql
@@ -22,8 +22,8 @@ CREATE TABLE Queues (
   id INTEGER NOT NULL  AUTO_INCREMENT,
   Name varchar(200) NOT NULL  ,
   Description varchar(255) NULL  ,
-  CorrespondAddress varchar(120) CHARACTER SET ascii NULL,
-  CommentAddress varchar(120) CHARACTER SET ascii NULL,
+  CorrespondAddress varchar(120) NULL,
+  CommentAddress varchar(120) NULL,
   Lifecycle varchar(32) CHARACTER SET ascii NULL,
   SubjectTag varchar(120) NULL,
   InitialPriority integer NOT NULL DEFAULT 0  ,
diff --git a/etc/upgrade/4.0.11/schema.mysql b/etc/upgrade/4.0.11/schema.mysql
new file mode 100644
index 0000000..64e3306
--- /dev/null
+++ b/etc/upgrade/4.0.11/schema.mysql
@@ -0,0 +1,4 @@
+ALTER TABLE Users MODIFY EmailAddress varchar(120) CHARACTER SET utf8;
+ALTER TABLE Queues
+    MODIFY CorrespondAddress varchar(120) CHARACTER SET utf8,
+    MODIFY CommentAddress varchar(120) CHARACTER SET utf8;
diff --git a/etc/upgrade/upgrade-mysql-schema.pl b/etc/upgrade/upgrade-mysql-schema.pl
index 310a6a8..f16f124 100755
--- a/etc/upgrade/upgrade-mysql-schema.pl
+++ b/etc/upgrade/upgrade-mysql-schema.pl
@@ -184,8 +184,8 @@ my %charset = (
     Queues                   => {
         Name  => 'utf8',
         Description  => 'utf8',
-        CorrespondAddress  => 'ascii',
-        CommentAddress  => 'ascii',
+        CorrespondAddress  => 'utf8',
+        CommentAddress  => 'utf8',
     },
     ScripActions             => {
         Name  => 'utf8',
@@ -239,7 +239,7 @@ my %charset = (
         Password  => 'binary',
         Comments  => 'utf8',
         Signature  => 'utf8',
-        EmailAddress  => 'ascii',
+        EmailAddress  => 'utf8',
         FreeformContactInfo  => 'utf8',
         Organization  => 'utf8',
         RealName  => 'utf8',

-----------------------------------------------------------------------