Apply changes from trunk to 0.1-stable

1 files changed, 10 insertions, 14 deletions

diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
index e904be278..11e744cfa 100644
--- a/SQL/mysql.update.sql
+++ b/SQL/mysql.update.sql
@@ -1,21 +1,17 @@
 -- RoundCube Webmail update script for MySQL databases
--- Updates from version 0.1-beta and 0.1-beta2
+-- Updates from version 0.1-stable to 0.1.1
 
 TRUNCATE TABLE `messages`;
 
 ALTER TABLE `messages`
-  DROP `body`,
-  DROP INDEX `cache_key`,
-  ADD `structure` TEXT,
-  ADD UNIQUE `uniqueness` (`user_id`, `cache_key`, `uid`);
+  DROP INDEX `idx`,
+  DROP INDEX `uid`
 
-ALTER TABLE `identities`
-  ADD `html_signature` tinyint(1) default 0 NOT NULL;
+ALTER TABLE `cache`
+  DROP INDEX `cache_key`,
+  DROP INDEX `session_id`,
+  ADD INDEX `user_cache_index` (`user_id`,`cache_key`);
 
-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;
+ALTER TABLE `users`
+    ADD INDEX `username_index` (`username`),
+    ADD INDEX `alias_index` (`alias`);