From 38b012e072f808393f87f5cc3059fab7072fb8b7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 08 Feb 2008 12:33:08 -0500
Subject: [PATCH] Added some charset aliases to fix typical mis-labelling (#1484565)

---
 SQL/mysql.update.sql |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
index b16f255..e904be2 100644
--- a/SQL/mysql.update.sql
+++ b/SQL/mysql.update.sql
@@ -1,11 +1,21 @@
 -- RoundCube Webmail update script for MySQL databases
 -- Updates from version 0.1-beta and 0.1-beta2
 
+TRUNCATE TABLE `messages`;
+
 ALTER TABLE `messages`
   DROP `body`,
   DROP INDEX `cache_key`,
   ADD `structure` TEXT,
-  ADD UNIQUE `uniqueness` (`cache_key`, `uid`);
+  ADD UNIQUE `uniqueness` (`user_id`, `cache_key`, `uid`);
 
-ALTER TABLE 'identities'
-  ADD 'html_signature' tinyint(1) default 0 NOT NULL;
+ALTER TABLE `identities`
+  ADD `html_signature` tinyint(1) default 0 NOT NULL;
+
+ALTER TABLE `session` CHANGE `ip` `ip` VARCHAR(40) 
+  
+-- Uncomment these lines if you're using MySQL 4.1 or higher
+-- ALTER TABLE `users`
+--  DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci,
+--  CHANGE `username` `username` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+--  CHANGE `alias` `alias` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;

--
Gitblit v1.9.1